AMD General

> -----Original Message-----
> From: Ville Syrjälä <[email protected]>
> Sent: Wednesday, November 18, 2026 11:13 PM
> To: Liang, Prike <[email protected]>
> Cc: [email protected]; [email protected]; Deucher,
> Alexander <[email protected]>; Koenig, Christian
> <[email protected]>; Wentland, Harry <[email protected]>; Li,
> Sun peng (Leo) <[email protected]>; [email protected]
> Subject: Re: [PATCH RESEND 1/5] drm/client: Make the FBIO_WAITFORVSYNC
> vblank wait interruptible
>
> On Wed, Nov 11, 2026 at 04:55:30PM +0800, Prike Liang wrote:
> > FBIO_WAITFORVSYNC calls drm_client_modeset_wait_for_vblank(), which
> > waits with drm_crtc_wait_one_vblank(). That wait is uninterruptible
> > and only gives up after one second. If no vblank interrupt arrives,
> > for example while the driver resets the display hardware, the caller
> > sleeps in D state for the whole second and can't be interrupted, not
> > even by SIGKILL.
> >
> > DRM_IOCTL_WAIT_VBLANK waits interruptibly, and so do fbdev drivers
> > that implement FBIO_WAITFORVSYNC themselves, such as atyfb and matroxfb.
> >
> > Add drm_crtc_wait_one_vblank_interruptible(), a DRM-internal variant
> > of
> > drm_crtc_wait_one_vblank() that a signal can interrupt, and use it in
> > drm_client_modeset_wait_for_vblank(). Return -ERESTARTSYS when a
> > signal interrupts the wait, so that the ioctl returns to userspace or
> > is restarted. Timeouts and disabled CRTCs are still not reported.
> >
> > The fbdev damage worker also calls
> > drm_client_modeset_wait_for_vblank(),
> > but it runs in a kernel thread, which doesn't receive signals, so its
> > wait doesn't change. Drivers keep using drm_crtc_wait_one_vblank().
> >
> > Cc: Thomas Zimmermann <[email protected]>
> > Assisted-by: Copilot:claude-opus-5.5
> > Signed-off-by: Prike Liang <[email protected]>
> > ---
> >  drivers/gpu/drm/drm_client_modeset.c | 10 +++--
> >  drivers/gpu/drm/drm_internal.h       |  1 +
> >  drivers/gpu/drm/drm_vblank.c         | 60 ++++++++++++++++++++--------
> >  3 files changed, 51 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_client_modeset.c
> > b/drivers/gpu/drm/drm_client_modeset.c
> > index 0080a8e9556a..b475b8dbdb17 100644
> > --- a/drivers/gpu/drm/drm_client_modeset.c
> > +++ b/drivers/gpu/drm/drm_client_modeset.c
> > @@ -1301,10 +1301,11 @@ EXPORT_SYMBOL(drm_client_modeset_dpms);
> >   *
> >   * Block the caller until the given CRTC has seen a VBLANK. Do nothing
> >   * if the CRTC is disabled. If there's another DRM master present,
> > fail
> > - * with -EBUSY.
> > + * with -EBUSY. A signal interrupts the wait.
> >   *
> >   * Returns:
> > - * 0 on success, or negative error code otherwise.
> > + * 0 on success, -ERESTARTSYS if a signal interrupted the wait, or
> > + * negative error code otherwise.
> >   */
> >  int drm_client_modeset_wait_for_vblank(struct drm_client_dev *client,
> > unsigned int crtc_index)  { @@ -1328,13 +1329,14 @@ int
> > drm_client_modeset_wait_for_vblank(struct drm_client_dev *client, unsigned i
> >      */
> >     ret = drm_crtc_vblank_get(crtc);
> >     if (!ret) {
> > -           drm_crtc_wait_one_vblank(crtc);
> > +           ret = drm_crtc_wait_one_vblank_interruptible(crtc);
> >             drm_crtc_vblank_put(crtc);
> >     }
> >
> >     drm_master_internal_release(dev);
> >
> > -   return 0;
> > +   /* Only report interruption by a signal, not timeouts. */
> > +   return ret == -ERESTARTSYS ? ret : 0;
> >  }
> >  EXPORT_SYMBOL(drm_client_modeset_wait_for_vblank);
>
> You should probably split this patch into two:
> 1. add drm_crtc_wait_one_vblank_interruptible()
> 2. use it in drm_client_modeset_wait_for_vblank()

Note, will split the patch in the following version.

Regards,
      Prike
> >
> > diff --git a/drivers/gpu/drm/drm_internal.h
> > b/drivers/gpu/drm/drm_internal.h index f893b1e3a596..2be21c20eb78
> > 100644
> > --- a/drivers/gpu/drm/drm_internal.h
> > +++ b/drivers/gpu/drm/drm_internal.h
> > @@ -115,6 +115,7 @@ void drm_vblank_disable_and_save(struct drm_device
> > *dev, unsigned int pipe);  int drm_vblank_get(struct drm_device *dev,
> > unsigned int pipe);  void drm_vblank_put(struct drm_device *dev,
> > unsigned int pipe);
> >  u64 drm_vblank_count(struct drm_device *dev, unsigned int pipe);
> > +int drm_crtc_wait_one_vblank_interruptible(struct drm_crtc *crtc);
> >
> >  /* drm_vblank_work.c */
> >  static inline void drm_vblank_flush_worker(struct drm_vblank_crtc
> > *vblank) diff --git a/drivers/gpu/drm/drm_vblank.c
> > b/drivers/gpu/drm/drm_vblank.c index f90fb2d13e42..c3c9afc08ed2 100644
> > --- a/drivers/gpu/drm/drm_vblank.c
> > +++ b/drivers/gpu/drm/drm_vblank.c
> > @@ -1297,21 +1297,12 @@ void drm_crtc_vblank_put(struct drm_crtc
> > *crtc)  }  EXPORT_SYMBOL(drm_crtc_vblank_put);
> >
> > -/**
> > - * drm_crtc_wait_one_vblank - wait for one vblank
> > - * @crtc: DRM crtc
> > - *
> > - * This waits for one vblank to pass on @crtc, using the irq driver 
> > interfaces.
> > - * It is a failure to call this when the vblank irq for @crtc is disabled, 
> > e.g.
> > - * due to lack of driver support or because the crtc is off.
> > - *
> > - * Returns: 0 on success, negative error on failures.
> > - */
> > -int drm_crtc_wait_one_vblank(struct drm_crtc *crtc)
> > +static int __drm_crtc_wait_one_vblank(struct drm_crtc *crtc, bool
> > +interruptible)
> >  {
> >     struct drm_device *dev = crtc->dev;
> >     int pipe = drm_crtc_index(crtc);
> >     struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
> > +   long timeout = msecs_to_jiffies(1000);
> >     int ret;
> >     u64 last;
> >
> > @@ -1322,18 +1313,55 @@ int drm_crtc_wait_one_vblank(struct drm_crtc
> > *crtc)
> >
> >     last = drm_vblank_count(dev, pipe);
> >
> > -   ret = wait_event_timeout(vblank->queue,
> > -                            last != drm_vblank_count(dev, pipe),
> > -                            msecs_to_jiffies(1000));
> > +   if (interruptible)
> > +           timeout = wait_event_interruptible_timeout(vblank->queue,
> > +                                                      last != 
> > drm_vblank_count(dev,
> pipe),
> > +                                                      timeout);
> > +   else
> > +           timeout = wait_event_timeout(vblank->queue,
> > +                                        last != drm_vblank_count(dev, 
> > pipe),
> > +                                        timeout);
> >
> > -   drm_WARN(dev, ret == 0, "vblank wait timed out on crtc %i\n", pipe);
> > +   drm_WARN(dev, timeout == 0, "vblank wait timed out on crtc %i\n",
> > +pipe);
> >
> >     drm_vblank_put(dev, pipe);
> >
> > -   return ret ? 0 : -ETIMEDOUT;
> > +   if (timeout < 0)
> > +           return timeout;
> > +
> > +   return timeout ? 0 : -ETIMEDOUT;
> > +}
> > +
> > +/**
> > + * drm_crtc_wait_one_vblank - wait for one vblank
> > + * @crtc: DRM crtc
> > + *
> > + * This waits for one vblank to pass on @crtc, using the irq driver 
> > interfaces.
> > + * It is a failure to call this when the vblank irq for @crtc is disabled, 
> > e.g.
> > + * due to lack of driver support or because the crtc is off.
> > + *
> > + * Returns: 0 on success, negative error on failures.
> > + */
> > +int drm_crtc_wait_one_vblank(struct drm_crtc *crtc) {
> > +   return __drm_crtc_wait_one_vblank(crtc, false);
> >  }
> >  EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
> >
> > +/**
> > + * drm_crtc_wait_one_vblank_interruptible - wait for one vblank,
> > +interruptibly
> > + * @crtc: DRM crtc
> > + *
> > + * Like drm_crtc_wait_one_vblank(), but a signal interrupts the wait.
> > + *
> > + * Returns: 0 on success, -ERESTARTSYS if a signal interrupted the
> > +wait,
> > + * negative error on other failures.
> > + */
> > +int drm_crtc_wait_one_vblank_interruptible(struct drm_crtc *crtc) {
> > +   return __drm_crtc_wait_one_vblank(crtc, true); }
> > +
> >  /**
> >   * drm_crtc_vblank_off - disable vblank events on a CRTC
> >   * @crtc: CRTC in question
> > --
> > 2.34.1
>
> --
> Ville Syrjälä
> Intel

Reply via email to