[Intel-gfx] [PATCH 4/5] drm/i915: Make HW readout mark CRTC scaler as in use.

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Mon Dec 17 09:50:23 UTC 2018


This way we don't accidentally double allocate it and hopefully disable
it during fastset. I noticed this when I wrote a patch to sanity check
all of the scaler state.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2dd99e5437a5..825d9b9e7f28 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8849,6 +8849,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;
 		}
 	}
-- 
2.19.2



More information about the Intel-gfx mailing list