i915: Drop chipset detection code for 965+ chipsets.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h
index 1e98cf4215d72a17f0fa62b3d0cfe70c66bc078b..8375a4b4dab8b392f26c2976a087ddb90e502ce3 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_chipset.h
+++ b/src/mesa/drivers/dri/i915/intel_chipset.h
@@ -53,107 +53,6 @@
 #define IS_IGDG(devid) (devid == PCI_CHIP_IGD_G)
 #define IS_IGD(devid) (IS_IGDG(devid) || IS_IGDGM(devid))
 
-#define PCI_CHIP_I965_G                        0x29A2
-#define PCI_CHIP_I965_Q                        0x2992
-#define PCI_CHIP_I965_G_1              0x2982
-#define PCI_CHIP_I946_GZ               0x2972
-#define PCI_CHIP_I965_GM                0x2A02
-#define PCI_CHIP_I965_GME               0x2A12
-
-#define PCI_CHIP_GM45_GM                0x2A42
-
-#define PCI_CHIP_IGD_E_G                0x2E02
-#define PCI_CHIP_Q45_G                  0x2E12
-#define PCI_CHIP_G45_G                  0x2E22
-#define PCI_CHIP_G41_G                  0x2E32
-#define PCI_CHIP_B43_G                  0x2E42
-#define PCI_CHIP_B43_G1                 0x2E92
-
-#define PCI_CHIP_ILD_G                  0x0042
-#define PCI_CHIP_ILM_G                  0x0046
-
-#define PCI_CHIP_SANDYBRIDGE_GT1       0x0102  /* Desktop */
-#define PCI_CHIP_SANDYBRIDGE_GT2       0x0112
-#define PCI_CHIP_SANDYBRIDGE_GT2_PLUS  0x0122
-#define PCI_CHIP_SANDYBRIDGE_M_GT1     0x0106  /* Mobile */
-#define PCI_CHIP_SANDYBRIDGE_M_GT2     0x0116
-#define PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS        0x0126
-#define PCI_CHIP_SANDYBRIDGE_S         0x010A  /* Server */
-
-#define PCI_CHIP_IVYBRIDGE_GT1          0x0152  /* Desktop */
-#define PCI_CHIP_IVYBRIDGE_GT2          0x0162
-#define PCI_CHIP_IVYBRIDGE_M_GT1        0x0156  /* Mobile */
-#define PCI_CHIP_IVYBRIDGE_M_GT2        0x0166
-#define PCI_CHIP_IVYBRIDGE_S_GT1        0x015a  /* Server */
-#define PCI_CHIP_IVYBRIDGE_S_GT2        0x016a
-
-#define PCI_CHIP_BAYTRAIL_M_1           0x0F31
-#define PCI_CHIP_BAYTRAIL_M_2           0x0F32
-#define PCI_CHIP_BAYTRAIL_M_3           0x0F33
-#define PCI_CHIP_BAYTRAIL_M_4           0x0157
-#define PCI_CHIP_BAYTRAIL_D             0x0155
-
-#define PCI_CHIP_HASWELL_GT1            0x0402 /* Desktop */
-#define PCI_CHIP_HASWELL_GT2            0x0412
-#define PCI_CHIP_HASWELL_GT3            0x0422
-#define PCI_CHIP_HASWELL_M_GT1          0x0406 /* Mobile */
-#define PCI_CHIP_HASWELL_M_GT2          0x0416
-#define PCI_CHIP_HASWELL_M_GT3          0x0426
-#define PCI_CHIP_HASWELL_S_GT1          0x040A /* Server */
-#define PCI_CHIP_HASWELL_S_GT2          0x041A
-#define PCI_CHIP_HASWELL_S_GT3          0x042A
-#define PCI_CHIP_HASWELL_B_GT1          0x040B /* Reserved */
-#define PCI_CHIP_HASWELL_B_GT2          0x041B
-#define PCI_CHIP_HASWELL_B_GT3          0x042B
-#define PCI_CHIP_HASWELL_E_GT1          0x040E /* Reserved */
-#define PCI_CHIP_HASWELL_E_GT2          0x041E
-#define PCI_CHIP_HASWELL_E_GT3          0x042E
-#define PCI_CHIP_HASWELL_SDV_GT1        0x0C02 /* Desktop */
-#define PCI_CHIP_HASWELL_SDV_GT2        0x0C12
-#define PCI_CHIP_HASWELL_SDV_GT3        0x0C22
-#define PCI_CHIP_HASWELL_SDV_M_GT1      0x0C06 /* Mobile */
-#define PCI_CHIP_HASWELL_SDV_M_GT2      0x0C16
-#define PCI_CHIP_HASWELL_SDV_M_GT3      0x0C26
-#define PCI_CHIP_HASWELL_SDV_S_GT1      0x0C0A /* Server */
-#define PCI_CHIP_HASWELL_SDV_S_GT2      0x0C1A
-#define PCI_CHIP_HASWELL_SDV_S_GT3      0x0C2A
-#define PCI_CHIP_HASWELL_SDV_B_GT1      0x0C0B /* Reserved */
-#define PCI_CHIP_HASWELL_SDV_B_GT2      0x0C1B
-#define PCI_CHIP_HASWELL_SDV_B_GT3      0x0C2B
-#define PCI_CHIP_HASWELL_SDV_E_GT1      0x0C0E /* Reserved */
-#define PCI_CHIP_HASWELL_SDV_E_GT2      0x0C1E
-#define PCI_CHIP_HASWELL_SDV_E_GT3      0x0C2E
-#define PCI_CHIP_HASWELL_ULT_GT1        0x0A02 /* Desktop */
-#define PCI_CHIP_HASWELL_ULT_GT2        0x0A12
-#define PCI_CHIP_HASWELL_ULT_GT3        0x0A22
-#define PCI_CHIP_HASWELL_ULT_M_GT1      0x0A06 /* Mobile */
-#define PCI_CHIP_HASWELL_ULT_M_GT2      0x0A16
-#define PCI_CHIP_HASWELL_ULT_M_GT3      0x0A26
-#define PCI_CHIP_HASWELL_ULT_S_GT1      0x0A0A /* Server */
-#define PCI_CHIP_HASWELL_ULT_S_GT2      0x0A1A
-#define PCI_CHIP_HASWELL_ULT_S_GT3      0x0A2A
-#define PCI_CHIP_HASWELL_ULT_B_GT1      0x0A0B /* Reserved */
-#define PCI_CHIP_HASWELL_ULT_B_GT2      0x0A1B
-#define PCI_CHIP_HASWELL_ULT_B_GT3      0x0A2B
-#define PCI_CHIP_HASWELL_ULT_E_GT1      0x0A0E /* Reserved */
-#define PCI_CHIP_HASWELL_ULT_E_GT2      0x0A1E
-#define PCI_CHIP_HASWELL_ULT_E_GT3      0x0A2E
-#define PCI_CHIP_HASWELL_CRW_GT1        0x0D02 /* Desktop */
-#define PCI_CHIP_HASWELL_CRW_GT2        0x0D12
-#define PCI_CHIP_HASWELL_CRW_GT3        0x0D22
-#define PCI_CHIP_HASWELL_CRW_M_GT1      0x0D06 /* Mobile */
-#define PCI_CHIP_HASWELL_CRW_M_GT2      0x0D16
-#define PCI_CHIP_HASWELL_CRW_M_GT3      0x0D26
-#define PCI_CHIP_HASWELL_CRW_S_GT1      0x0D0A /* Server */
-#define PCI_CHIP_HASWELL_CRW_S_GT2      0x0D1A
-#define PCI_CHIP_HASWELL_CRW_S_GT3      0x0D2A
-#define PCI_CHIP_HASWELL_CRW_B_GT1      0x0D0B /* Reserved */
-#define PCI_CHIP_HASWELL_CRW_B_GT2      0x0D1B
-#define PCI_CHIP_HASWELL_CRW_B_GT3      0x0D2B
-#define PCI_CHIP_HASWELL_CRW_E_GT1      0x0D0E /* Reserved */
-#define PCI_CHIP_HASWELL_CRW_E_GT2      0x0D1E
-#define PCI_CHIP_HASWELL_CRW_E_GT3      0x0D2E
-
 #define IS_MOBILE(devid)       (devid == PCI_CHIP_I855_GM || \
                                 devid == PCI_CHIP_I915_GM || \
                                 devid == PCI_CHIP_I945_GM || \
