From: Dave Airlie <airlied@redhat.com>
Date: Fri, 8 Nov 2024 02:04:24 +0000 (+1000)
Subject: Merge tag 'amd-drm-next-6.13-2024-11-06' of https://gitlab.freedesktop.org/agd5f... 
X-Git-Tag: microblaze-v6.16~490^2~9
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=1f8bdc31c7222578a209146247c650055f3f4f40;p=linux-2.6-microblaze.git

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

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 <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241106163904.189108-1-alexander.deucher@amd.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

1f8bdc31c7222578a209146247c650055f3f4f40
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index ea2663169bf3,cbae2fc7b94e..b9d08bc96581
--- a/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)) {