raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

drm/xe: Do clean shutdown also when using flr

Browse Source 
[ Upstream commit b11a020d91 ]

Currently Xe driver is triggering flr without any clean-up on
shutdown. This is causing random warnings from pending related works as the
underlying hardware is reset in the middle of their execution.

Fix this by performing clean shutdown also when using flr.

Fixes: 501d799a47 ("drm/xe: Wire up device shutdown handler")
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Maarten Lankhorst <dev@lankhorst.se>
Link: https://patch.msgid.link/20251031122312.1836534-1-jouni.hogander@intel.com
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
(cherry picked from commit a4ff26b7c8ef38e4dd34f77cbcd73576fdde6dd4)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jouni Högander
2025-10-31 14:23:11 +02:00
committed by Greg Kroah-Hartman
parent 490daa10c8
commit dfd1d6b582
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/xe/xe_device.c
View File

@@ -962,21 +962,21 @@ void xe_device_remove(struct xe_device *xe)
void xe_device_shutdown(struct xe_device *xe) void xe_device_shutdown(struct xe_device *xe)
{ {
struct xe_gt *gt;
u8 id;
drm_dbg(&xe->drm, "Shutting down device\n"); drm_dbg(&xe->drm, "Shutting down device\n");
if (xe_driver_flr_disabled(xe)) { xe_display_pm_shutdown(xe);
struct xe_gt *gt;
u8 id;
xe_display_pm_shutdown(xe); xe_irq_suspend(xe);
xe_irq_suspend(xe); for_each_gt(gt, xe, id)
xe_gt_shutdown(gt);
for_each_gt(gt, xe, id) xe_display_pm_shutdown_late(xe);
xe_gt_shutdown(gt);
xe_display_pm_shutdown_late(xe); if (!xe_driver_flr_disabled(xe)) {
} else {
/* BOOM! */ /* BOOM! */
__xe_driver_flr(xe); __xe_driver_flr(xe);
} }