From ff8d1156723f235e82cb4fcfd2cd6e5a5bb211fa Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Wed, 24 Oct 2018 19:24:55 +0300 Subject: tools/intel_watermark: Recognize cnl+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Reviewed-by: Rodrigo Vivi --- tools/intel_watermark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') 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(); -- cgit v1.2.3