6738342 Need support for Intel i945GME

6 files changed, 10 insertions, 1 deletions

diff --git a/usr/src/pkgdefs/SUNWagp/postinstall b/usr/src/pkgdefs/SUNWagp/postinstall
index 13858091e1..e231ccdb54 100644
--- a/usr/src/pkgdefs/SUNWagp/postinstall
+++ b/usr/src/pkgdefs/SUNWagp/postinstall
@@ -41,6 +41,7 @@ BRALIAS="\
 	\"pci8086,2590\" \
 	\"pci8086,2770\" \
 	\"pci8086,27a0\" \
+	\"pci8086,27ac\" \
 	\"pci8086,2970\" \
 	\"pci8086,2980\" \
 	\"pci8086,2990\" \
diff --git a/usr/src/pkgdefs/SUNWdrmr/postinstall b/usr/src/pkgdefs/SUNWdrmr/postinstall
index 1155b58923..8bda640545 100644
--- a/usr/src/pkgdefs/SUNWdrmr/postinstall
+++ b/usr/src/pkgdefs/SUNWdrmr/postinstall
@@ -37,6 +37,7 @@ IGFX_ALIAS="\
 	\"pci8086,2592\" \
 	\"pci8086,2772\" \
 	\"pci8086,27a2\" \
+	\"pci8086,27ae\" \
 	\"pci8086,2972\" \
 	\"pci8086,2982\" \
 	\"pci8086,2992\" \
diff --git a/usr/src/uts/common/sys/agp/agpdefs.h b/usr/src/uts/common/sys/agp/agpdefs.h
index 0ddc082389..c77559ea85 100644
--- a/usr/src/uts/common/sys/agp/agpdefs.h
+++ b/usr/src/uts/common/sys/agp/agpdefs.h
@@ -88,6 +88,7 @@ extern "C" {
 #define	INTEL_BR_915GM			0x25908086
 #define	INTEL_BR_945			0x27708086
 #define	INTEL_BR_945GM			0x27a08086
+#define	INTEL_BR_945GME			0x27ac8086
 #define	INTEL_BR_946GZ			0x29708086
 #define	INTEL_BR_965G1			0x29808086
 #define	INTEL_BR_965Q			0x29908086
@@ -155,6 +156,7 @@ extern "C" {
 #define	INTEL_IGD_915GM			0x25928086
 #define	INTEL_IGD_945			0x27728086
 #define	INTEL_IGD_945GM			0x27a28086
+#define	INTEL_IGD_945GME		0x27ae8086
 #define	INTEL_IGD_946GZ			0x29728086
 #define	INTEL_IGD_965G1			0x29828086
 #define	INTEL_IGD_965Q			0x29928086
diff --git a/usr/src/uts/intel/io/agpgart/agptarget.c b/usr/src/uts/intel/io/agpgart/agptarget.c
index 131353f577..a03353c756 100644
--- a/usr/src/uts/intel/io/agpgart/agptarget.c
+++ b/usr/src/uts/intel/io/agpgart/agptarget.c
@@ -347,6 +347,8 @@ static gms_mode_t gms_modes[] = {
 		GMS_SIZE(gms_915_945_965), gms_915_945_965},
 	{INTEL_BR_945GM, I8XX_CONF_GC, I8XX_GC_MODE_MASK,
 		GMS_SIZE(gms_915_945_965), gms_915_945_965},
+	{INTEL_BR_945GME, I8XX_CONF_GC, I8XX_GC_MODE_MASK,
+		GMS_SIZE(gms_915_945_965), gms_915_945_965},
 	{INTEL_BR_946GZ, I8XX_CONF_GC, I8XX_GC_MODE_MASK,
 		GMS_SIZE(gms_915_945_965), gms_915_945_965},
 	{INTEL_BR_965G1, I8XX_CONF_GC, I8XX_GC_MODE_MASK,
diff --git a/usr/src/uts/intel/io/agpmaster/agpmaster.c b/usr/src/uts/intel/io/agpmaster/agpmaster.c
index 55d448d56c..7b4d290d23 100644
--- a/usr/src/uts/intel/io/agpmaster/agpmaster.c
+++ b/usr/src/uts/intel/io/agpmaster/agpmaster.c
@@ -92,7 +92,8 @@ int agpm_debug = 0;
 #define	IS_INTEL_915(agpmaster) ((agpmaster->agpm_id == INTEL_IGD_915) || \
 	(agpmaster->agpm_id == INTEL_IGD_915GM) || \
 	(agpmaster->agpm_id == INTEL_IGD_945) || \
-	(agpmaster->agpm_id == INTEL_IGD_945GM))
+	(agpmaster->agpm_id == INTEL_IGD_945GM) || \
+	(agpmaster->agpm_id == INTEL_IGD_945GME))
 
 /* Intel 965 series */
 #define	IS_INTEL_965(agpmaster) ((agpmaster->agpm_id == INTEL_IGD_946GZ) || \
@@ -633,6 +634,7 @@ detect_i8xx_device(agp_master_softc_t *master_softc)
 	case INTEL_IGD_915GM:
 	case INTEL_IGD_945:
 	case INTEL_IGD_945GM:
+	case INTEL_IGD_945GME:
 	case INTEL_IGD_946GZ:
 	case INTEL_IGD_965G1:
 	case INTEL_IGD_965G2:
diff --git a/usr/src/uts/intel/io/drm/drm_pciids.h b/usr/src/uts/intel/io/drm/drm_pciids.h
index 1951899485..c2a63d9f40 100644
--- a/usr/src/uts/intel/io/drm/drm_pciids.h
+++ b/usr/src/uts/intel/io/drm/drm_pciids.h
@@ -192,6 +192,7 @@ extern "C" {
 	{0x8086, 0x2592, CHIP_I9XX|CHIP_I915, "Intel i915GM"}, \
 	{0x8086, 0x2772, CHIP_I9XX|CHIP_I915, "Intel i945G"}, \
 	{0x8086, 0x27A2, CHIP_I9XX|CHIP_I915, "Intel i945GM"}, \
+	{0x8086, 0x27AE, CHIP_I9XX|CHIP_I915, "Intel i945GME"}, \
 	{0x8086, 0x2972, CHIP_I9XX|CHIP_I965, "Intel i946GZ"}, \
 	{0x8086, 0x2982, CHIP_I9XX|CHIP_I965, "Intel i965G"}, \
 	{0x8086, 0x2992, CHIP_I9XX|CHIP_I965, "Intel i965Q"}, \