x11-drivers/xf86-video-i810: add a fix for LFP dithering

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64)

3 files changed, 90 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 9f7b54c3c811..68898d7e5a32 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.101 2008/08/19 11:30:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.102 2008/08/19 11:49:30 remi Exp $
+
+*xf86-video-i810-2.4.1-r1 (19 Aug 2008)
+
+  19 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-
+  definition.patch, +xf86-video-i810-2.4.1-r1.ebuild:
+  add a fix for LFP dithering
 
   19 Aug 2008; Rémi Cardona <remi@gentoo.org>
   -files/2.4.0/0007-Disable-display-clock-gating-for-4-series-chips.patch,
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-definition.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-definition.patch
new file mode 100644
index 000000000000..db63dfaafee0
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-definition.patch
@@ -0,0 +1,35 @@
+From d5fd845aab4074ed6d0950551e007ea43fd2d0df Mon Sep 17 00:00:00 2001
+From: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue, 19 Aug 2008 07:30:01 +0800
+Subject: [PATCH] Fix reverted LVDS bios capability dword definition
+
+Issue found by Peter Clifton.
+(cherry picked from commit 0e6759bb6ad7293b6447bd20e3d7d8fdee46aba7)
+
+diff --git a/src/i830_bios.h b/src/i830_bios.h
+index a8d9add..2b073f3 100644
+--- a/src/i830_bios.h
++++ b/src/i830_bios.h
+@@ -152,13 +152,13 @@ struct bdb_lvds_options {
+     uint8_t panel_type;
+     uint8_t rsvd1;
+     /* LVDS capabilities, stored in a dword */
+-    uint8_t rsvd2:1;
+-    uint8_t lvds_edid:1;
+-    uint8_t pixel_dither:1;
+-    uint8_t pfit_ratio_auto:1;
+-    uint8_t pfit_gfx_mode_enhanced:1;
+-    uint8_t pfit_text_mode_enhanced:1;
+     uint8_t pfit_mode:2;
++    uint8_t pfit_text_mode_enhanced:1;
++    uint8_t pfit_gfx_mode_enhanced:1;
++    uint8_t pfit_ratio_auto:1;
++    uint8_t pixel_dither:1;
++    uint8_t lvds_edid:1;
++    uint8_t rsvd2:1;
+     uint8_t rsvd4;
+ } __attribute__((packed));
+ 
+-- 
+1.5.6.5
+
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.4.1-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..759b915802f6
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.4.1-r1.ebuild
@@ -0,0 +1,47 @@
+# 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.4.1-r1.ebuild,v 1.1 2008/08/19 11:49:30 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-proto/glproto
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=(
+"${FILESDIR}/${P}-0001-Fix-reverted-LVDS-bios-capability-dword-definition.patch"
+)
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}