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>

diff --cc drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
Simple merge

diff --cc drivers/gpu/drm/drm_bridge.c
Simple merge

diff --cc drivers/gpu/drm/drm_mode_config.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/g4x_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_cdclk.c
Simple merge

diff --cc drivers/gpu/drm/sysfb/efidrm.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_device.c
index 9b0540e3e2898c35038b9927d39c6be98e1d781c,3eb06b27db7eee0ab9582dbc176ef6c44f4aaa18..ffea4a453c01ca945adc7fd85dbb8be6b43c1a51
--- 1/drivers/gpu/drm/xe/xe_device.c
--- 2/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));
        }

diff --cc drivers/gpu/drm/xe/xe_pxp.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_svm.c
Simple merge