@@ -164,19 +63,6 @@
                                 IS_IGD(devid) || \
                                 devid == PCI_CHIP_ILM_G)
 
-#define IS_G45(devid)           (devid == PCI_CHIP_IGD_E_G || \
-                                 devid == PCI_CHIP_Q45_G || \
-                                 devid == PCI_CHIP_G45_G || \
-                                 devid == PCI_CHIP_G41_G || \
-                                 devid == PCI_CHIP_B43_G || \
-                                 devid == PCI_CHIP_B43_G1)
-#define IS_GM45(devid)          (devid == PCI_CHIP_GM45_GM)
-#define IS_G4X(devid)          (IS_G45(devid) || IS_GM45(devid))
-
-#define IS_ILD(devid)           (devid == PCI_CHIP_ILD_G)
-#define IS_ILM(devid)           (devid == PCI_CHIP_ILM_G)
-#define IS_GEN5(devid)          (IS_ILD(devid) || IS_ILM(devid))
-
 #define IS_915(devid)          (devid == PCI_CHIP_I915_G || \
                                 devid == PCI_CHIP_E7221_G || \
                                 devid == PCI_CHIP_I915_GM)
@@ -188,122 +74,8 @@
                                 devid == PCI_CHIP_Q33_G || \
                                 devid == PCI_CHIP_Q35_G || IS_IGD(devid))
 
