Add chip family flags to i915 driver, and fix a missing '"' in mach64 ID list.

diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 0d2639e..0fc9775 100644 (file)
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -186,7 +186,7 @@
 0x1002 0x4c51 0 "3D Rage LT Pro"
 0x1002 0x4c42 0 "3D Rage LT Pro AGP-133"
 0x1002 0x4c44 0 "3D Rage LT Pro AGP-66"
-0x1002 0x4759 0 "Rage 3D IICATI 3D RAGE IIC AGP(A12/A13)
+0x1002 0x4759 0 "Rage 3D IICATI 3D RAGE IIC AGP(A12/A13)"
 0x1002 0x474c 0 "Rage XC"
 0x1002 0x474f 0 "Rage XL"
 0x1002 0x4752 0 "Rage XL"
@@ -266,18 +266,18 @@
 [ffb]
 
 [i915]
-0x8086 0x3577 0 "Intel i830M GMCH"
-0x8086 0x2562 0 "Intel i845G GMCH"
-0x8086 0x3582 0 "Intel i852GM/i855GM GMCH"
-0x8086 0x2572 0 "Intel i865G GMCH"
-0x8086 0x2582 0 "Intel i915G"
-0x8086 0x2592 0 "Intel i915GM"
-0x8086 0x2772 0 "Intel i945G"
-0x8086 0x27A2 0 "Intel i945GM"
-0x8086 0x2972 0 "Intel i946GZ"
-0x8086 0x2982 0 "Intel i965G"
-0x8086 0x2992 0 "Intel i965Q"
-0x8086 0x29A2 0 "Intel i965G"
+0x8086 0x3577 CHIP_I8XX "Intel i830M GMCH"
+0x8086 0x2562 CHIP_I8XX "Intel i845G GMCH"
+0x8086 0x3582 CHIP_I8XX "Intel i852GM/i855GM GMCH"
+0x8086 0x2572 CHIP_I8XX "Intel i865G GMCH"
+0x8086 0x2582 CHIP_I9XX|CHIP_I915 "Intel i915G"
+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 0x2972 CHIP_I9XX|CHIP_I965 "Intel i946GZ"
+0x8086 0x2982 CHIP_I9XX|CHIP_I965 "Intel i965G"
+0x8086 0x2992 CHIP_I9XX|CHIP_I965 "Intel i965Q"
+0x8086 0x29A2 CHIP_I9XX|CHIP_I965 "Intel i965G"
 
 [imagine]
 0x105d 0x2309 IMAGINE_128 "Imagine 128"

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index ef9f363..5a76cb1 100644 (file)
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -132,6 +132,13 @@ typedef struct drm_i915_private {
        unsigned int swaps_pending;
 } drm_i915_private_t;
 
+enum intel_chip_family {
+       CHIP_I8XX = 0x01,
+       CHIP_I9XX = 0x02,
+       CHIP_I915 = 0x04,
+       CHIP_I965 = 0x08,
+};
+
 extern drm_ioctl_desc_t i915_ioctls[];
 extern int i915_max_ioctl;