rpms/xorg-x11-drv-intel/devel intel-abi-fix.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.18, 1.19
Dave Airlie
airlied at fedoraproject.org
Tue Aug 4 05:58:19 UTC 2009
- Previous message: rpms/xorg-x11-drv-ati/devel radeon-6.9.0-bgnr-enable.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.180, 1.181 radeon-6.12.2-hax.patch, 1.1, NONE radeon-6.12.2-rs690-hack.patch, 1.1, NONE radeon-6.12.2-stable-branch.patch, 1.1, NONE radeon-kms-compat.patch, 1.2, NONE radeon-modeset-fixes.patch, 1.3, NONE radeon-modeset-still-more-fixes.patch, 1.1, NONE radeon-modeset.patch, 1.47, NONE radeon-src-readback-cpu.patch, 1.1, NONE
- Next message: rpms/xorg-x11-drv-nv/devel nv-update-git.patch, NONE, 1.1 nv-save-rom.patch, 1.2, 1.3 xorg-x11-drv-nv.spec, 1.89, 1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5478
Modified Files:
xorg-x11-drv-intel.spec
Added Files:
intel-abi-fix.patch
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.8.0-3
- add ABI fixes for RAC removal
intel-abi-fix.patch:
ch7017/ch7017.c | 1 -
ch7xxx/ch7xxx.c | 1 -
i810_driver.c | 9 ---------
i810_hwmc.c | 1 -
i810_video.c | 1 -
i830_driver.c | 11 -----------
i830_i2c.c | 2 --
i830_video.c | 1 -
i915_hwmc.c | 1 -
ivch/ivch.c | 1 -
sil164/sil164.c | 1 -
tfp410/tfp410.c | 1 -
12 files changed, 31 deletions(-)
--- NEW FILE intel-abi-fix.patch ---
diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index 01e414f..6b27d05 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -34,7 +34,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "miscstruct.h"
#include "xf86i2c.h"
diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c
index 13ba102..cad507d 100644
--- a/src/ch7xxx/ch7xxx.c
+++ b/src/ch7xxx/ch7xxx.c
@@ -34,7 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string.h>
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "miscstruct.h"
#include "xf86i2c.h"
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 4b8c459..f158f5d 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -55,8 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
#include "xf86cmap.h"
#include "compiler.h"
#include "mibstore.h"
@@ -549,10 +547,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index);
- if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
- return FALSE;
- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -937,9 +931,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
/* We won't be using the VGA access after the probe */
I810SetMMIOAccess(pI810);
- xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
-
return TRUE;
}
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c
index 12ffdd9..1c3ffc9 100644
--- a/src/i810_hwmc.c
+++ b/src/i810_hwmc.c
@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff --git a/src/i810_video.c b/src/i810_video.c
index 9528bc7..c82fcc9 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 33079fe..f701231 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -51,8 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
#include "xf86Priv.h"
#include "xf86cmap.h"
#include "compiler.h"
@@ -1540,13 +1538,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
if (!i830_open_drm_master(pScrn))
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to become DRM master.\n");
-
- if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
- PreInitCleanup(pScrn);
- return FALSE;
- }
-
- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
pScrn->monitor = pScrn->confScreen->monitor;
pScrn->progClock = TRUE;
pScrn->rgbBits = 8;
@@ -1632,8 +1623,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
/* We won't be using the VGA access after the probe. */
I830SetMMIOAccess(pI830);
- xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
}
/* Load the dri2 module if requested. */
diff --git a/src/i830_i2c.c b/src/i830_i2c.c
index 8392d0a..4ba073d 100644
--- a/src/i830_i2c.c
+++ b/src/i830_i2c.c
@@ -31,8 +31,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
#include "xf86cmap.h"
#include "compiler.h"
#include "mibstore.h"
diff --git a/src/i830_video.c b/src/i830_video.c
index 92b6324..9fb0b56 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -56,7 +56,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 6712caa..7e0f145 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -32,7 +32,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c
index dffe334..79da11a 100644
--- a/src/ivch/ivch.c
+++ b/src/ivch/ivch.c
@@ -31,7 +31,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "miscstruct.h"
#include "xf86i2c.h"
diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c
index c90bed3..e43107a 100644
--- a/src/sil164/sil164.c
+++ b/src/sil164/sil164.c
@@ -35,7 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "miscstruct.h"
#include "xf86i2c.h"
diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c
index 4d3bb8a..a8985f7 100644
--- a/src/tfp410/tfp410.c
+++ b/src/tfp410/tfp410.c
@@ -34,7 +34,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "miscstruct.h"
#include "xf86i2c.h"
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.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xorg-x11-drv-intel.spec 27 Jul 2009 08:26:55 -0000 1.18
+++ xorg-x11-drv-intel.spec 4 Aug 2009 05:58:19 -0000 1.19
@@ -8,7 +8,7 @@
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -24,6 +24,7 @@ Source4: make-git-snapshot.sh
Patch1: kill-svideo.patch
Patch2: copy-fb.patch
Patch3: intel-2.8.0-build-fix.patch
+Patch4: intel-abi-fix.patch
# needs to be upstreamed
Patch20: intel-2.8.0-kms-get-crtc.patch
@@ -78,6 +79,7 @@ Debugging tools for Intel graphics chips
%patch1 -p1 -b .svideo
%patch2 -p1 -b .copy-fb
%patch3 -p1 -b .xext
+%patch4 -p1 -b .abi
%patch20 -p1 -b .get-crtc
%patch30 -p1 -b .names
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.8.0-3
+- add ABI fixes for RAC removal
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message: rpms/xorg-x11-drv-ati/devel radeon-6.9.0-bgnr-enable.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.180, 1.181 radeon-6.12.2-hax.patch, 1.1, NONE radeon-6.12.2-rs690-hack.patch, 1.1, NONE radeon-6.12.2-stable-branch.patch, 1.1, NONE radeon-kms-compat.patch, 1.2, NONE radeon-modeset-fixes.patch, 1.3, NONE radeon-modeset-still-more-fixes.patch, 1.1, NONE radeon-modeset.patch, 1.47, NONE radeon-src-readback-cpu.patch, 1.1, NONE
- Next message: rpms/xorg-x11-drv-nv/devel nv-update-git.patch, NONE, 1.1 nv-save-rom.patch, 1.2, 1.3 xorg-x11-drv-nv.spec, 1.89, 1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list