From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 475831FF14C for ; Fri, 15 May 2026 10:40:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24DAE10528; Fri, 15 May 2026 10:40:14 +0200 (CEST) From: Christian Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH pve-kernel] fix #7585: backport increased vblank timeout Date: Fri, 15 May 2026 10:39:16 +0200 Message-ID: <20260515083918.566479-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778834372821 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: ARIC7J3ZRRHSMITWNKWJ4UDNMR2V6HZE X-Message-ID-Hash: ARIC7J3ZRRHSMITWNKWJ4UDNMR2V6HZE X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Upstream commit 79ae8510b in torvalds tree [1]. [0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=79ae8510b5b81b9500370f89c619b50ca9c0990f Signed-off-by: Christian Ebner --- ...ase-timeout-in-drm_atomic_helper_wai.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 patches/kernel/0064-drm-atomic-Increase-timeout-in-drm_atomic_helper_wai.patch diff --git a/patches/kernel/0064-drm-atomic-Increase-timeout-in-drm_atomic_helper_wai.patch b/patches/kernel/0064-drm-atomic-Increase-timeout-in-drm_atomic_helper_wai.patch new file mode 100644 index 0000000..1629849 --- /dev/null +++ b/patches/kernel/0064-drm-atomic-Increase-timeout-in-drm_atomic_helper_wai.patch @@ -0,0 +1,45 @@ +From git@z Thu Jan 1 00:00:00 1970 +Subject: [PATCH] drm/atomic: Increase timeout in + drm_atomic_helper_wait_for_vblanks() +From: Thomas Zimmermann +Date: Tue, 09 Dec 2025 15:33:18 +0100 +Message-Id: <20251209143325.102056-1-tzimmermann@suse.de> +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +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 +Link: https://lore.kernel.org/dri-devel/20250904145806.430568-1-tzimmermann@suse.de/ # [1] +Reported-by: syzbot+fcede535e7eb57cf5b43@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/dri-devel/69381d6c.050a0220.4004e.0017.GAE@google.com/ +Fixes: 74afeb812850 ("drm/vblank: Add vblank timer") +Reviewed-by: Ville Syrjälä +--- + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c +index e641fcf8c568..e108f91bc3dd 100644 +--- a/drivers/gpu/drm/drm_atomic_helper.c ++++ b/drivers/gpu/drm/drm_atomic_helper.c +@@ -1839,7 +1839,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); +-- +2.52.0 + -- 2.47.3