-#define IS_GEN4(devid)         (devid == PCI_CHIP_I965_G || \
-                                devid == PCI_CHIP_I965_Q || \
-                                devid == PCI_CHIP_I965_G_1 || \
-                                devid == PCI_CHIP_I965_GM || \
-                                devid == PCI_CHIP_I965_GME || \
-                                devid == PCI_CHIP_I946_GZ || \
-                                IS_G4X(devid))
-
-/* Compat macro for intel_decode.c */
-#define IS_IRONLAKE(devid)     IS_GEN5(devid)
-
-#define IS_SNB_GT1(devid)      (devid == PCI_CHIP_SANDYBRIDGE_GT1 || \
-                                devid == PCI_CHIP_SANDYBRIDGE_M_GT1 || \
-                                devid == PCI_CHIP_SANDYBRIDGE_S)
-
-#define IS_SNB_GT2(devid)      (devid == PCI_CHIP_SANDYBRIDGE_GT2 || \
-                                devid == PCI_CHIP_SANDYBRIDGE_GT2_PLUS || \
-                                devid == PCI_CHIP_SANDYBRIDGE_M_GT2 || \
-                                devid == PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS)
-
-#define IS_GEN6(devid)         (IS_SNB_GT1(devid) || IS_SNB_GT2(devid))
-
-#define IS_IVB_GT1(devid)       (devid == PCI_CHIP_IVYBRIDGE_GT1 || \
-                                devid == PCI_CHIP_IVYBRIDGE_M_GT1 || \
-                                devid == PCI_CHIP_IVYBRIDGE_S_GT1)
-
-#define IS_IVB_GT2(devid)       (devid == PCI_CHIP_IVYBRIDGE_GT2 || \
-                                devid == PCI_CHIP_IVYBRIDGE_M_GT2 || \
-                                devid == PCI_CHIP_IVYBRIDGE_S_GT2)
-
-#define IS_IVYBRIDGE(devid)     (IS_IVB_GT1(devid) || IS_IVB_GT2(devid))
-
-#define IS_BAYTRAIL(devid)      (devid == PCI_CHIP_BAYTRAIL_M_1 || \
-                                 devid == PCI_CHIP_BAYTRAIL_M_2 || \
-                                 devid == PCI_CHIP_BAYTRAIL_M_3 || \
-                                 devid == PCI_CHIP_BAYTRAIL_M_4 || \
-                                 devid == PCI_CHIP_BAYTRAIL_D)
-
-#define IS_GEN7(devid)         (IS_IVYBRIDGE(devid) || \
-                                IS_BAYTRAIL(devid) || \
-                                IS_HASWELL(devid))
-
-#define IS_HSW_GT1(devid)      (devid == PCI_CHIP_HASWELL_GT1 || \
-                                devid == PCI_CHIP_HASWELL_M_GT1 || \
-                                devid == PCI_CHIP_HASWELL_S_GT1 || \
-                                devid == PCI_CHIP_HASWELL_B_GT1 || \
-                                devid == PCI_CHIP_HASWELL_E_GT1 || \
-                                devid == PCI_CHIP_HASWELL_SDV_GT1 || \
-                                devid == PCI_CHIP_HASWELL_SDV_M_GT1 || \
-                                devid == PCI_CHIP_HASWELL_SDV_S_GT1 || \
-                                devid == PCI_CHIP_HASWELL_SDV_B_GT1 || \
-                                devid == PCI_CHIP_HASWELL_SDV_E_GT1 || \
-                                devid == PCI_CHIP_HASWELL_ULT_GT1 || \
-                                devid == PCI_CHIP_HASWELL_ULT_M_GT1 || \
-                                devid == PCI_CHIP_HASWELL_ULT_S_GT1 || \
-                                devid == PCI_CHIP_HASWELL_ULT_B_GT1 || \
-                                devid == PCI_CHIP_HASWELL_ULT_E_GT1 || \
-                                devid == PCI_CHIP_HASWELL_CRW_GT1 || \
-                                devid == PCI_CHIP_HASWELL_CRW_M_GT1 || \
-                                devid == PCI_CHIP_HASWELL_CRW_S_GT1 || \
-                                devid == PCI_CHIP_HASWELL_CRW_B_GT1 || \
-                                devid == PCI_CHIP_HASWELL_CRW_E_GT1)
-#define IS_HSW_GT2(devid)      (devid == PCI_CHIP_HASWELL_GT2 || \
-                                devid == PCI_CHIP_HASWELL_M_GT2 || \
-                                devid == PCI_CHIP_HASWELL_S_GT2 || \
-                                devid == PCI_CHIP_HASWELL_B_GT2 || \
-                                devid == PCI_CHIP_HASWELL_E_GT2 || \
-                                devid == PCI_CHIP_HASWELL_SDV_GT2 || \
-                                devid == PCI_CHIP_HASWELL_SDV_M_GT2 || \
-                                devid == PCI_CHIP_HASWELL_SDV_S_GT2 || \
-                                devid == PCI_CHIP_HASWELL_SDV_B_GT2 || \
-                                devid == PCI_CHIP_HASWELL_SDV_E_GT2 || \
-                                devid == PCI_CHIP_HASWELL_ULT_GT2 || \
-                                devid == PCI_CHIP_HASWELL_ULT_M_GT2 || \
-                                devid == PCI_CHIP_HASWELL_ULT_S_GT2 || \
-                                devid == PCI_CHIP_HASWELL_ULT_B_GT2 || \
-                                devid == PCI_CHIP_HASWELL_ULT_E_GT2 || \
-                                devid == PCI_CHIP_HASWELL_CRW_GT2 || \
-                                devid == PCI_CHIP_HASWELL_CRW_M_GT2 || \
-                                devid == PCI_CHIP_HASWELL_CRW_S_GT2 || \
-                                devid == PCI_CHIP_HASWELL_CRW_B_GT2 || \
-                                devid == PCI_CHIP_HASWELL_CRW_E_GT2)
-#define IS_HSW_GT3(devid)      (devid == PCI_CHIP_HASWELL_GT3 || \
-                                devid == PCI_CHIP_HASWELL_M_GT3 || \
-                                devid == PCI_CHIP_HASWELL_S_GT3 || \
-                                devid == PCI_CHIP_HASWELL_B_GT3 || \
-                                devid == PCI_CHIP_HASWELL_E_GT3 || \
-                                devid == PCI_CHIP_HASWELL_SDV_GT3 || \
-                                devid == PCI_CHIP_HASWELL_SDV_M_GT3 || \
-                                devid == PCI_CHIP_HASWELL_SDV_S_GT3 || \
-                                devid == PCI_CHIP_HASWELL_SDV_B_GT3 || \
-                                devid == PCI_CHIP_HASWELL_SDV_E_GT3 || \
-                                devid == PCI_CHIP_HASWELL_ULT_GT3 || \
-                                devid == PCI_CHIP_HASWELL_ULT_M_GT3 || \
-                                devid == PCI_CHIP_HASWELL_ULT_S_GT3 || \
-                                devid == PCI_CHIP_HASWELL_ULT_B_GT3 || \
-                                devid == PCI_CHIP_HASWELL_ULT_E_GT3 || \
-                                devid == PCI_CHIP_HASWELL_CRW_GT3 || \
-                                devid == PCI_CHIP_HASWELL_CRW_M_GT3 || \
-                                devid == PCI_CHIP_HASWELL_CRW_S_GT3 || \
-                                devid == PCI_CHIP_HASWELL_CRW_B_GT3 || \
-                                devid == PCI_CHIP_HASWELL_CRW_E_GT3)
-
-#define IS_HASWELL(devid)       (IS_HSW_GT1(devid) || \
-                                IS_HSW_GT2(devid) || \
-                                IS_HSW_GT3(devid))
-
-#define IS_965(devid)          (IS_GEN4(devid) || \
-                                IS_G4X(devid) || \
-                                IS_GEN5(devid) || \
-                                IS_GEN6(devid) || \
-                                IS_GEN7(devid))
-
 #define IS_9XX(devid)          (IS_915(devid) || \
-                                IS_945(devid) || \
-                                IS_965(devid))
+                                IS_945(devid))
 
 #define IS_GEN3(devid)         (IS_915(devid) ||       \
                                 IS_945(devid))

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index a0ec7927540a69accdde41663f622470c68c17b9..cd4706cd69b055cf4a43baedf1dde2ab43a231fe 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -1157,15 +1157,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
 
    intelScreen->deviceID = drm_intel_bufmgr_gem_get_devid(intelScreen->bufmgr);
 
-   if (IS_GEN7(intelScreen->deviceID)) {
-      intelScreen->gen = 7;
-   } else if (IS_GEN6(intelScreen->deviceID)) {
-      intelScreen->gen = 6;
-   } else if (IS_GEN5(intelScreen->deviceID)) {
-      intelScreen->gen = 5;
-   } else if (IS_965(intelScreen->deviceID)) {
-      intelScreen->gen = 4;
-   } else if (IS_9XX(intelScreen->deviceID)) {
+   if (IS_9XX(intelScreen->deviceID)) {
       intelScreen->gen = 3;
    } else {
       intelScreen->gen = 2;