From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Prike Liang <Prike.Liang@amd.com>
Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Alexander.Deucher@amd.com, Christian.Koenig@amd.com,
Harry.Wentland@amd.com, Sunpeng.Li@amd.com, tzimmermann@suse.de
Subject: Re: [PATCH v2 1/5] drm/vblank: Stop drm_crtc_wait_one_vblank() when vblank is turned off
Date: Thu, 19 Nov 2026 16:31:20 +0200 [thread overview]
Message-ID: <av8IOJf8blSIt8mf@intel.com> (raw)
In-Reply-To: <20261119082424.554841-1-Prike.Liang@amd.com>
On Thu, Nov 19, 2026 at 04:24:20PM +0800, Prike Liang wrote:
> drm_crtc_vblank_off() turns off the vblank interrupt even while someone
> holds a vblank reference and waits for a vblank. It then wakes up the
> vblank wait queue. DRM_IOCTL_WAIT_VBLANK stops waiting at this point,
> because its wait condition also checks whether vblank is still enabled.
>
> drm_crtc_wait_one_vblank() only checks whether the vblank count has
> changed. Once vblank is off, the count doesn't change, so the woken
> waiter sleeps again until the wait times out after one second and warns
> "vblank wait timed out". This happens, for example, when the fbdev
> damage worker or FBIO_WAITFORVSYNC waits for a vblank while the driver
> turns the CRTC off for suspend or a GPU reset.
>
> Make drm_crtc_wait_one_vblank() also stop waiting when vblank is turned
> off, and return -EINVAL if no vblank passed, the same error that
> drm_vblank_get() returns when vblank is off. The wait condition is
> checked before going to sleep, so this also covers vblank being turned
> off between drm_vblank_get() and the wait. Waits that see a vblank or
> time out behave as before.
>
> The two cases differ in that drm_crtc_wait_one_vblank() warns "vblank
> not available" if drm_vblank_get() fails, but doesn't warn if
> drm_crtc_vblank_off() ends the wait. That is intentional: it's a
> failure to call the function while vblank is off, but a waiter, such as
> the fbdev damage worker, can't keep the CRTC from being turned off
> meanwhile. The error only tells the caller that no more vblanks are
> coming.
>
> version update:
> 1) https://lists.freedesktop.org/archives/dri-devel/2026-November/616745.html
>
> Fixes: e8450f51a4b3 ("drm/irq: Implement a generic vblank_wait function")
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Assisted-by: Copilot:claude-opus-5.5
> Signed-off-by: Prike Liang <Prike.Liang@amd.com>
> ---
> drivers/gpu/drm/drm_vblank.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
> index f90fb2d13e42..54118eb1413c 100644
> --- a/drivers/gpu/drm/drm_vblank.c
> +++ b/drivers/gpu/drm/drm_vblank.c
> @@ -1303,7 +1303,8 @@ EXPORT_SYMBOL(drm_crtc_vblank_put);
> *
> * 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.
> + * due to lack of driver support or because the crtc is off. The wait also fails
> + * if drm_crtc_vblank_off() disables the vblank irq before a vblank passes.
The "The wait also fails ..." wording feels a bit vague to me.
Maybe something like "The wait terminates early with an error
if drm_crtc_vblank_off() ..." ?
If you do decide to change the wording remember to carry it
through to the other patches when rebasing them.
Apart from that, this looks pretty good to me
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> *
> * Returns: 0 on success, negative error on failures.
> */
> @@ -1323,14 +1324,22 @@ 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),
> + last != drm_vblank_count(dev, pipe) ||
> + !READ_ONCE(vblank->enabled),
> msecs_to_jiffies(1000));
>
> drm_WARN(dev, ret == 0, "vblank wait timed out on crtc %i\n", pipe);
>
> + if (!ret)
> + ret = -ETIMEDOUT;
> + else if (last == drm_vblank_count(dev, pipe))
> + ret = -EINVAL; /* drm_crtc_vblank_off() ended the wait */
> + else
> + ret = 0;
> +
> drm_vblank_put(dev, pipe);
>
> - return ret ? 0 : -ETIMEDOUT;
> + return ret;
> }
> EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
>
> --
> 2.34.1
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2026-11-19 14:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 8:24 [PATCH v2 1/5] drm/vblank: Stop drm_crtc_wait_one_vblank() when vblank is turned off Prike Liang
2026-11-19 8:24 ` [PATCH v2 2/5] drm/vblank: Add drm_crtc_wait_one_vblank_interruptible() Prike Liang
2026-11-19 14:33 ` Ville Syrjälä
2026-11-19 8:24 ` [PATCH v2 3/5] drm/client: Make the FBIO_WAITFORVSYNC vblank wait interruptible Prike Liang
2026-11-19 14:40 ` Ville Syrjälä
2026-11-19 8:24 ` [PATCH v2 4/5] drm/amd/display: send the flip event right away if vblank is off Prike Liang
2026-11-19 8:24 ` [PATCH v2 5/5] drm/amd/display: turn vblank off in DRM across GPU reset Prike Liang
2026-11-19 8:56 ` sashiko-bot
2026-11-19 14:31 ` Ville Syrjälä [this message]
2026-11-20 2:23 ` [PATCH v2 1/5] drm/vblank: Stop drm_crtc_wait_one_vblank() when vblank is turned off Liang, Prike
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=av8IOJf8blSIt8mf@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=Alexander.Deucher@amd.com \
--cc=Christian.Koenig@amd.com \
--cc=Harry.Wentland@amd.com \
--cc=Prike.Liang@amd.com \
--cc=Sunpeng.Li@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.