Backport G41 chipset support from 2.5, tested with Asus P5QPL-VM.

Bump PKGREVISION.

5 files changed, 98 insertions, 10 deletions

diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index d8b4c30e114..bad6dc851f6 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2008/11/15 08:24:25 taca Exp $
+# $NetBSD: Makefile,v 1.16 2009/01/05 13:18:18 hasso Exp $
 
 DISTNAME=	xf86-video-intel-2.4.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index f8bb3ee96f4..413558940c8 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.13 2008/11/15 08:24:25 taca Exp $
+$NetBSD: distinfo,v 1.14 2009/01/05 13:18:18 hasso Exp $
 
 SHA1 (xf86-video-intel-2.4.3.tar.bz2) = 8335294c9b76b1f9daad5082d2290555ba2dbce5
 RMD160 (xf86-video-intel-2.4.3.tar.bz2) = 0d4fe4b7d517d1740c80fe61a8fc44af604ec60e
 Size (xf86-video-intel-2.4.3.tar.bz2) = 661105 bytes
-SHA1 (patch-aa) = d821ffb3e46769c0a5eda913b85a5b834d4478d6
+SHA1 (patch-aa) = a85113f95b868510bc9b7a221065adc2f97c66e0
 SHA1 (patch-ab) = 8d1b93e73a1b64958c09a229151b498ea61dc158
 SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08
+SHA1 (patch-ae) = 0657661a7020d058ba3b7df6deea7dbda747438f
+SHA1 (patch-af) = ef827a0d55c3c87b509fd603ab72cdfbfd5e5e87
 SHA1 (patch-ba) = 9152649277b417278fb290e24dac8ad6fb911238
diff --git a/x11/xf86-video-intel/patches/patch-aa b/x11/xf86-video-intel/patches/patch-aa
index 55ec6e843bd..9c6c37d5f88 100644
--- a/x11/xf86-video-intel/patches/patch-aa
+++ b/x11/xf86-video-intel/patches/patch-aa
@@ -1,12 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2008/09/19 14:56:00 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2009/01/05 13:18:18 hasso Exp $
 
-https://bugs.freedesktop.org/show_bug.cgi?id=16631
+https://bugs.freedesktop.org/show_bug.cgi?id=16631 and G41 support.
 
-diff --git src/i830_driver.c src/i830_driver.c
-index 9bf0a64..5de8e7d 100644
---- src/i830_driver.c
-+++ src/i830_driver.c
-@@ -915,19 +915,18 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
+--- src/i830_driver.c.orig	2008-11-13 22:13:56 +0200
++++ src/i830_driver.c	2009-01-05 13:42:59 +0200
+@@ -255,6 +255,7 @@ static SymTabRec I830Chipsets[] = {
+    {PCI_CHIP_IGD_E_G,		"Intel Integrated Graphics Device"},
+    {PCI_CHIP_G45_G,		"G45/G43"},
+    {PCI_CHIP_Q45_G,		"Q45/Q43"},
++   {PCI_CHIP_G41_G,		"G41"},
+    {-1,				NULL}
+ };
+ 
+@@ -282,6 +283,7 @@ static PciChipsets I830PciChipsets[] = {
+    {PCI_CHIP_IGD_E_G,		PCI_CHIP_IGD_E_G,	RES_SHARED_VGA},
+    {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		RES_SHARED_VGA},
+    {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		RES_SHARED_VGA},
++   {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		RES_SHARED_VGA},
+    {-1,				-1,			RES_UNDEFINED}
+ };
+ 
+@@ -924,19 +926,18 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
        i830_lvds_init(pScrn);
  
     if (IS_I9XX(pI830)) {
@@ -35,3 +49,13 @@ index 9bf0a64..5de8e7d 100644
     } else {
        i830_dvo_init(pScrn);
     }
+@@ -1230,6 +1231,9 @@ i830_detect_chipset(ScrnInfoPtr pScrn)
+     case PCI_CHIP_Q45_G:
+ 	chipname = "Q45/Q43";
+ 	break;
++    case PCI_CHIP_G41_G:
++	chipname = "G41";
++	break;
+    default:
+ 	chipname = "unknown chipset";
+ 	break;
diff --git a/x11/xf86-video-intel/patches/patch-ae b/x11/xf86-video-intel/patches/patch-ae
new file mode 100644
index 00000000000..b9dde6a7d99
--- /dev/null
+++ b/x11/xf86-video-intel/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2009/01/05 13:18:18 hasso Exp $
+
+--- src/common.h.orig	2008-11-13 22:13:56 +0200
++++ src/common.h	2009-01-05 13:37:17 +0200
+@@ -323,6 +323,11 @@ extern int I810_DEBUG;
+ #define PCI_CHIP_Q45_G_BRIDGE	0x2E10
+ #endif
+ 
++#ifndef PCI_CHIP_G41_G
++#define PCI_CHIP_G41_G		0x2E32
++#define PCI_CHIP_G41_G_BRIDGE	0x2E30
++#endif
++
+ #if XSERVER_LIBPCIACCESS
+ #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
+ #define VENDOR_ID(p)      (p)->vendor_id
+@@ -355,7 +360,7 @@ extern int I810_DEBUG;
+ #define IS_I945G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_G)
+ #define IS_I945GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_GME)
+ #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM)
+-#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G)
++#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G)
+ #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME)
+ #define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_GM45(pI810) || IS_G4X(pI810))
+ #define IS_G33CLASS(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G33_G ||\
diff --git a/x11/xf86-video-intel/patches/patch-af b/x11/xf86-video-intel/patches/patch-af
new file mode 100644
index 00000000000..72cd758f879
--- /dev/null
+++ b/x11/xf86-video-intel/patches/patch-af
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1 2009/01/05 13:18:18 hasso Exp $
+
+--- src/i810_driver.c.orig	2008-11-13 22:13:56 +0200
++++ src/i810_driver.c	2009-01-05 13:37:17 +0200
+@@ -156,6 +156,7 @@ static const struct pci_id_match intel_d
+    INTEL_DEVICE_MATCH (PCI_CHIP_IGD_E_G, 0 ),
+    INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ),
+    INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
++   INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
+     { 0, 0, 0 },
+ };
+ 
+@@ -212,6 +213,7 @@ static SymTabRec I810Chipsets[] = {
+    {PCI_CHIP_IGD_E_G,		"Intel Integrated Graphics Device"},
+    {PCI_CHIP_G45_G,		"G45/G43"},
+    {PCI_CHIP_Q45_G,		"Q45/Q43"},
++   {PCI_CHIP_G41_G,		"G41"},
+    {-1,				NULL}
+ };
+ 
+@@ -245,6 +247,7 @@ static PciChipsets I810PciChipsets[] = {
+    {PCI_CHIP_IGD_E_G,		PCI_CHIP_IGD_E_G,	RES_SHARED_VGA},
+    {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		RES_SHARED_VGA},
+    {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		RES_SHARED_VGA},
++   {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		RES_SHARED_VGA},
+    {-1,				-1, RES_UNDEFINED }
+ };
+ 
+@@ -812,6 +815,7 @@ I810Probe(DriverPtr drv, int flags)
+ 	    case PCI_CHIP_IGD_E_G:
+ 	    case PCI_CHIP_G45_G:
+ 	    case PCI_CHIP_Q45_G:
++	    case PCI_CHIP_G41_G:
+     	       xf86SetEntitySharable(usedChips[i]);
+ 
+     	       /* Allocate an entity private if necessary */