x11-drivers/xf86-video-i810: Add patches to fix non-native resolution on i8xx-attached LFP displays

Package-Manager: portage-2.1.5_rc4

4 files changed, 161 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 7899c91d8a60..aeafc933a733 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.84 2008/04/14 05:55:53 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.85 2008/04/18 17:28:17 remi Exp $
+
+*xf86-video-i810-2.2.99.903-r1 (18 Apr 2008)
+
+  18 Apr 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch,
+  +xf86-video-i810-2.2.99.903-r1.ebuild:
+  Add patches to fix non-native resolution on i8xx-attached LFP displays
 
 *xf86-video-i810-2.2.99.903 (14 Apr 2008)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 40604e044567..af35d417ff85 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -3,6 +3,7 @@ AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 AUX xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
 AUX xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch 4403 RMD160 f886e2e6bc91e8cf204892044371c867175edaa0 SHA1 b3edad65be074ea0e2376d7ca4434c643fbf8abc SHA256 29e0d5c527b1bd1374e3dcbfc9fc412c32798e496c8885413bb3d99fc7b35132
+AUX xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch 3432 RMD160 a368b6caefab695723f1b7b41bffdaa5792af9e0 SHA1 4fe35f1e06c435f087f5db1ff8a088b782d2bc84 SHA256 287f78430f9bfaef547ceb037d75630d825eed9c1285966ebd856ca6adfba7f2
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST x11-driver-patches-3.tar.bz2 404 RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff SHA1 ea479b7a3bc1400fad443801887f593d9eb11084 SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
@@ -20,6 +21,7 @@ EBUILD xf86-video-i810-2.2.0.90.ebuild 1163 RMD160 25a179cd03fb49fcccca211a8ec9c
 EBUILD xf86-video-i810-2.2.1.ebuild 1228 RMD160 822d64308393e0c31fc932c6472df53dcd4d27fb SHA1 b8cb314fc8ac83bd99e7cf0f31a7e877219051b9 SHA256 ab145dea0fce22fc47a1f2a588f2ed5a8ccd45800fe8ebeb4e1ed3e321b589f2
 EBUILD xf86-video-i810-2.2.99.901.ebuild 1164 RMD160 14b0e8492f644d980bb82f8585d6d95a1fbc3d6f SHA1 56522c09a9f23514f3a79bc43c443dd08b097389 SHA256 cd8be3be3440d1b3d704210c1e58e6490613dcb476f6787ac86ba8e55a62d459
 EBUILD xf86-video-i810-2.2.99.902.ebuild 1247 RMD160 72bf58c7ed5a6b81bb9c75dbf81d5dab45e2d8b9 SHA1 cc3176dac8b5ca7a8fa407695300deac1ca581af SHA256 ad1cc6fa98bd1bacd43ffdc8ffa5814506ccef5dc47c8f89190568235e81ca70
+EBUILD xf86-video-i810-2.2.99.903-r1.ebuild 1239 RMD160 b2f1dd73116f624a7996cfeeab0df764d2709fb8 SHA1 d78c39c02e1a78babfb0de5e3b8f06d263fabc70 SHA256 b2cdc935790a082e3ece7ca223a85a9b689c4a320ff40e2774a230d5598463b0
 EBUILD xf86-video-i810-2.2.99.903.ebuild 1164 RMD160 a92cc8b62989fe819f57f5c09fc9668db089fde6 SHA1 694954908399bec0797c78b61464a01aeea7f818 SHA256 0e00fe8f13afc1859c00054fc1e8a93da7eeaec91867ecbebb68bc0f5a0c8dee
