github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu/sdma: consolidate engine reset handling

Browse Source 
Move the force completion handling into the common
engine reset function.  No need to duplicate it for
every IP version.

Reviewed-by: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2025-06-26 08:49:07 -04:00
parent 91134e8008
commit f8410a17d3
4 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
View File

@ -590,9 +590,12 @@ int amdgpu_sdma_reset_engine(struct amdgpu_device *adev, uint32_t instance_id)
* to be submitted to the queues after the reset is complete.
*/
if (!ret) {
amdgpu_fence_driver_force_completion(gfx_ring);
drm_sched_wqueue_start(&gfx_ring->sched);
if (adev->sdma.has_page_queue)
if (adev->sdma.has_page_queue) {
amdgpu_fence_driver_force_completion(page_ring);
drm_sched_wqueue_start(&page_ring->sched);
}
}
mutex_unlock(&sdma_instance->engine_reset_mutex);

17
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
View File

@ -1714,7 +1714,7 @@ static int sdma_v4_4_2_stop_queue(struct amdgpu_ring *ring)
static int sdma_v4_4_2_restore_queue(struct amdgpu_ring *ring)
{
struct amdgpu_device *adev = ring->adev;
u32 inst_mask, tmp_mask;
u32 inst_mask;
int i, r;
inst_mask = 1 << ring->me;
@ -1733,21 +1733,6 @@ static int sdma_v4_4_2_restore_queue(struct amdgpu_ring *ring)
}
r = sdma_v4_4_2_inst_start(adev, inst_mask, true);
if (r)
return r;
tmp_mask = inst_mask;
for_each_inst(i, tmp_mask) {
ring = &adev->sdma.instance[i].ring;
amdgpu_fence_driver_force_completion(ring);
if (adev->sdma.has_page_queue) {
struct amdgpu_ring *page = &adev->sdma.instance[i].page;
amdgpu_fence_driver_force_completion(page);
}
}
return r;
}

6
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
View File

@ -1618,10 +1618,8 @@ static int sdma_v5_0_restore_queue(struct amdgpu_ring *ring)
r = sdma_v5_0_gfx_resume_instance(adev, inst_id, true);
amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
if (r)
return r;
amdgpu_fence_driver_force_completion(ring);
return 0;
return r;
}
static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)

6
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
View File

@ -1534,10 +1534,8 @@ static int sdma_v5_2_restore_queue(struct amdgpu_ring *ring)
r = sdma_v5_2_gfx_resume_instance(adev, inst_id, true);
amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
if (r)
return r;
amdgpu_fence_driver_force_completion(ring);
return 0;
return r;
}
static int sdma_v5_2_ring_preempt_ib(struct amdgpu_ring *ring)