Add support for the i945GM to the i810 driver.

From patches by Dimitry Andric.
Bump PKGREVISION of xorg-server.

8 files changed, 389 insertions, 3 deletions

diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 854b8689c35..8ac238865cb 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2006/06/12 00:36:25 joerg Exp $
+$NetBSD: distinfo,v 1.46 2006/06/17 12:33:52 markd Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -51,3 +51,9 @@ SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860
 SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c
 SHA1 (patch-bo) = fd34e4c71756f17294aeab63db1f15090b3edc1b
 SHA1 (patch-bp) = 6bf5252ceeefb2a59cfa16b7375bba61f4867d01
+SHA1 (patch-ca) = 8a2a46defa2f62917128a0aaaf946cda8a169892
+SHA1 (patch-cb) = 96e00c680acbafa3665ccae650a513daea3c2a01
+SHA1 (patch-cc) = d5d72e525f9564eda7f2ea21ddb179800fb153b5
+SHA1 (patch-cd) = e4bb522f4f3e896627aab68e39b0c643e4a6a5be
+SHA1 (patch-ce) = ce68c16dde6a924dbb43b44653bd4bc7c26c34ef
+SHA1 (patch-cf) = ec178ce36dbcd9b65d49584aa80e080b6f11132a
diff --git a/x11/xorg-libs/patches/patch-ca b/x11/xorg-libs/patches/patch-ca
new file mode 100644
index 00000000000..b87774429b2
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ca
@@ -0,0 +1,29 @@
+$NetBSD: patch-ca,v 1.1 2006/06/17 12:33:53 markd Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/i810/common.h.orig	2006-06-06 21:05:49.000000000 +1200
++++ programs/Xserver/hw/xfree86/drivers/i810/common.h
+@@ -322,6 +322,11 @@ extern int I810_DEBUG;
+ #define PCI_CHIP_I945_G_BRIDGE 0x2770
+ #endif
+ 
++#ifndef PCI_CHIP_I945_GM
++#define PCI_CHIP_I945_GM        0x27A2
++#define PCI_CHIP_I945_GM_BRIDGE 0x27A0
++#endif
++
+ #define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 ||	\
+ 			pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \
+ 			pI810->PciInfo->chipType == PCI_CHIP_I810_E)
+@@ -335,8 +340,11 @@ extern int I810_DEBUG;
+ #define IS_I915G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_G || pI810->PciInfo->chipType == PCI_CHIP_E7221_G)
+ #define IS_I915GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_GM)
+ #define IS_I945G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_G)
++#define IS_I945GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_GM)
++
++#define IS_I9X5(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810)) 
+ 
+-#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810))
++#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810))
+ 
+ #define GTT_PAGE_SIZE			KB(4)
+ #define ROUND_TO(x, y)			(((x) + (y) - 1) / (y) * (y))
diff --git a/x11/xorg-libs/patches/patch-cb b/x11/xorg-libs/patches/patch-cb
new file mode 100644
index 00000000000..49a620e3955
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-cb
@@ -0,0 +1,28 @@
+$NetBSD: patch-cb,v 1.1 2006/06/17 12:33:53 markd Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig	2006-06-06 21:12:47.000000000 +1200
++++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
+@@ -136,6 +136,7 @@ static SymTabRec I810Chipsets[] = {
+    {PCI_CHIP_E7221_G,		"E7221 (i915)"},
+    {PCI_CHIP_I915_GM,		"915GM"},
+    {PCI_CHIP_I945_G,		"945G"},
++   {PCI_CHIP_I945_GM,		"945GM"},
+    {-1,				NULL}
+ };
+ 
+@@ -154,6 +155,7 @@ static PciChipsets I810PciChipsets[] = {
+    {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	RES_SHARED_VGA},
+    {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	RES_SHARED_VGA},
+    {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	RES_SHARED_VGA},
++   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	RES_SHARED_VGA},
+    {-1,				-1, RES_UNDEFINED }
+ };
+ 
+@@ -569,6 +571,7 @@ I810Probe(DriverPtr drv, int flags)
+ 	    case PCI_CHIP_E7221_G:
+ 	    case PCI_CHIP_I915_GM:
+ 	    case PCI_CHIP_I945_G:
++	    case PCI_CHIP_I945_GM:
+     	       xf86SetEntitySharable(usedChips[i]);
+ 
+     	       /* Allocate an entity private if necessary */		
diff --git a/x11/xorg-libs/patches/patch-cc b/x11/xorg-libs/patches/patch-cc
new file mode 100644
index 00000000000..c1e34678f55
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-cc
@@ -0,0 +1,40 @@
+$NetBSD: patch-cc,v 1.1 2006/06/17 12:33:53 markd Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c.orig	2006-06-06 21:15:04.000000000 +1200
++++ programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c
+@@ -86,7 +86,7 @@ I830InitHWCursor(ScrnInfoPtr pScrn)
+ 
+    DPRINTF(PFX, "I830InitHWCursor\n");
+    /* Initialise the HW cursor registers, leaving the cursor hidden. */
+-   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
++   if (IS_MOBILE(pI830) || IS_I9X5(pI830)) {
+       temp = INREG(CURSOR_A_CONTROL);
+       temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE | MCURSOR_MEM_TYPE_LOCAL |
+ 		MCURSOR_PIPE_SELECT);
+@@ -308,7 +308,7 @@ I830SetCursorPosition(ScrnInfoPtr pScrn,
+    }
+ 
+    /* have to upload the base for the new position */
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++   if (IS_I9X5(pI830)) {
+       if (pI830->CursorIsARGB)
+          OUTREG(CURSOR_A_BASE, pI830->CursorMemARGB->Physical);
+       else
+@@ -339,7 +339,7 @@ I830ShowCursor(ScrnInfoPtr pScrn)
+ 	   pI830->CursorMemARGB->Physical, pI830->CursorMemARGB->Start);
+ 
+    pI830->cursorOn = TRUE;
+-   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
++   if (IS_MOBILE(pI830) || IS_I9X5(pI830)) {
+       temp = INREG(CURSOR_A_CONTROL);
+       temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
+       if (pI830->CursorIsARGB)
+@@ -387,7 +387,7 @@ I830HideCursor(ScrnInfoPtr pScrn)
+    DPRINTF(PFX, "I830HideCursor\n");
+ 
+    pI830->cursorOn = FALSE;
+-   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
++   if (IS_MOBILE(pI830) || IS_I9X5(pI830)) {
+       temp = INREG(CURSOR_A_CONTROL);
+       temp &= ~CURSOR_MODE;
+       temp |= CURSOR_MODE_DISABLE;
diff --git a/x11/xorg-libs/patches/patch-cd b/x11/xorg-libs/patches/patch-cd
new file mode 100644
index 00000000000..48eaf10d447
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-cd
@@ -0,0 +1,93 @@
+$NetBSD: patch-cd,v 1.1 2006/06/17 12:33:53 markd Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c.orig	2006-06-06 21:19:18.000000000 +1200
++++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
+@@ -196,6 +196,7 @@ static SymTabRec I830BIOSChipsets[] = {
+    {PCI_CHIP_E7221_G,		"E7221 (i915)"},
+    {PCI_CHIP_I915_GM,		"915GM"},
+    {PCI_CHIP_I945_G,		"945G"},
++   {PCI_CHIP_I945_GM,		"945GM"},
+    {-1,				NULL}
+ };
+ 
+@@ -208,6 +209,7 @@ static PciChipsets I830BIOSPciChipsets[]
+    {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	RES_SHARED_VGA},
+    {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	RES_SHARED_VGA},
+    {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	RES_SHARED_VGA},
++   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	RES_SHARED_VGA},
+    {-1,				-1,			RES_UNDEFINED}
+ };
+ 
+@@ -1323,7 +1325,7 @@ I830DetectMemory(ScrnInfoPtr pScrn)
+     * The GTT varying according the the FbMapSize and the popup is 4KB */
+    range = (pI830->FbMapSize / (1024*1024)) + 4;
+ 
+-   if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++   if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9X5(pI830)) {
+       switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
+       case I855_GMCH_GMS_STOLEN_1M:
+ 	 memsize = MB(1) - KB(range);
+@@ -1341,7 +1343,7 @@ I830DetectMemory(ScrnInfoPtr pScrn)
+ 	 memsize = MB(32) - KB(range);
+ 	 break;
+       case I915G_GMCH_GMS_STOLEN_48M:
+-	 if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
++	 if (IS_I9X5(pI830))
+ 	    memsize = MB(48) - KB(range);
+ 	 break;
+       case I915G_GMCH_GMS_STOLEN_64M:
+@@ -2090,6 +2092,9 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+    case PCI_CHIP_I945_G:
+       chipname = "945G";
+       break;
++   case PCI_CHIP_I945_GM:
++      chipname = "945GM";
++      break;
+    default:
+       chipname = "unknown chipset";
+       break;
+@@ -2127,7 +2132,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+       pI830->LinearAddr = pI830->pEnt->device->MemBase;
+       from = X_CONFIG;
+    } else {
+-      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++      if (IS_I9X5(pI830)) {
+ 	 pI830->LinearAddr = pI830->PciInfo->memBase[2] & 0xF0000000;
+ 	 from = X_PROBED;
+       } else if (pI830->PciInfo->memBase[1] != 0) {
+@@ -2149,7 +2154,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+       pI830->MMIOAddr = pI830->pEnt->device->IOBase;
+       from = X_CONFIG;
+    } else {
+-      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++      if (IS_I9X5(pI830)) {
+ 	 pI830->MMIOAddr = pI830->PciInfo->memBase[0] & 0xFFF80000;
+ 	 from = X_PROBED;
+       } else if (pI830->PciInfo->memBase[1]) {
+@@ -2194,7 +2199,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+ 	 pI830->FbMapSize = 0x4000000; /* 64MB - has this been tested ?? */
+       }
+    } else {
+-      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++      if (IS_I9X5(pI830)) {
+ 	 if (pI830->PciInfo->memBase[2] & 0x08000000)
+ 	    pI830->FbMapSize = 0x8000000;	/* 128MB aperture */
+ 	 else
+@@ -2227,7 +2232,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+    if (pI830->PciInfo->chipType == PCI_CHIP_E7221_G)
+       pI830->availablePipes = 1;
+    else
+-   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
++   if (IS_MOBILE(pI830) || IS_I9X5(pI830))
+       pI830->availablePipes = 2;
+    else
+       pI830->availablePipes = 1;
+@@ -2872,7 +2877,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+    }
+ 
+    /* Check if the HW cursor needs physical address. */
+-   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
++   if (IS_MOBILE(pI830) || IS_I9X5(pI830))
+       pI830->CursorNeedsPhysical = TRUE;
+    else
+       pI830->CursorNeedsPhysical = FALSE;
diff --git a/x11/xorg-libs/patches/patch-ce b/x11/xorg-libs/patches/patch-ce
new file mode 100644
index 00000000000..debad14a2d2
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ce
@@ -0,0 +1,40 @@
+$NetBSD: patch-ce,v 1.1 2006/06/17 12:33:53 markd Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c.orig	2006-06-06 21:30:22.000000000 +1200
++++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c
+@@ -1239,7 +1239,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsi
+ 
+    i830Reg->Fence[nr] = 0;
+ 
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
++   if (IS_I9X5(pI830))
+    	fence_mask = ~I915G_FENCE_START_MASK;
+    else
+    	fence_mask = ~I830_FENCE_START_MASK;
+@@ -1247,7 +1247,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsi
+    if (start & fence_mask) {
+       xf86DrvMsg(X_WARNING, pScrn->scrnIndex,
+ 		 "SetFence: %d: start (0x%08x) is not %s aligned\n",
+-		 nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) ? "1MB" : "512k");
++		 nr, start, (IS_I9X5(pI830)) ? "1MB" : "512k");
+       return;
+    }
+ 
+@@ -1267,7 +1267,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsi
+ 
+    val = (start | FENCE_X_MAJOR | FENCE_VALID);
+ 
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++   if (IS_I9X5(pI830)) {
+    	switch (size) {
+ 	   case MB(1):
+       		val |= I915G_FENCE_SIZE_1M;
+@@ -1328,7 +1328,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsi
+    	}
+    }
+ 
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
++   if (IS_I9X5(pI830))
+ 	fence_pitch = pitch / 512;
+    else
+ 	fence_pitch = pitch / 128;
diff --git a/x11/xorg-libs/patches/patch-cf b/x11/xorg-libs/patches/patch-cf
new file mode 100644
index 00000000000..6459b3f3c3a
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-cf
@@ -0,0 +1,150 @@
+$NetBSD: patch-cf,v 1.1 2006/06/17 12:33:53 markd Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig	2006-06-06 21:36:40.000000000 +1200
++++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c
+@@ -617,7 +617,7 @@ I830SetupImageVideo(ScreenPtr pScreen)
+    adapt->nAttributes = NUM_ATTRIBUTES;
+    if (pI830->Clone)
+       adapt->nAttributes += CLONE_ATTRIBUTES;
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
++   if (IS_I9X5(pI830))
+       adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
+    adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
+    /* Now copy the attributes */
+@@ -628,7 +628,7 @@ I830SetupImageVideo(ScreenPtr pScreen)
+       memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
+       att+=CLONE_ATTRIBUTES;
+    }
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++   if (IS_I9X5(pI830)) {
+       memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
+       att+=GAMMA_ATTRIBUTES;
+    }
+@@ -688,7 +688,7 @@ I830SetupImageVideo(ScreenPtr pScreen)
+    if (pI830->Clone)
+      xvPipe = MAKE_ATOM("XV_PIPE");
+ 
+-   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
++   if (IS_I9X5(pI830)) {
+      xvGamma0 = MAKE_ATOM("XV_GAMMA0");
+      xvGamma1 = MAKE_ATOM("XV_GAMMA1");
+      xvGamma2 = MAKE_ATOM("XV_GAMMA2");
+@@ -806,7 +806,7 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+          overlay->OCONFIG |= OVERLAY_PIPE_B;
+       if (pPriv->overlayOK)
+          OVERLAY_UPDATE;
+-   } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma0 && (IS_I9X5(pI830))) {
+       /* Avoid video anomalies, so set gamma registers when overlay is off */
+       /* We also clamp the values if they are outside the ranges */
+       if (!*pI830->overlayOn) {
+@@ -815,35 +815,35 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+ 	   pPriv->gamma1 = pPriv->gamma0 + 0x7d;
+       } else
+          return BadRequest;
+-   } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma1 && (IS_I9X5(pI830))) {
+       if (!*pI830->overlayOn) {
+          pPriv->gamma1 = value;
+          if (pPriv->gamma1 - pPriv->gamma0 > 0x7d)
+            pPriv->gamma0 = pPriv->gamma1 - 0x7d;
+       } else
+          return BadRequest;
+-   } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma2 && (IS_I9X5(pI830))) {
+       if (!*pI830->overlayOn) {
+          pPriv->gamma2 = value;
+          if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
+             pPriv->gamma3 = pPriv->gamma2 + 0x7d;
+       } else
+          return BadRequest;
+-   } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma3 && (IS_I9X5(pI830))) {
+       if (!*pI830->overlayOn) {
+          pPriv->gamma3 = value;
+          if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
+             pPriv->gamma2 = pPriv->gamma3 - 0x7d;
+       } else
+          return BadRequest;
+-   } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma4 && (IS_I9X5(pI830))) {
+       if (!*pI830->overlayOn) {
+          pPriv->gamma4 = value;
+          if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
+             pPriv->gamma5 = pPriv->gamma4 + 0x7d;
+       } else
+          return BadRequest;
+-   } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma5 && (IS_I9X5(pI830))) {
+       if (!*pI830->overlayOn) {
+          pPriv->gamma5 = value;
+          if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
+@@ -875,7 +875,7 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+         attribute == xvGamma2 ||
+         attribute == xvGamma3 ||
+         attribute == xvGamma4 ||
+-        attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++        attribute == xvGamma5) && (IS_I9X5(pI830))) {
+ 	I830UpdateGamma(pScrn);
+    }
+ 
+@@ -895,17 +895,17 @@ I830GetPortAttribute(ScrnInfoPtr pScrn,
+       *value = pPriv->contrast;
+    } else if (pI830->Clone && attribute == xvPipe) {
+       *value = pPriv->pipe;
+-   } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma0 && (IS_I9X5(pI830))) {
+       *value = pPriv->gamma0;
+-   } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma1 && (IS_I9X5(pI830))) {
+       *value = pPriv->gamma1;
+-   } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma2 && (IS_I9X5(pI830))) {
+       *value = pPriv->gamma2;
+-   } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma3 && (IS_I9X5(pI830))) {
+       *value = pPriv->gamma3;
+-   } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma4 && (IS_I9X5(pI830))) {
+       *value = pPriv->gamma4;
+-   } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
++   } else if (attribute == xvGamma5 && (IS_I9X5(pI830))) {
+       *value = pPriv->gamma5;
+    } else if (attribute == xvColorKey) {
+       *value = pPriv->colorKey;
+@@ -1182,7 +1182,7 @@ I830DisplayVideo(ScrnInfoPtr pScrn, int 
+    if (!pPriv->overlayOK)
+       return;
+ 
+-   if (IS_I915G(pI830) || IS_I915GM(pI830)) {
++   if (IS_I9X5(pI830)) {
+       shift = 6;
+       mask = 0x3f;
+    } else {
+@@ -1221,7 +1221,7 @@ I830DisplayVideo(ScrnInfoPtr pScrn, int 
+       swidth = ((offsety + width + mask) >> shift) -
+ 	    (offsety >> shift);
+ 
+-      if (IS_I915G(pI830) || IS_I915GM(pI830))
++      if (IS_I9X5(pI830))
+          swidth <<= 1;
+ 
+       swidth -= 1;
+@@ -1233,7 +1233,7 @@ I830DisplayVideo(ScrnInfoPtr pScrn, int 
+       swidth = ((offsetu + (width / 2) + mask) >> shift) -
+ 	    (offsetu >> shift);
+ 
+-      if (IS_I915G(pI830) || IS_I915GM(pI830))
++      if (IS_I9X5(pI830))
+          swidth <<= 1;
+ 
+       swidth -= 1;
+@@ -1257,7 +1257,7 @@ I830DisplayVideo(ScrnInfoPtr pScrn, int 
+       swidth = ((offsety + (width << 1) + mask) >> shift) -
+ 	    (offsety >> shift);
+ 
+-      if (IS_I915G(pI830) || IS_I915GM(pI830))
++      if (IS_I9X5(pI830))
+          swidth <<= 1;
+ 
+       swidth -= 1;
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index a97c6eee524..e6a14ae4f2d 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2006/05/03 12:23:48 tron Exp $
+# $NetBSD: Makefile,v 1.44 2006/06/17 12:33:53 markd Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz \