[xorg-x11-drv-intel/f13/master] merge f14
Adam Jackson
ajax at fedoraproject.org
Mon Aug 30 16:01:10 UTC 2010
commit 7e714ab815c3100d35954f51c334b5bfe231d6d2
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Aug 30 11:59:52 2010 -0400
merge f14
.gitignore | 6 -----
intel-2.12-fix-uxa-planemask.patch | 40 ++++++++++++++++++++++++++++++++++++
intel-2.8.0-lvds-first.patch | 36 ++++++++++++++++++++++++++++++++
xorg-x11-drv-intel.spec | 20 +++++++++++++++++-
4 files changed, 95 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bc0414..4a4721c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,3 @@ xf86-video-intel-2.9.0.tar.bz2
intel-gpu-tools-20090908.tar.bz2
xf86-video-intel-2.9.1.tar.bz2
xf86-video-intel-2.10.0.tar.bz2
-intel-gpu-tools-20100326.tar.bz2
-xf86-video-intel-20100326.tar.bz2
-xf86-video-intel-2.11.0.tar.bz2
-intel-gpu-tools-20100416.tar.bz2
-xf86-video-intel-2.12.0.tar.bz2
-intel-gpu-tools-20100625.tar.bz2
diff --git a/intel-2.12-fix-uxa-planemask.patch b/intel-2.12-fix-uxa-planemask.patch
new file mode 100644
index 0000000..eb89433
--- /dev/null
+++ b/intel-2.12-fix-uxa-planemask.patch
@@ -0,0 +1,40 @@
+From feff2ec80eeeba5074d19efcddf4867adf639b4f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Mon, 5 Jul 2010 09:07:08 +1000
+Subject: [PATCH] uxa: don't compare planemask with FB_ALLONES.
+
+planemask is an unsigned long initialised to ~0, on 64-bit this is not equal
+to an (unsigned int)-1.
+
+Use the macro provided to do this.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ uxa/uxa-accel.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
+index ded66a1..633b433 100644
+--- a/uxa/uxa-accel.c
++++ b/uxa/uxa-accel.c
+@@ -81,7 +81,7 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
+ if (!dst_pixmap)
+ goto fallback;
+
+- if (pGC->alu != GXcopy || pGC->planemask != FB_ALLONES)
++ if (pGC->alu != GXcopy || !UXA_PM_IS_SOLID(pDrawable, pGC->planemask))
+ goto solid;
+
+ format = PictureMatchFormat(screen,
+@@ -1048,7 +1048,7 @@ uxa_fill_region_solid(DrawablePtr pDrawable,
+ extents = REGION_EXTENTS(screen, pRegion);
+
+ /* Using GEM, the relocation costs outweigh the advantages of the blitter */
+- if (nbox == 1 || (alu != GXcopy && alu != GXclear) || planemask != FB_ALLONES) {
++ if (nbox == 1 || (alu != GXcopy && alu != GXclear) || !UXA_PM_IS_SOLID(&pixmap->drawable, planemask)) {
+ try_solid:
+ if (uxa_screen->info->check_solid &&
+ !uxa_screen->info->check_solid(&pixmap->drawable, alu, planemask))
+--
+1.7.1
+
diff --git a/intel-2.8.0-lvds-first.patch b/intel-2.8.0-lvds-first.patch
new file mode 100644
index 0000000..ff2ff43
--- /dev/null
+++ b/intel-2.8.0-lvds-first.patch
@@ -0,0 +1,36 @@
+diff -up xf86-video-intel-2.10.0/src/drmmode_display.cda xf86-video-intel-2.10.0/src/drmmode_display.c
+--- xf86-video-intel-2.10.0/src/drmmode_display.cda 2010-01-13 18:45:02.000000000 +1000
++++ xf86-video-intel-2.10.0/src/drmmode_display.c 2010-01-13 18:46:22.000000000 +1000
+@@ -1419,7 +1419,7 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
+ {
+ xf86CrtcConfigPtr xf86_config;
+ drmmode_ptr drmmode;
+- int i;
++ int i, lvds = -1;
+
+ drmmode = xnfalloc(sizeof *drmmode);
+ drmmode->fd = fd;
+@@ -1441,9 +1441,22 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
+ drmmode->mode_res->max_height);
+ for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
+ drmmode_crtc_init(scrn, drmmode, i);
++
++ /* do LVDS first */
++ for (i = 0; i < drmmode->mode_res->count_connectors; i++) {
++ drmModeConnectorPtr koutput =
++ drmModeGetConnector(drmmode->fd,
++ drmmode->mode_res->connectors[i]);
++ if (koutput->connector_type == DRM_MODE_CONNECTOR_LVDS) {
++ drmmode_output_init(scrn, drmmode, i);
++ lvds = i;
++ }
++ drmModeFreeConnector(koutput);
++ }
+
+ for (i = 0; i < drmmode->mode_res->count_connectors; i++)
+- drmmode_output_init(scrn, drmmode, i);
++ if (i != lvds)
++ drmmode_output_init(scrn, drmmode, i);
+
+ xf86InitialConfiguration(scrn, TRUE);
+
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index a79bfc1..6055656 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -8,7 +8,7 @@
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.12.0
-Release: 1%{?dist}
+Release: 5%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -29,6 +29,9 @@ Patch20: intel-2.8.0-kms-get-crtc.patch
Patch21: intel-2.11-lvds-first.patch
Patch22: intel-2.11.0-vga-clock-max.patch
+# backported
+Patch23: intel-2.12-fix-uxa-planemask.patch
+
Patch60: uevent.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=27885
@@ -92,6 +95,7 @@ Debugging tools for Intel graphics chips
%patch20 -p1 -b .get-crtc
%patch21 -p1 -b .lvds-first
%patch22 -p1 -b .vga-clock
+%patch23 -p1 -b .uxa-fix
%patch60 -p1 -b .uevent
%patch61 -p1 -b .mbp-backlight
%patch62 -p1 -b .no-flip
@@ -128,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%doc COPYING
%{driverdir}/intel_drv.so
%{_datadir}/hwdata/videoaliases/intel.xinf
%{_libdir}/libI810XvMC.so.1*
@@ -141,10 +146,23 @@ rm -rf $RPM_BUILD_ROOT
%files -n intel-gpu-tools
%defattr(-,root,root,-)
+%doc COPYING
%{_bindir}/intel_*
%{_mandir}/man1/intel_*.1*
%changelog
+* Thu Jul 08 2010 Adam Jackson <ajax at redhat.com> 2.12.0-5
+- Install COPYING.
+
+* Mon Jul 05 2010 Dave Airlie <airlied at redhat.com> 2.12.0-4
+- rebuild for fixed patch.
+
+* Mon Jul 05 2010 Peter Hutterer <peter.hutterer at redhat.com> - 2.12.0-3
+- rebuild for X Server 1.9
+
+* Mon Jul 05 2010 Dave Airlie <airlied at redhat.com> 2.12.0-2
+- add fix for UXA planemask issue
+
* Fri Jun 25 2010 Adam Jackson <ajax at redhat.com> 2.12.0-1
- intel 2.12.0
- new gpu-tools snapshot
More information about the scm-commits
mailing list