[Intel-gfx] [PATCH 6/6] drm/i915/cnl: Reuse skl_wm_get_hw_state on Cannonlake.

[Maarten Lankhorst]

Op 09-08-17 om 22:52 schreef Rodrigo Vivi:
> Otherwise it reuses the ilk that has a completely different
> wm.
>
> Cc: Mahesh Kumar <mahesh1.kumar at intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index e4af56b5ff27..ca988f4c4739 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14702,7 +14702,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);

For patches 1-4 + 6:

Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

I'll have to look closer at patch 5 with spec in hand. :)