summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-01-08 17:08:41 +0100
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-01-24 13:06:24 +0100
commit0cdc1d07b4616f164978e8f1b3a5fe8b0a3ac835 (patch)
treedfc2ce2bd2a99ca13582516db674cbf184a62331
parentd19f958db23c14c857e3eaa0cefa6a9c55e1468d (diff)
downloadlinux-0cdc1d07b4616f164978e8f1b3a5fe8b0a3ac835.tar.bz2
drm/i915: Make HW readout mark CRTC scaler as in use.
This way we don't accidentally double allocate it. Noticed this when I wrote a patch to sanity check all of the scaler state. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190108160842.13396-4-maarten.lankhorst@linux.intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a02ce5a47f44..36c1126cbc85 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8878,6 +8878,7 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
pipe_config->pch_pfit.enabled = true;
pipe_config->pch_pfit.pos = I915_READ(SKL_PS_WIN_POS(crtc->pipe, i));
pipe_config->pch_pfit.size = I915_READ(SKL_PS_WIN_SZ(crtc->pipe, i));
+ scaler_state->scalers[i].in_use = true;
break;
}
}