Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9569aa1 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1497047175-27250-15-git-send-email-rodrigo.vivi@intel.com
parent 1a7399aa

drivers/gpu/drm/i915/intel_atomic.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

			/*