diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-29 11:06:09 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-30 23:06:51 +0100 |
| commit | 37eec6dae6de794ed318c9f7ab615848d8b10820 (patch) | |
| tree | b6581ee2d38d7f57d526a17ce0db7d796f9516a7 | |
| parent | 83faf2b5fb2937d2b1a3c79c2802e4fce91d8652 (diff) | |
intel_chipset: Convert IS_PINEVIEW to device info
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | lib/intel_chipset.h | 12 | ||||
| -rw-r--r-- | tools/intel_reg_decode.c | 4 | ||||
| -rw-r--r-- | tools/intel_watermark.c | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 4f532a95..a40a8572 100644 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -111,10 +111,6 @@ void intel_check_pch(void); #define PCI_CHIP_IGD_GM 0xA011 #define PCI_CHIP_IGD_G 0xA001 -#define IS_IGDGM(devid) ((devid) == PCI_CHIP_IGD_GM) -#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 @@ -292,10 +288,6 @@ void intel_check_pch(void); (devid) == PCI_CHIP_I945_GME || \ IS_G33(devid)) -#define IS_G33(devid) ((devid) == PCI_CHIP_G33_G || \ - (devid) == PCI_CHIP_Q33_G || \ - (devid) == PCI_CHIP_Q35_G || IS_IGD(devid)) - #define IS_HSW_GT1(devid) ((devid) == PCI_CHIP_HASWELL_GT1 || \ (devid) == PCI_CHIP_HASWELL_M_GT1 || \ (devid) == PCI_CHIP_HASWELL_S_GT1 || \ @@ -404,6 +396,10 @@ void intel_check_pch(void); #define IS_KBL_GT4(devid) ((devid) == PCI_CHIP_KABYLAKE_HALO_GT4) +#define IS_PINEVIEW(devid) (intel_device_info(devid)->is_pineview) +#define IS_G33(devid) (intel_device_info(devid)->is_bearlake || \ + intel_device_info(devid)->is_pineview) + #define IS_IRONLAKE(devid) (intel_device_info(devid)->is_ironlake) #define IS_ARRANDALE(devid) (intel_device_info(devid)->is_arrandale) #define IS_IVYBRIDGE(devid) (intel_device_info(devid)->is_ivybridge) diff --git a/tools/intel_reg_decode.c b/tools/intel_reg_decode.c index 25365548..71f3ead6 100644 --- a/tools/intel_reg_decode.c +++ b/tools/intel_reg_decode.c @@ -392,7 +392,7 @@ DEBUGSTRING(i830_debug_vgacntrl) DEBUGSTRING(i830_debug_fp) { - if (IS_IGD(devid)) { + if (IS_PINEVIEW(devid)) { snprintf(result, len, "n = %d, m1 = %d, m2 = %d", ffs((val & FP_N_IGD_DIV_MASK) >> FP_N_DIV_SHIFT) - 1, @@ -496,7 +496,7 @@ DEBUGSTRING(i830_debug_dpll) } #endif } else { - if (IS_IGD(devid)) { + if (IS_PINEVIEW(devid)) { p1 = ffs((val & DPLL_FPA01_P1_POST_DIV_MASK_IGD) >> DPLL_FPA01_P1_POST_DIV_SHIFT_IGD); } else { diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index 133c058a..68bd8ec8 100644 --- a/tools/intel_watermark.c +++ b/tools/intel_watermark.c @@ -909,7 +909,7 @@ int main(int argc, char *argv[]) g4x_wm_dump(); } else if (IS_GEN4(devid)) { gen4_wm_dump(); - } else if (IS_IGD(devid)) { + } else if (IS_PINEVIEW(devid)) { pnv_wm_dump(); } else if (IS_GEN3(devid)) { gen3_wm_dump(); |