Commit b6146777 authored by Frank Min's avatar Frank Min Committed by Alex Deucher

drm/amdgpu: fix mqd corruption for gfx12

1. restore mqd from backup while resuming
2. use copy_toio and copy_fromio while mqd in vram
Signed-off-by: default avatarFrank Min <Frank.Min@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ef168e6d
...@@ -2691,17 +2691,15 @@ static int gfx_v12_0_gfx_init_queue(struct amdgpu_ring *ring) ...@@ -2691,17 +2691,15 @@ static int gfx_v12_0_gfx_init_queue(struct amdgpu_ring *ring)
soc24_grbm_select(adev, 0, 0, 0, 0); soc24_grbm_select(adev, 0, 0, 0, 0);
mutex_unlock(&adev->srbm_mutex); mutex_unlock(&adev->srbm_mutex);
if (adev->gfx.me.mqd_backup[mqd_idx]) if (adev->gfx.me.mqd_backup[mqd_idx])
memcpy(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd)); memcpy_fromio(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd));
} else if (amdgpu_in_reset(adev)) { } else {
/* reset mqd with the backup copy */ /* restore mqd with the backup copy */
if (adev->gfx.me.mqd_backup[mqd_idx]) if (adev->gfx.me.mqd_backup[mqd_idx])
memcpy(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd)); memcpy_toio(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd));
/* reset the ring */ /* reset the ring */
ring->wptr = 0; ring->wptr = 0;
*ring->wptr_cpu_addr = 0; *ring->wptr_cpu_addr = 0;
amdgpu_ring_clear_ring(ring); amdgpu_ring_clear_ring(ring);
} else {
amdgpu_ring_clear_ring(ring);
} }
return 0; return 0;
...@@ -3040,18 +3038,15 @@ static int gfx_v12_0_kcq_init_queue(struct amdgpu_ring *ring) ...@@ -3040,18 +3038,15 @@ static int gfx_v12_0_kcq_init_queue(struct amdgpu_ring *ring)
mutex_unlock(&adev->srbm_mutex); mutex_unlock(&adev->srbm_mutex);
if (adev->gfx.mec.mqd_backup[mqd_idx]) if (adev->gfx.mec.mqd_backup[mqd_idx])
memcpy(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(*mqd)); memcpy_fromio(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(*mqd));
} else if (amdgpu_in_reset(adev)) { /* for GPU_RESET case */ } else {
/* reset MQD to a clean status */ /* restore MQD to a clean status */
if (adev->gfx.mec.mqd_backup[mqd_idx]) if (adev->gfx.mec.mqd_backup[mqd_idx])
memcpy(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(*mqd)); memcpy_toio(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(*mqd));
/* reset ring buffer */ /* reset ring buffer */
ring->wptr = 0; ring->wptr = 0;
atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0); atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0);
amdgpu_ring_clear_ring(ring); amdgpu_ring_clear_ring(ring);
} else {
amdgpu_ring_clear_ring(ring);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment