On Tue, Sep 23, 2025 at 06:40:40PM +0530, Ankit Nautiyal wrote: > The helper intel_dsb_wait_vblank_delay() is used in DSB to wait for the > delayed vblank after the send push operation. Rename it to > intel_dsb_wait_for_delayed_vblank() to align with the semantics. > > v2: Rename to intel_dsb_wait_vblank_delay instead of the proposed SCL > semantics, as this will be ot only about SCL lines with different timing > generator and different refresh rate modes. (Ville) > > Signed-off-by: Ankit Nautiyal <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_color.c | 2 +- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > drivers/gpu/drm/i915/display/intel_dsb.c | 4 ++-- > drivers/gpu/drm/i915/display/intel_dsb.h | 4 ++-- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_color.c > b/drivers/gpu/drm/i915/display/intel_color.c > index 671db6926e4c..51db70d07fae 100644 > --- a/drivers/gpu/drm/i915/display/intel_color.c > +++ b/drivers/gpu/drm/i915/display/intel_color.c > @@ -2013,7 +2013,7 @@ void intel_color_prepare_commit(struct > intel_atomic_state *state, > > if (crtc_state->use_dsb && intel_color_uses_chained_dsb(crtc_state)) { > intel_vrr_send_push(crtc_state->dsb_color, crtc_state); > - intel_dsb_wait_vblank_delay(state, crtc_state->dsb_color); > + intel_dsb_wait_for_delayed_vblank(state, crtc_state->dsb_color); > intel_vrr_check_push_sent(crtc_state->dsb_color, crtc_state); > intel_dsb_interrupt(crtc_state->dsb_color); > } > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index aceafe4478d9..445400ed6592 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -7268,7 +7268,7 @@ static void intel_atomic_dsb_finish(struct > intel_atomic_state *state, > intel_dsb_wait_vblanks(new_crtc_state->dsb_commit, 1); > > intel_vrr_send_push(new_crtc_state->dsb_commit, new_crtc_state); > - intel_dsb_wait_vblank_delay(state, new_crtc_state->dsb_commit); > + intel_dsb_wait_for_delayed_vblank(state, > new_crtc_state->dsb_commit); > intel_vrr_check_push_sent(new_crtc_state->dsb_commit, > new_crtc_state); > intel_dsb_interrupt(new_crtc_state->dsb_commit); > diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c > b/drivers/gpu/drm/i915/display/intel_dsb.c > index ca31e928ecb0..0584a9597327 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsb.c > +++ b/drivers/gpu/drm/i915/display/intel_dsb.c > @@ -815,8 +815,8 @@ void intel_dsb_chain(struct intel_atomic_state *state, > wait_for_vblank ? DSB_WAIT_FOR_VBLANK : 0); > } > > -void intel_dsb_wait_vblank_delay(struct intel_atomic_state *state, > - struct intel_dsb *dsb) > +void intel_dsb_wait_for_delayed_vblank(struct intel_atomic_state *state, > + struct intel_dsb *dsb) > { > struct intel_crtc *crtc = dsb->crtc; > const struct intel_crtc_state *crtc_state = > diff --git a/drivers/gpu/drm/i915/display/intel_dsb.h > b/drivers/gpu/drm/i915/display/intel_dsb.h > index c8f4499916eb..2f31f2c1d0c5 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsb.h > +++ b/drivers/gpu/drm/i915/display/intel_dsb.h > @@ -48,8 +48,8 @@ void intel_dsb_nonpost_end(struct intel_dsb *dsb); > void intel_dsb_interrupt(struct intel_dsb *dsb); > void intel_dsb_wait_usec(struct intel_dsb *dsb, int count); > void intel_dsb_wait_vblanks(struct intel_dsb *dsb, int count); > -void intel_dsb_wait_vblank_delay(struct intel_atomic_state *state, > - struct intel_dsb *dsb); > +void intel_dsb_wait_for_delayed_vblank(struct intel_atomic_state *state, > + struct intel_dsb *dsb); > void intel_dsb_wait_scanline_in(struct intel_atomic_state *state, > struct intel_dsb *dsb, > int lower, int upper); > -- > 2.45.2 -- Ville Syrjälä Intel
