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 F1DB0CD3427 for ; Tue, 5 May 2026 18:31:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1863C10E1D1; Tue, 5 May 2026 18:31:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="P09Skbcl"; dkim-atps=neutral Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A49D10E1D1; Tue, 5 May 2026 18:31:21 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 7E46B60181; Tue, 5 May 2026 18:31:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED37BC2BCB4; Tue, 5 May 2026 18:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778005880; bh=LqdloHLN295pZhvKB2zyIALDnGthGN3EhVTBFsRm1DE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=P09Skbclo4vmeEIKQZV5QMcLPiWEcldNR7fjTxfO6re3bQybd9fdM6cXGmR7b+LM3 7p0XG26vG7gwJe9Fz9B2tlpealCZey8kURqcf/iB71bbigms95jmefXqAZzGmMkt0F MzK1MUoCYKzW96DwRzcN565cwyQujXHOcVTYbU3pEiuSo1IGY9FzoKN4J98Esj1/kQ c1wTchISvOx1lSU8tqNmZWo6sk4Ubh/nFCbxLDbawSBomsWvtEqU5Fqdy57KtwP0Qm wFRukKEAmYz7VJ6IGAASqg8PGGxZoVeIPK9LEnhGetB00HyOK02ag6CSAFFwYpHIuP +bCZBwHOAGUaQ== Message-ID: <68563e7d-bba7-4b83-99da-e8b8f4bf67a6@kernel.org> Date: Tue, 5 May 2026 13:31:16 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 1/2] drm/atomic: attempt full modeset on page flip timeout Content-Language: en-US To: Hamza Mahfooz , dri-devel@lists.freedesktop.org Cc: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Alex Hung , Wayne Lin , =?UTF-8?Q?Timur_Krist=C3=B3f?= , Aurabindo Pillai , "Mario Limonciello (AMD)" , Ivan Lipski , Chenyu Chen , Matthew Schwartz , Tom Chung , Roman Li , Takashi Iwai , Colin Ian King , Charlene Liu , Kees Cook , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20260505182105.420525-1-someguy@effective-light.com> From: Mario Limonciello In-Reply-To: <20260505182105.420525-1-someguy@effective-light.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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" On 5/5/26 13:20, Hamza Mahfooz wrote: > 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 Reviewed-by: Mario Limonciello (AMD) > --- > drivers/gpu/drm/drm_atomic_helper.c | 49 +++++++++++++++++++++++++++-- > 1 file changed, 46 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index a768398a1884..7ee9d52f63c5 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -1926,6 +1926,43 @@ 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->mode_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 +1986,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)