drm/i915: Preserve scaler state when clearing crtc_state

crtc_state is cleared during mode set which wipes out complete
scaler state too. This is causing issues. To fix, ensure scaler
state is preserved because it contains not only crtc
scaler usage, but also planes using scalers on this crtc.

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 26f1602..c14ab7b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10839,11 +10839,14 @@ static void
 clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
 {
        struct drm_crtc_state tmp_state;
+       struct intel_crtc_scaler_state scaler_state;
 
-       /* Clear only the intel specific part of the crtc state */
+       /* Clear only the intel specific part of the crtc state excluding scalers */
        tmp_state = crtc_state->base;
+       scaler_state = crtc_state->scaler_state;
        memset(crtc_state, 0, sizeof *crtc_state);
        crtc_state->base = tmp_state;
+       crtc_state->scaler_state = scaler_state;
 }
 
 static struct intel_crtc_state *