diff options
| -rw-r--r-- | lib/intel_chipset.h | 5 | ||||
| -rw-r--r-- | tools/intel_audio_dump.c | 4 | ||||
| -rw-r--r-- | tools/intel_watermark.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 1716b835..fe4928ac 100644 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -172,6 +172,9 @@ void intel_check_pch(void); #define HAS_BSD_RING(devid) AT_LEAST_GEN(devid, 5) #define HAS_BLT_RING(devid) AT_LEAST_GEN(devid, 6) -#define HAS_PCH_SPLIT(devid) AT_LEAST_GEN(devid, 5) /* XXX Valleyview? */ +#define HAS_PCH_SPLIT(devid) (AT_LEAST_GEN(devid, 5) && \ + !(IS_VALLEYVIEW(devid) || \ + IS_CHERRYVIEW(devid) || \ + IS_BROXTON(devid))) #endif /* _INTEL_CHIPSET_H */ diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c index aacd52f4..6d49756f 100644 --- a/tools/intel_audio_dump.c +++ b/tools/intel_audio_dump.c @@ -2479,6 +2479,8 @@ int main(int argc, char **argv) printf("%s audio registers:\n\n", intel_device_info(devid)->codename); if (IS_VALLEYVIEW(devid)) { dump_ironlake(); + } else if (IS_CHERRYVIEW(devid)) { + dump_braswell(); } else if (IS_GEN9(devid) || IS_BROADWELL(devid) || IS_HASWELL(devid)) { dump_hsw_plus(); @@ -2490,8 +2492,6 @@ int main(int argc, char **argv) dump_ironlake(); } else if (IS_G4X(devid)) { dump_eaglelake(); - } else if (IS_CHERRYVIEW(devid)) { - dump_braswell(); } return 0; diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index 68bd8ec8..e9a2b057 100644 --- a/tools/intel_watermark.c +++ b/tools/intel_watermark.c @@ -900,11 +900,11 @@ int main(int argc, char *argv[]) { devid = intel_get_pci_device()->device_id; - if (HAS_PCH_SPLIT(devid)) { - ilk_wm_dump(); - } else if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) { + if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) { display_base = 0x180000; vlv_wm_dump(); + } else if (HAS_PCH_SPLIT(devid)) { + ilk_wm_dump(); } else if (IS_G4X(devid)) { g4x_wm_dump(); } else if (IS_GEN4(devid)) { |