-MISC ChangeLog 15316 RMD160 2beb91c72879033bb968c01058d147c88623f968 SHA1 b04006d5c7de23ecc24fd2df83d6e2671ac27819 SHA256 3e96e0ef483c5cd45aacd5b10b75e70ff10c850447415874b19342f50efecc15
+MISC ChangeLog 15592 RMD160 1196a91daba20847d7edf61a058018c6d07b7008 SHA1 e9504a1a55de7d7d4f6d260be8c545e8228433a8 SHA256 e0188bfdddad0fe37229180da9ed63fd9ad47d668b48783d8794630f8d1152cd
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch
new file mode 100644
index 000000000000..ba7a883d3c13
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch
@@ -0,0 +1,107 @@
+diff --git a/src/i830.h b/src/i830.h
+index 834e4dc..e2c39cc 100644
+--- a/src/i830.h
++++ b/src/i830.h
+@@ -857,6 +857,17 @@ static inline int i830_fb_compression_supported(I830Ptr pI830)
+ 
+ Bool i830_pixmap_tiled(PixmapPtr p);
+ 
++#define i830_exa_check_pitch_2d(p) do {\
++    uint32_t pitch = intel_get_pixmap_pitch(p);\
++    if (pitch > KB(32)) return FALSE;\
++} while(0)
++
++/* For pre-965 chip only, as they have 8KB limit for 3D */
++#define i830_exa_check_pitch_3d(p) do {\
++    uint32_t pitch = intel_get_pixmap_pitch(p);\
++    if (pitch > KB(8)) return FALSE;\
++} while(0)
++
+ /* Batchbuffer compatibility handling */
+ #define BEGIN_BATCH(n) BEGIN_LP_RING(n)
+ #define ENSURE_BATCH(n)
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 155e7a9..41c0578 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -3108,7 +3108,7 @@ I830FreeScreen(int scrnIndex, int flags)
+ #ifdef INTEL_XVMC
+     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     I830Ptr pI830 = I830PTR(pScrn);
+-    if (pI830->XvMCEnabled)
++    if (pI830 && pI830->XvMCEnabled)
+ 	intel_xvmc_finish(xf86Screens[scrnIndex]);
+ #endif
+    I830FreeRec(xf86Screens[scrnIndex]);
+diff --git a/src/i830_exa.c b/src/i830_exa.c
+index 9b5bb93..2c807c5 100644
+--- a/src/i830_exa.c
++++ b/src/i830_exa.c
+@@ -170,6 +170,8 @@ I830EXAPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
+     if (pPixmap->drawable.bitsPerPixel == 24)
+ 	I830FALLBACK("solid 24bpp unsupported!\n");
+ 
++    i830_exa_check_pitch_2d(pPixmap);
++
+     offset = exaGetPixmapOffset(pPixmap);
+     pitch = exaGetPixmapPitch(pPixmap);
+ 
+@@ -255,6 +257,9 @@ I830EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
+     if (!EXA_PM_IS_SOLID(&pSrcPixmap->drawable, planemask))
+ 	I830FALLBACK("planemask is not solid");
+ 
++    i830_exa_check_pitch_2d(pSrcPixmap);
++    i830_exa_check_pitch_2d(pDstPixmap);
++
+     pI830->pSrcPixmap = pSrcPixmap;
+ 
+     pI830->BR[13] = I830CopyROP[alu] << 16;
+diff --git a/src/i830_lvds.c b/src/i830_lvds.c
+index a5004b4..1562c21 100644
+--- a/src/i830_lvds.c
++++ b/src/i830_lvds.c
+@@ -1366,9 +1366,10 @@ i830_lvds_init(ScrnInfoPtr pScrn)
+ 
+     /*
+      * Default to filling the whole screen if the mode is less than the
+-     * native size, without breaking aspect ratio.
++     * native size. (Change default to origin FULL mode, i8xx can only work
++     * in that mode for now.)
+      */
+-    dev_priv->fitting_mode = FULL_ASPECT;
++    dev_priv->fitting_mode = FULL;
+ 
+     return;
+ 
+diff --git a/src/i830_render.c b/src/i830_render.c
+index 195e9a8..3a959e8 100644
+--- a/src/i830_render.c
++++ b/src/i830_render.c
+@@ -398,6 +398,11 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
+     Bool is_affine_src, is_affine_mask;
+     Bool is_nearest = FALSE;
+ 
++    i830_exa_check_pitch_3d(pSrc);
++    if (pMask)
++	i830_exa_check_pitch_3d(pMask);
++    i830_exa_check_pitch_3d(pDst);
++
+     IntelEmitInvarientState(pScrn);
+     *pI830->last_3d = LAST_3D_RENDER;
+ 
+diff --git a/src/i915_render.c b/src/i915_render.c
+index 2b9ed04..4a02cf5 100644
+--- a/src/i915_render.c
++++ b/src/i915_render.c
+@@ -323,6 +323,11 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
+     Bool is_affine_src, is_affine_mask;
+     Bool is_nearest = FALSE;
+ 
++    i830_exa_check_pitch_3d(pSrc);
++    if (pMask)
++	i830_exa_check_pitch_3d(pMask);
++    i830_exa_check_pitch_3d(pDst);
++
+     IntelEmitInvarientState(pScrn);
+     *pI830->last_3d = LAST_3D_RENDER;
+ 
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild
new file mode 100644
index 000000000000..6416c821de26
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild,v 1.1 2008/04/18 17:28:17 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular
+
+# This really needs a pkgmove...
+SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
+
+S="${WORKDIR}/xf86-video-intel-${PV}"
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+PATCHES=("${FILESDIR}/${PN}-2.2.99.903-fix-panel-resize-on-i8xx.patch")
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}