Merge tag 'amd-drm-next-6.13-2024-11-06' of https://gitlab.freedesktop.org/agd5f...

amd-drm-next-6.13-2024-11-06:

amdgpu:
- Misc cleanups
- OLED fixes
- DCN 4.x fixes
- DCN 3.5 fixes
- 8K fixes
- IPS fixes
- DSC fixes
- S3 fix
- KASAN fix
- SMU13 fixes
- fdinfo fixes
- USB-C fixes
- ACPI fix
- Fix dummy page overlapping mappings
- Fix workload profile handling
- Add user control for zero RPM on SMU13
- Cleaner shader updates
- Stop syncing PRT map operations
- Debugfs permissions fixes
- Debugfs bounds check fix
- RAS cleanups
- Enforce isolation updates

amdkfd:
- Add topology cap flag for per queue reset
- Add an interface to query whether KFD queues are present
- Use dynamic allocation for get_cu_occupancy

From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Dave Airlie <[email protected]>

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index ea2663169bf3021ba939d29c5b22081367e45052,cbae2fc7b94e0fdcd47b90195a0bc59650d7d4c0..b9d08bc965813305055171e526a729061b5e98b8
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@@ -149,9 -150,11 +150,10 @@@ static enum drm_gpu_sched_stat amdgpu_j
                        atomic_inc(&ring->adev->gpu_reset_counter);
                        amdgpu_fence_driver_force_completion(ring);
                        if (amdgpu_ring_sched_ready(ring))
 -                              drm_sched_start(&ring->sched);
 -                      dev_err(adev->dev, "Ring %s reset success\n", ring->sched.name);
 +                              drm_sched_start(&ring->sched, 0);
                        goto exit;
                }
+               dev_err(adev->dev, "Ring %s reset failure\n", ring->sched.name);
        }
  
        if (amdgpu_device_should_recover_gpu(ring->adev)) {