On Thu, 2025-08-28 at 15:20 +0300, Jani Nikula wrote: > Prefer generic poll helpers over i915 custom helpers. > > The functional change is losing the exponentially growing sleep of > wait_for(), which used to be 10, 20, 40, ..., 640, and 1280 us. > > Use an arbitrary constant 100 us sleep instead. The timeout remains > at 1 > ms. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Jouni Högander <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_dsb.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c > b/drivers/gpu/drm/i915/display/intel_dsb.c > index 53d8ae3a70e9..dee44d45b668 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsb.c > +++ b/drivers/gpu/drm/i915/display/intel_dsb.c > @@ -4,10 +4,11 @@ > * > */ > > +#include <linux/iopoll.h> > + > #include <drm/drm_print.h> > #include <drm/drm_vblank.h> > > -#include "i915_utils.h" > #include "intel_crtc.h" > #include "intel_de.h" > #include "intel_display_regs.h" > @@ -871,8 +872,13 @@ void intel_dsb_wait(struct intel_dsb *dsb) > struct intel_crtc *crtc = dsb->crtc; > struct intel_display *display = to_intel_display(crtc- > >base.dev); > enum pipe pipe = crtc->pipe; > + bool is_busy; > + int ret; > > - if (wait_for(!is_dsb_busy(display, pipe, dsb->id), 1)) { > + ret = poll_timeout_us(is_busy = is_dsb_busy(display, pipe, > dsb->id), > + !is_busy, > + 100, 1000, false); > + if (ret) { > u32 offset = intel_dsb_buffer_ggtt_offset(&dsb- > >dsb_buf); > > intel_de_write_fw(display, DSB_CTRL(pipe, dsb->id),
