x11-drivers/xf86-video-intel: add patches from the 2.9 branch (should fix bug #289980)

Package-Manager: portage-2.2_rc46/cvs/Linux i686

6 files changed, 196 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 0d9dbf393654..96bb94c0d83c 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.40 2009/10/22 13:31:08 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.41 2009/10/22 13:45:49 remi Exp $
+
+*xf86-video-intel-2.9.0-r1 (22 Oct 2009)
+
+  22 Oct 2009; Rémi Cardona <remi@gentoo.org>
+  +files/2.9.0-0001-drmmode-with-1.7-server-set-mode-major-doesn-t-get-g.pat
+  ch, +xf86-video-intel-2.9.0-r1.ebuild,
+  +files/2.9.0-0002-uxa-Free-the-ScratchPixmapHeader-after-its-associate.pat
+  ch, +files/2.9.0-0003-Drop-frontbuffer-from-crtc-in-I830CloseScreen.patch:
+  add patches from the 2.9 branch (should fix bug #289980)
 
   22 Oct 2009; Rémi Cardona <remi@gentoo.org>
   -files/2.1.1-fix_build_without_dri.patch,
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index f8b802ae77a8..6eb699544e8b 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,5 +1,8 @@
 AUX 2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
 AUX 2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch 809 RMD160 6f6d7f25efddeb2db9d35e2ea92d408a54af5a56 SHA1 2208274bb58f76503cf2d10d236e6591c48681cf SHA256 4236e01b101a69ca27dfc9c06c367d2b0a381afa343dc3a2b65504559b24fc3c
+AUX 2.9.0-0001-drmmode-with-1.7-server-set-mode-major-doesn-t-get-g.patch 1160 RMD160 7a06a97ede61b0c34b33acab5aaacb960e156a70 SHA1 6cf7cc873f4b60a44d80cfdcf6602c55cd1b58f7 SHA256 4a2f131f042b161c75d6df81de25498529ac1b260c7d523edd6dcac4175e32d2
+AUX 2.9.0-0002-uxa-Free-the-ScratchPixmapHeader-after-its-associate.patch 1261 RMD160 1048448ec9b78a18935937717d6e0726e7a3a887 SHA1 03d6359150c9ff3b3725f3e46c1e407ba02d43f0 SHA256 24b6ade27c839d8ec4438a4fa89db150d1095ec653e384a0ad9c78208aec0589
+AUX 2.9.0-0003-Drop-frontbuffer-from-crtc-in-I830CloseScreen.patch 2313 RMD160 26dd039065eaa2b0ebd10f4fe492fe5388d26bc8 SHA1 41f2fd0c68045f28310856079004eea2f2d55ef7 SHA256 b2baa1750bacc85de8e76c54c5439d0f178ce22a8f44232bc11e180e65bb8e4f
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 DIST xf86-video-intel-2.6.3.tar.bz2 790275 RMD160 7b31866c2fd42fbb2d46efb137bf968d80221fb1 SHA1 96fe7e8b804ab8833b1d462f99c08be29bb9e283 SHA256 b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
 DIST xf86-video-intel-2.7.1.tar.bz2 780625 RMD160 25208fe03f0fe849974a703f4a81e734e67cad18 SHA1 f863ee65b4b7779077af9f819b07033264284628 SHA256 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
@@ -8,6 +11,7 @@ DIST xf86-video-intel-2.9.0.tar.bz2 791890 RMD160 71fbffb7ddbaf320c146b98d34d474
 EBUILD xf86-video-intel-2.6.3-r1.ebuild 972 RMD160 a33e6cbb3d14a837e54e2cb3c520ef34a0fd86fb SHA1 98273299cb4a32b87dbcf1105fbbc146115ac52b SHA256 9618a7f6a25aebc3e53ebccce0bdd87ce1c5e675875453ab190fcac84a3405ce
 EBUILD xf86-video-intel-2.7.1.ebuild 808 RMD160 b3ea159f250693c41ffe0779b0f509173c983ceb SHA1 39eac29032ff5774dbdf2493cb745ab4f7d7bb22 SHA256 d9b0176904e8ce6682e2f725f49905519b764410f1ef1701f6e2e904587db85d
 EBUILD xf86-video-intel-2.8.1.ebuild 808 RMD160 c1a4856720ac75c7040d5c4cd3cf1786b97e14a6 SHA1 99234ae6c3ecca8ef977460e3d983a0659c40f19 SHA256 6f6c28dc383ee6b904eeb4823299159dcb8fef3e0a5699dc7f1ab481284fc6c9
+EBUILD xf86-video-intel-2.9.0-r1.ebuild 1052 RMD160 c5e61912cecae71b385aeca0836b67713a53f200 SHA1 87aab8d0810bc3bd3a1a3240e512c818ef64afc3 SHA256 599f99fb944dbee8dfc23be42cef9e0a8e87149c98957d6b2dee1ff0e4ead5b0
 EBUILD xf86-video-intel-2.9.0.ebuild 855 RMD160 aae1a09b97dab3264ed67f75d21279318a392cbe SHA1 dbf348ed3cc429e98e2de7bbac0d219d768a4c15 SHA256 fdbc5148843c3483f339162cf30d571f19e0a09742809b5f20ff14263a0c5636
-MISC ChangeLog 36753 RMD160 2cff7b46797c62b8be04f1cd7573a7cc3c895316 SHA1 2095dfa5868f97fa6ff1745c883ed7125cdbefb3 SHA256 aa16c0f926875cb83d24a07a445e5a0e9e72fdb6167db209be1a8a23b32a5818
+MISC ChangeLog 37174 RMD160 fa378f8b5ffbc9c12c38100700ec115c71ae206e SHA1 d4ce6a1b2b2612ed99476c31c866c0243e120a9b SHA256 4df021ff60c5b486025bda9b55cb749f7dd3ff1ad35998ddb16fe5210fa5e822
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-drivers/xf86-video-intel/files/2.9.0-0001-drmmode-with-1.7-server-set-mode-major-doesn-t-get-g.patch b/x11-drivers/xf86-video-intel/files/2.9.0-0001-drmmode-with-1.7-server-set-mode-major-doesn-t-get-g.patch
new file mode 100644
index 000000000000..778156c8dcde
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.9.0-0001-drmmode-with-1.7-server-set-mode-major-doesn-t-get-g.patch
@@ -0,0 +1,36 @@
+From f858cbe246c5d3a788ae25551b49142c5cc91f1a Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 9 Oct 2009 14:16:06 +1000
+Subject: [PATCH 1/3] drmmode: with 1.7 server, set mode major doesn't get gamma setup.
+
+Noticed this on Fedora, where 1.7 server does gamma via the randr
+codepaths however kms doesn't have this call which happens in the
+non set_mode_major path.
+
+probably should be backported to released drivers.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+(cherry picked from commit 8a77877f9c2c6a8a1308bc1a3be9e7ad88bc7f49)
+---
+ src/drmmode_display.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index e8a6c01..7845fc5 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -363,6 +363,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+ 		goto done;
+ #endif
+ 
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0)
++	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
++			       crtc->gamma_blue, crtc->gamma_size);
++#endif
++
+ 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
+ 
+ 
+-- 
+1.6.5.1
+
diff --git a/x11-drivers/xf86-video-intel/files/2.9.0-0002-uxa-Free-the-ScratchPixmapHeader-after-its-associate.patch b/x11-drivers/xf86-video-intel/files/2.9.0-0002-uxa-Free-the-ScratchPixmapHeader-after-its-associate.patch
new file mode 100644
index 000000000000..bed377023963
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.9.0-0002-uxa-Free-the-ScratchPixmapHeader-after-its-associate.patch
@@ -0,0 +1,39 @@
+From 7ccf084b7a281d8aa877f91401d3df7192da408c Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon, 12 Oct 2009 14:33:08 +0100
+Subject: [PATCH 2/3] uxa: Free the ScratchPixmapHeader after its associated Picture
+
+Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459
+Intel Driver > 2.8: Cairo rendering bug, triggered in QtCurve GTK engine
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+(cherry picked from commit 7e8f32d0a7279dce1976f87612833d9092554cfe)
+---
+ uxa/uxa-render.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
+index 4850185..bf1460f 100644
+--- a/uxa/uxa-render.c
++++ b/uxa/uxa-render.c
+@@ -360,8 +360,8 @@ uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
+     pSrc = CreatePicture (0, &pPixmap->drawable,
+ 			  PictureMatchFormat (pScreen, 1, PICT_a1),
+ 			  0, 0, serverClient, &error);
+-    FreeScratchPixmapHeader (pPixmap);
+     if (!pSrc) {
++	FreeScratchPixmapHeader (pPixmap);
+ 	FreePicture (pPicture, 0);
+ 	return 0;
+     }
+@@ -373,6 +373,7 @@ uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
+ 		      width, height);
+ 
+     FreePicture (pSrc, 0);
++    FreeScratchPixmapHeader (pPixmap);
+ 
+     return pPicture;
+ }
+-- 
+1.6.5.1
+
diff --git a/x11-drivers/xf86-video-intel/files/2.9.0-0003-Drop-frontbuffer-from-crtc-in-I830CloseScreen.patch b/x11-drivers/xf86-video-intel/files/2.9.0-0003-Drop-frontbuffer-from-crtc-in-I830CloseScreen.patch
new file mode 100644
index 000000000000..b481525c0ff5
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.9.0-0003-Drop-frontbuffer-from-crtc-in-I830CloseScreen.patch
@@ -0,0 +1,69 @@
+From 22b85d0198508a13273ab58fd5fa3a127880a0be Mon Sep 17 00:00:00 2001
+From: Albert Damen <albrt@gmx.net>
+Date: Wed, 7 Oct 2009 21:55:42 +0200
+Subject: [PATCH 3/3] Drop frontbuffer from crtc in I830CloseScreen
+
+By dropping the frontbuffer from the crtc, the new frontbuffer
+can be properly added to the crtc when the xserver is reset.
+
+Signed-off-by: Albert Damen <albrt@gmx.net>
+(cherry picked from commit fcc2ee48b866b81c79315ff10189b56fc201539d)
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=24383
+---
+ src/drmmode_display.c |   15 +++++++++++++++
+ src/i830.h            |    1 +
+ src/i830_driver.c     |    2 ++
+ 3 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 7845fc5..8ab8a4b 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -1420,3 +1420,18 @@ drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc)
+ 
+ 	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
+ }
++
++void drmmode_closefb(ScrnInfoPtr scrn)
++{
++	xf86CrtcConfigPtr xf86_config;
++	drmmode_crtc_private_ptr drmmode_crtc;
++	drmmode_ptr drmmode;
++
++	xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
++
++	drmmode_crtc = xf86_config->crtc[0]->driver_private;
++	drmmode = drmmode_crtc->drmmode;
++
++	drmModeRmFB(drmmode->fd, drmmode->fb_id);
++	drmmode->fb_id = 0;
++}
+diff --git a/src/i830.h b/src/i830.h
+index 009641a..9d9335b 100644
+--- a/src/i830.h
++++ b/src/i830.h
+@@ -692,6 +692,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
+ 
+ extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+ extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
++extern void drmmode_closefb(ScrnInfoPtr scrn);
+ extern int drmmode_output_dpms_status(xf86OutputPtr output);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 316a1fa..b2b1cb1 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -3079,6 +3079,8 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
+    }
+    if (pI830->front_buffer) {
+ 	i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL);
++	if (pI830->use_drm_mode)
++	    drmmode_closefb(pScrn);
+ 	i830_free_memory(pScrn, pI830->front_buffer);
+ 	pI830->front_buffer = NULL;
+    }
+-- 
+1.6.5.1
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..ec96439e1a32
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0-r1.ebuild,v 1.1 2009/10/22 13:45:49 remi Exp $
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	>=x11-libs/libdrm-2.4.11
+	x11-libs/libpciaccess
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xineramaproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+	       x11-proto/glproto )"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-drmmode-with-1.7-server-set-mode-major-doesn-t-get-g.patch"
+"${FILESDIR}/${PV}-0002-uxa-Free-the-ScratchPixmapHeader-after-its-associate.patch"
+"${FILESDIR}/${PV}-0003-Drop-frontbuffer-from-crtc-in-I830CloseScreen.patch"
+)
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}