diff options
| author | Rodrigo Vivi | 2017-06-10 00:26:12 +0200 |
|---|---|---|
| committer | Rodrigo Vivi | 2017-06-12 18:45:55 +0200 |
| commit | f9569aa1e583d90a4347a213566a2334c93aa176 (patch) | |
| tree | 226afd1b1fec4fc2eeb68704c969b3792dd40edc /drivers/gpu/drm/i915/intel_atomic.c | |
| parent | drm/i915: Use HAS_CSR instead of gen number on DMC load. (diff) | |
| download | kernel-qcow2-linux-f9569aa1e583d90a4347a213566a2334c93aa176.tar.gz kernel-qcow2-linux-f9569aa1e583d90a4347a213566a2334c93aa176.tar.xz kernel-qcow2-linux-f9569aa1e583d90a4347a213566a2334c93aa176.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index d791b3ef89b5..36d4e635e4ce 100644 --- 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) { /* |