From: Hamza Mahfooz <someguy@effective-light.com>
To: dri-devel@lists.freedesktop.org
Cc: "Michel Dänzer" <michel.daenzer@mailbox.org>,
"Hamza Mahfooz" <someguy@effective-light.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Rodrigo Siqueira" <siqueira@igalia.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Mario Limonciello" <mario.limonciello@amd.com>,
"Alex Hung" <alex.hung@amd.com>,
"Aurabindo Pillai" <aurabindo.pillai@amd.com>,
"Wayne Lin" <Wayne.Lin@amd.com>,
"Ivan Lipski" <ivan.lipski@amd.com>,
"Timur Kristóf" <timur.kristof@gmail.com>,
"Dominik Kaszewski" <dominik.kaszewski@amd.com>,
amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/2] drm/amd/display: add vendor specific reset
Date: Thu, 12 Feb 2026 18:09:00 -0500 [thread overview]
Message-ID: <20260212230905.688006-2-someguy@effective-light.com> (raw)
In-Reply-To: <20260212230905.688006-1-someguy@effective-light.com>
We now have a means to respond to page flip timeouts. So, hook up
support by sending out a wedged event if
drm_atomic_helper_wait_for_flip_done() fails.
Signed-off-by: Hamza Mahfooz <someguy@effective-light.com>
---
v2: send a wedged event instead of attempting a GPU reset.
v3: read return value of drm_atomic_helper_wait_for_flip_done().
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 7c51d8d7e73c..06d8353cb616 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -87,6 +87,7 @@
#include <drm/drm_atomic_uapi.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_blend.h>
+#include <drm/drm_drv.h>
#include <drm/drm_fixed.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_edid.h>
@@ -11085,8 +11086,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
/* Signal HW programming completion */
drm_atomic_helper_commit_hw_done(state);
- if (wait_for_vblank)
- drm_atomic_helper_wait_for_flip_done(dev, state);
+ if (wait_for_vblank) {
+ if (drm_atomic_helper_wait_for_flip_done(dev, state))
+ drm_dev_wedged_event(dev, DRM_WEDGE_RECOVERY_REBIND |
+ DRM_WEDGE_RECOVERY_BUS_RESET,
+ NULL);
+ }
drm_atomic_helper_cleanup_planes(dev, state);
--
2.53.0
next prev parent reply other threads:[~2026-02-12 23:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-12 23:08 [PATCH v3 1/2] drm: introduce KMS recovery mechanism Hamza Mahfooz
2026-02-12 23:09 ` Hamza Mahfooz [this message]
2026-02-18 9:34 ` [PATCH v3 2/2] drm/amd/display: add vendor specific reset Christian König
2026-02-13 0:18 ` [PATCH v3 1/2] drm: introduce KMS recovery mechanism Mario Limonciello
2026-02-13 19:35 ` Hamza Mahfooz
2026-02-14 14:02 ` Michel Dänzer
2026-02-14 22:16 ` Hamza Mahfooz
2026-02-16 9:28 ` Michel Dänzer
2026-02-18 0:45 ` Hamza Mahfooz
2026-02-18 9:22 ` Michel Dänzer
2026-02-20 8:42 ` Michel Dänzer
2026-02-20 9:09 ` Michel Dänzer
2026-02-20 14:08 ` Michel Dänzer
2026-04-17 16:08 ` Michel Dänzer
2026-04-17 16:28 ` Ville Syrjälä
2026-02-18 9:31 ` Christian König
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=20260212230905.688006-2-someguy@effective-light.com \
--to=someguy@effective-light.com \
--cc=Wayne.Lin@amd.com \
--cc=airlied@gmail.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aurabindo.pillai@amd.com \
--cc=christian.koenig@amd.com \
--cc=dominik.kaszewski@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=ivan.lipski@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mario.limonciello@amd.com \
--cc=michel.daenzer@mailbox.org \
--cc=mripard@kernel.org \
--cc=simona@ffwll.ch \
--cc=siqueira@igalia.com \
--cc=sunpeng.li@amd.com \
--cc=timur.kristof@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox