summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2018-10-24 19:24:55 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2018-10-25 13:24:12 +0300
commitff8d1156723f235e82cb4fcfd2cd6e5a5bb211fa (patch)
tree590b8e4a8a12e99ce928928616b6e06d5d7609c3 /tools
parentf07bcbb4dc419ea6cffde28f1ace57c7c8f19cd8 (diff)
tools/intel_watermark: Recognize cnl+
Pick the skl+ code path for cnl+. And since this tool has nothing to do with pch let's also replace the has_pch_split check with gen>=5 check. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/intel_watermark.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
index 03da68b6..3fd37441 100644
--- a/tools/intel_watermark.c
+++ b/tools/intel_watermark.c
@@ -1142,12 +1142,12 @@ int main(int argc, char *argv[])
{
devid = intel_get_pci_device()->device_id;
- if (IS_GEN9(devid)) {
+ if (intel_gen(devid) >= 9) {
skl_wm_dump();
} else if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) {
display_base = 0x180000;
vlv_wm_dump();
- } else if (HAS_PCH_SPLIT(devid)) {
+ } else if (intel_gen(devid) >= 5) {
ilk_wm_dump();
} else if (IS_G4X(devid)) {
g4x_wm_dump();