From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A3A96CD3423 for ; Fri, 1 May 2026 20:37:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FBC210E0BE; Fri, 1 May 2026 20:37:04 +0000 (UTC) Received: from h6.fbrelay.privateemail.com (h6.fbrelay.privateemail.com [162.0.218.229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5703310E0BE for ; Fri, 1 May 2026 20:37:03 +0000 (UTC) Received: from MTA-08-4.privateemail.com (mta-08.privateemail.com [198.54.118.215]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by h5.fbrelay.privateemail.com (Postfix) with ESMTPSA id 4g6jWd0gqrz2xKZ; Fri, 1 May 2026 20:37:01 +0000 (UTC) Received: from mta-08.privateemail.com (localhost [127.0.0.1]) by mta-08.privateemail.com (Postfix) with ESMTP id 4g6jWZ4Vr6z3hhVW; Fri, 1 May 2026 16:36:58 -0400 (EDT) Received: from localhost.localdomain (bras-base-toroon4332w-grc-26-174-91-51-28.dsl.bell.ca [174.91.51.28]) by mta-08.privateemail.com (Postfix) with ESMTPA; Fri, 1 May 2026 16:36:22 -0400 (EDT) From: Hamza Mahfooz To: dri-devel@lists.freedesktop.org Cc: Hamza Mahfooz , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Mario Limonciello , Alex Hung , Ray Wu , Wayne Lin , Aurabindo Pillai , =?UTF-8?q?Timur=20Krist=C3=B3f?= , "Mario Limonciello (AMD)" , Ivan Lipski , Chenyu Chen , Matthew Schwartz , Yussuf Khalil , Tom Chung , Roman Li , Colin Ian King , Charlene Liu , Kees Cook , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/2] drm/atomic: attempt full modeset on page flip timeout Date: Fri, 1 May 2026 16:35:43 -0400 Message-ID: <20260501203552.749080-1-someguy@effective-light.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP X-Rspamd-Queue-Id: 4g6jWd0gqrz2xKZ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We should try to recover from page flip timeouts. Forcing a full modeset should be generic across all atomic KMS drivers, so try that first. Signed-off-by: Hamza Mahfooz --- drivers/gpu/drm/drm_atomic_helper.c | 51 +++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index a768398a1884..8ccc6e833c77 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1926,6 +1926,45 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, } EXPORT_SYMBOL(drm_atomic_helper_wait_for_vblanks); +static int force_full_modeset(struct drm_crtc *crtc) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + int ret; + int err; + + if (drm_atomic_crtc_needs_modeset(crtc->state)) + return -EBUSY; + + DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, err); + state = drm_atomic_state_alloc(crtc->dev); + if (!state) + return -ENOMEM; + + state->acquire_ctx = &ctx; + + crtc_state = drm_atomic_get_crtc_state(state, crtc); + if (IS_ERR(crtc_state)) { + ret = PTR_ERR(crtc_state); + goto out; + } + + crtc_state->connectors_changed = true; + crtc_state->mode_changed = true; + crtc_state->active_changed = true; + + drm_info(crtc->dev, + "[CRTC:%d:%s] Attempting force full modeset...\n", + crtc->base.id, crtc->name); + + ret = drm_atomic_commit(state); +out: + drm_atomic_state_put(state); + DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, err); + return ret; +} + /** * drm_atomic_helper_wait_for_flip_done - wait for all page flips to be done * @dev: DRM device @@ -1949,17 +1988,23 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev, for (i = 0; i < dev->mode_config.num_crtc; i++) { struct drm_crtc_commit *commit = state->crtcs[i].commit; - int ret; crtc = state->crtcs[i].ptr; if (!crtc || !commit) continue; - ret = wait_for_completion_timeout(&commit->flip_done, 10 * HZ); - if (ret == 0) + if (!wait_for_completion_timeout(&commit->flip_done, 10 * HZ)) { + int ret; drm_err(dev, "[CRTC:%d:%s] flip_done timed out\n", crtc->base.id, crtc->name); + + ret = force_full_modeset(crtc); + if (ret) + drm_err(dev, + "[CRTC:%d:%s] force full modeset failed! ret=%d\n", + crtc->base.id, crtc->name, ret); + } } if (state->fake_commit) -- 2.54.0