drm/i915: Make HW readout mark CRTC scaler as in use.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 8 Jan 2019 16:08:41 +0000 (17:08 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 24 Jan 2019 12:06:24 +0000 (13:06 +0100)
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
drivers/gpu/drm/i915/intel_display.c

index a02ce5a47f44aba3fde5543d40b6d7dd274f6414..36c1126cbc85376a8bbf9ca277fadf4a75155565 100644 (file)
@@ -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;
                }
        }