aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHaiJun Chang <HaiJun.Chang@amd.com>2019-10-29 15:44:08 +0800
committerAlex Deucher <alexander.deucher@amd.com>2019-10-30 11:07:13 -0400
commit897110eed5084bb91731fd4e2bdcf5f536eaadfd (patch)
tree0ab822552cdb18042e8f68dff8b0b48cb0ab15fb
parentdrm/amdgpu: bypass some cleanup work after err_event_athub (v2) (diff)
downloadwireguard-linux-897110eed5084bb91731fd4e2bdcf5f536eaadfd.tar.xz
wireguard-linux-897110eed5084bb91731fd4e2bdcf5f536eaadfd.zip
drm/amdgpu: fix gfx VF FLR test fail on navi
Cp wptr in wb buffer is outdated after VF FLR. The outdated wptr may cause cp to execute unexpected packets. Reset cp wptr in wb buffer. Signed-off-by: HaiJun Chang <HaiJun.Chang@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 959f5be75f8c..e7bab4f094b3 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -3106,6 +3106,7 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring)
memcpy(mqd, adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS], sizeof(*mqd));
/* reset the ring */
ring->wptr = 0;
+ adev->wb.wb[ring->wptr_offs] = 0;
amdgpu_ring_clear_ring(ring);
#ifdef BRING_UP_DEBUG
mutex_lock(&adev->srbm_mutex);