rpms/xorg-x11-drv-intel/devel no-legacy3d.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xorg-x11-drv-intel.spec, 1.8, 1.9 intel-2.5.0-no-gem-legacy-3d.patch, 1.1, NONE intel-2.5.0-no-legacy-3d.patch, 1.1, NONE intel-2.6.0-to-master.patch, 1.2, NONE
Kristian Høgsberg
krh at fedoraproject.org
Wed Mar 11 15:45:11 UTC 2009
Author: krh
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17108
Modified Files:
.cvsignore sources xorg-x11-drv-intel.spec
Added Files:
no-legacy3d.patch
Removed Files:
intel-2.5.0-no-gem-legacy-3d.patch
intel-2.5.0-no-legacy-3d.patch intel-2.6.0-to-master.patch
Log Message:
* Wed Mar 11 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.99.902-0
- Use 2.7 rc2 tarball.
- Consolidate the legacy3d patches into no-legacy3d.patch, which sent
upstream.
no-legacy3d.patch:
--- NEW FILE no-legacy3d.patch ---
commit 434a714dd79537dae62c291dc37782b7b2f4c81c
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Mar 11 11:10:57 2009 -0400
Drop Legacy3D option, only use fixed texture space with non-gem.
With this change, we always expect the 3D driver to use GEM textures
when the 2D driver uses GEM. When GEM is not available or disabled,
we fall back to legacy fixed textures.
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 6ec1a48..3c77147 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -311,7 +311,6 @@ typedef enum {
OPTION_LVDS24BITMODE,
OPTION_FBC,
OPTION_TILING,
- OPTION_LEGACY3D,
OPTION_LVDSFIXEDMODE,
OPTION_FORCEENABLEPIPEA,
#ifdef INTEL_XVMC
@@ -332,9 +331,6 @@ static OptionInfoRec I830Options[] = {
{OPTION_LVDS24BITMODE, "LVDS24Bit", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_FBC, "FramebufferCompression", OPTV_BOOLEAN, {0}, TRUE},
{OPTION_TILING, "Tiling", OPTV_BOOLEAN, {0}, TRUE},
-#ifdef XF86DRI
- {OPTION_LEGACY3D, "Legacy3D", OPTV_BOOLEAN, {0}, FALSE},
-#endif
{OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_FORCEENABLEPIPEA, "ForceEnablePipeA", OPTV_BOOLEAN, {0}, FALSE},
#ifdef INTEL_XVMC
@@ -3019,11 +3015,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
*/
if (!pI830->can_resize && pI830->directRenderingType == DRI_NONE && I830DRIScreenInit(pScreen))
pI830->directRenderingType = DRI_XF86DRI;
-
- if (pI830->directRenderingType == DRI_XF86DRI) {
- pI830->allocate_classic_textures =
- xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE);
- }
#endif
/* Enable tiling by default */
diff --git a/src/i830_memory.c b/src/i830_memory.c
index e98c914..96e1763 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -504,9 +504,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
mmsize -= ROUND_TO_PAGE(3 * pScrn->displayWidth * pI830->cpp *
pScrn->virtualY);
}
- /* Classic textures are fixed. */
- if (pI830->allocate_classic_textures)
- mmsize -= MB(32);
/* Overlay and cursors, if physical, need to be allocated outside
* of the kernel memory manager.
*/
@@ -566,6 +563,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
i830_free_memory(pScrn, pI830->memory_manager);
pI830->memory_manager = NULL;
}
+ } else {
+ pI830->allocate_classic_textures = TRUE;
}
#endif /* XF86DRI */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Feb 2009 20:51:11 -0000 1.2
+++ .cvsignore 11 Mar 2009 15:44:40 -0000 1.3
@@ -1 +1 @@
-xf86-video-intel-2.6.0.tar.bz2
+xf86-video-intel-2.6.99.902.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Feb 2009 20:51:11 -0000 1.2
+++ sources 11 Mar 2009 15:44:41 -0000 1.3
@@ -1 +1 @@
-70f23db0f5178f63b4d688e6fc4a43de xf86-video-intel-2.6.0.tar.bz2
+b1869be6032c00654f562bd5d6ac9701 xf86-video-intel-2.6.99.902.tar.bz2
Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-intel.spec 5 Mar 2009 22:58:57 -0000 1.8
+++ xorg-x11-drv-intel.spec 11 Mar 2009 15:44:41 -0000 1.9
@@ -7,8 +7,8 @@
Summary: Xorg X11 Intel video driver(s)
Name: xorg-x11-drv-intel
-Version: 2.6.0
-Release: 14%{?dist}
+Version: 2.6.99.902
+Release: 0%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -21,11 +21,9 @@
#Source1: xf86-video-intel-%{batchbuffer_version}.tar.bz2
Source2: intel.xinf
-Patch1: intel-2.6.0-to-master.patch
-Patch5: intel-2.5.0-no-legacy-3d.patch
-Patch6: intel-2.5.0-no-gem-legacy-3d.patch
-Patch7: kill-svideo.patch
-Patch8: copy-fb.patch
+Patch1: no-legacy3d.patch
+Patch2: kill-svideo.patch
+Patch3: copy-fb.patch
ExclusiveArch: %{ix86} x86_64 ia64
@@ -60,11 +58,9 @@
%prep
%setup -q -n xf86-video-intel-%{version}
-%patch1 -p1 -b .master
-%patch5 -p1 -b .nolegacy3d
-%patch6 -p1 -b .nogem3d
-%patch7 -p1 -b .svideo
-%patch8 -p1 -b .copy-fb
+%patch1 -p1 -b .no-legacy3d
+%patch2 -p1 -b .svideo
+%patch3 -p1 -b .copy-fb
%build
@@ -104,6 +100,11 @@
%{_libdir}/libIntelXvMC.so
%changelog
+* Wed Mar 11 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.99.902-0
+- Use 2.7 rc2 tarball.
+- Consolidate the legacy3d patches into no-legacy3d.patch, which sent
+ upstream.
+
* Thu Mar 5 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-14
- Fix copy-fb patch to skip dpms off on initial modeset.
- Downgrade the conflicts to a requires.
--- intel-2.5.0-no-gem-legacy-3d.patch DELETED ---
--- intel-2.5.0-no-legacy-3d.patch DELETED ---
--- intel-2.6.0-to-master.patch DELETED ---
More information about the fedora-extras-commits
mailing list