diff options
| author | Maarten Lankhorst | 2015-09-14 11:30:10 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-23 14:39:16 +0200 |
| commit | 7aefe2b50a0be5c85e7702bff110e5e187fbe4b5 (patch) | |
| tree | bea6fd5b945fce8d4a87c3fe44dc11be547f0661 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Program GuC MAX IDLE Count (diff) | |
| download | kernel-qcow2-linux-7aefe2b50a0be5c85e7702bff110e5e187fbe4b5.tar.gz kernel-qcow2-linux-7aefe2b50a0be5c85e7702bff110e5e187fbe4b5.tar.xz kernel-qcow2-linux-7aefe2b50a0be5c85e7702bff110e5e187fbe4b5.zip | |
drm/i915: Fix fastboot scalers for skylake.
The scaler_id in intel_pipe_config_compare should not be checked
when adjusting in intel_pipe_config_compare. The hw scaler id may
be changed in intel_update_pipe_config.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8db2b13499ba..6d718c0c3beb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12459,9 +12459,9 @@ intel_pipe_config_compare(struct drm_device *dev, PIPE_CONF_CHECK_X(pch_pfit.pos); PIPE_CONF_CHECK_X(pch_pfit.size); } - } - PIPE_CONF_CHECK_I(scaler_state.scaler_id); + PIPE_CONF_CHECK_I(scaler_state.scaler_id); + } /* BDW+ don't expose a synchronous way to read the state */ if (IS_HASWELL(dev)) |