From: Ville Syrjälä Date: Fri, 13 Dec 2019 19:52:15 +0000 (+0200) Subject: drm/i915: Pass old crtc state to skylake_scaler_disable() X-Git-Tag: v5.6-rc1~114^2~17^2~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfb627c448510e07194cd97ec05fce3f7f279069;p=thirdparty%2Flinux.git drm/i915: Pass old crtc state to skylake_scaler_disable() To make life easier in the future let's pass the old crtc state to skylake_scaler_disable() just like we already do for for its ancestor ironlake_pfit_disable(). Cc: José Roberto de Souza Cc: Manasi Navare Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20191213195217.15168-3-ville.syrjala@linux.intel.com Reviewed-by: José Roberto de Souza --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d922f5918fcd8..12e39911b22ad 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5767,8 +5767,9 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, return 0; } -static void skylake_scaler_disable(struct intel_crtc *crtc) +static void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state) { + struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); int i; for (i = 0; i < crtc->num_scalers; i++) @@ -6760,7 +6761,7 @@ static void haswell_crtc_disable(struct intel_atomic_state *state, intel_dsc_disable(old_crtc_state); if (INTEL_GEN(dev_priv) >= 9) - skylake_scaler_disable(crtc); + skylake_scaler_disable(old_crtc_state); else ironlake_pfit_disable(old_crtc_state);