diff options
author | Rodrigo Vivi <[email protected]> | 2017-08-09 13:52:48 -0700 |
---|---|---|
committer | Rodrigo Vivi <[email protected]> | 2017-08-16 07:43:12 -0700 |
commit | a029fa4d758f6a0a0f53c8f226d446206f32373f (patch) | |
tree | 62d9265f0ae2151c44e799c765e4bdb821fadc1e | |
parent | 6c64dd378aca528903cb9f7a60d04fc5c1a3bdbd (diff) |
drm/i915/cnl: Reuse skl_wm_get_hw_state on Cannonlake.
Otherwise it reuses the ilk that has a completely different
wm.
Cc: Mahesh Kumar <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Paulo Zanoni <[email protected]>
Signed-off-by: Rodrigo Vivi <[email protected]>
Reviewed-by: Maarten Lankhorst <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 29926244f4f2..0e93ec201fe3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15120,7 +15120,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev, } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { vlv_wm_get_hw_state(dev); vlv_wm_sanitize(dev_priv); - } else if (IS_GEN9(dev_priv)) { + } else if (INTEL_GEN(dev_priv) >= 9) { skl_wm_get_hw_state(dev); } else if (HAS_PCH_SPLIT(dev_priv)) { ilk_wm_get_hw_state(dev); |