drm/i915/cnl: Fix Cannonlake scaler mode programing.

As Geminilake scalers Cannonlake also don't need and don't have
the "high quality" mode programming.

Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1497047175-27250-15-git-send-email-rodrigo.vivi@intel.com

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index d791b3ef89b55b51900810d5c550990ee5172847..36d4e635e4ce4af14293f8c4001906b29a4c4516 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -325,7 +325,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
                }
 
                /* set scaler mode */
-               if (IS_GEMINILAKE(dev_priv)) {
+               if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
                        scaler_state->scalers[*scaler_id].mode = 0;
                } else if (num_scalers_need == 1 && intel_crtc->pipe != PIPE_C) {
                        /*