From: Ville Syrjälä <[email protected]> To make life easier in the future let's pass the old crtc state to intel_crtc_vblank_off() just like we already do for its counterpart intel_crtc_vblank_on().
Cc: José Roberto de Souza <[email protected]> Cc: Manasi Navare <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 30f277aa228f..df69e4cd4707 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1825,8 +1825,10 @@ static void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state) drm_crtc_vblank_on(&crtc->base); } -static void intel_crtc_vblank_off(struct intel_crtc *crtc) +static void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state) { + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); + drm_crtc_vblank_off(&crtc->base); assert_vblank_disabled(&crtc->base); } @@ -6699,7 +6701,7 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state, intel_encoders_disable(state, crtc); - intel_crtc_vblank_off(crtc); + intel_crtc_vblank_off(old_crtc_state); intel_disable_pipe(old_crtc_state); @@ -6748,7 +6750,7 @@ static void haswell_crtc_disable(struct intel_atomic_state *state, intel_encoders_disable(state, crtc); - intel_crtc_vblank_off(crtc); + intel_crtc_vblank_off(old_crtc_state); /* XXX: Do the pipe assertions at the right place for BXT DSI. */ if (!transcoder_is_dsi(cpu_transcoder)) @@ -7113,7 +7115,7 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, intel_encoders_disable(state, crtc); - intel_crtc_vblank_off(crtc); + intel_crtc_vblank_off(old_crtc_state); intel_disable_pipe(old_crtc_state); -- 2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
