From: Maarten Lankhorst Date: Tue, 8 Jan 2019 16:08:41 +0000 (+0100) Subject: drm/i915: Make HW readout mark CRTC scaler as in use. X-Git-Tag: v5.4-rc1~498^2~29^2~848 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cdc1d07b4616f164978e8f1b3a5fe8b0a3ac835;p=platform%2Fkernel%2Flinux-rpi.git 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 Reviewed-by: Hans de Goede Link: https://patchwork.freedesktop.org/patch/msgid/20190108160842.13396-4-maarten.lankhorst@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a02ce5a..36c1126 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; } }