]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/atomic: Increase timeout in drm_atomic_helper_wait_for_vblanks()
authorThomas Zimmermann <tzimmermann@suse.de>
Tue, 9 Dec 2025 14:33:18 +0000 (15:33 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 9 Apr 2026 13:10:27 +0000 (15:10 +0200)
Increase the timeout for vblank events from 100 ms to 1000 ms. This
is the same fix as in commit f050da08a4ed ("drm/vblank: Increase
timeout in drm_wait_one_vblank()") for another vblank timeout.

After merging generic DRM vblank timers [1] and converting several
DRM drivers for virtual hardware, these drivers synchronize their
vblank events to the display refresh rate. This can trigger timeouts
within the DRM framework.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/dri-devel/20250904145806.430568-1-tzimmermann@suse.de/
Reported-by: syzbot+fcede535e7eb57cf5b43@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/dri-devel/69381d6c.050a0220.4004e.0017.GAE@google.com/
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Fixes: 74afeb812850 ("drm/vblank: Add vblank timer")
Link: https://patch.msgid.link/20251209143325.102056-1-tzimmermann@suse.de
drivers/gpu/drm/drm_atomic_helper.c

index af02c409c2f60b31a22053c0fefced5b2361a41e..75e87c0b51f7e45623f8d1792e80d76e38576b93 100644 (file)
@@ -1916,7 +1916,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
                ret = wait_event_timeout(*queue,
                                         state->crtcs[i].last_vblank_count !=
                                                drm_crtc_vblank_count(crtc),
-                                        msecs_to_jiffies(100));
+                                        msecs_to_jiffies(1000));
 
                WARN(!ret, "[CRTC:%d:%s] vblank wait timed out\n",
                     crtc->base.id, crtc->name);