From: Simona Vetter <simona.vetter@ffwll.ch>
Date: Tue, 7 Apr 2026 10:27:36 +0000 (+0200)
Subject: Merge v7.0-rc7 into drm-next
X-Git-Tag: v7.1-rc1~167^2~10
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=322e4116ac8d48255f9599250347f48e56ce8979;p=thirdparty%2Fkernel%2Flinux.git

Merge v7.0-rc7 into drm-next

Thomas Zimmermann needs 2f42c1a61616 ("drm/ast: dp501: Fix
initialization of SCU2C") for drm-misc-next.

Conflicts:
- drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c

Just between e927b36ae18b ("drm/amd/display: Fix NULL pointer
dereference in dcn401_init_hw()") and it's cherry-pick that confused
git.

- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c

Deleted in 6b0a6116286e ("drm/amd/pm: Unify version check in SMUv11")
but some cherry-picks confused git. Same for v12/v14.

Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
---

322e4116ac8d48255f9599250347f48e56ce8979
diff --cc drivers/gpu/drm/xe/xe_device.c
index 9b0540e3e2898,3eb06b27db7ee..ffea4a453c01c
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@@ -1324,19 -1305,12 +1329,13 @@@ void xe_device_declare_wedged(struct xe
  		return;
  	}
  
- 	xe_pm_runtime_get_noresume(xe);
- 
- 	if (drmm_add_action_or_reset(&xe->drm, xe_device_wedged_fini, xe)) {
- 		drm_err(&xe->drm, "Failed to register xe_device_wedged_fini clean-up. Although device is wedged.\n");
- 		return;
- 	}
- 
  	if (!atomic_xchg(&xe->wedged.flag, 1)) {
  		xe->needs_flr_on_fini = true;
+ 		xe_pm_runtime_get_noresume(xe);
  		drm_err(&xe->drm,
  			"CRITICAL: Xe has declared device %s as wedged.\n"
 -			"IOCTLs and executions are blocked. Only a rebind may clear the failure\n"
 +			"IOCTLs and executions are blocked.\n"
 +			"For recovery procedure, refer to https://docs.kernel.org/gpu/drm-uapi.html#device-wedging\n"
  			"Please file a _new_ bug report at https://gitlab.freedesktop.org/drm/xe/kernel/issues/new\n",
  			dev_name(xe->drm.dev));
  	}