drm/amd/amdgpu: Fix srbm_indexing in init/inactive hqd code
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Fix srbm_indexing in init/inactive hqd code
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +5 -0
@@ -5289,6 +5289,7 @@ static void gfx_v8_0_inactive_hqd(struct amdgpu_device *adev, {int i; +mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );if (RREG32 (mmCP_HQD_ACTIVE) &CP_HQD_ACTIVE__ACTIVE_MASK ) {WREG32_FIELD (CP_HQD_DEQUEUE_REQUEST ,DEQUEUE_REQ ,2 );
@@ -5298,6 +5299,8 @@ static void gfx_v8_0_inactive_hqd(struct amdgpu_device *adev,udelay (1 ); } } +vi_srbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); }static int gfx_v8_0_pre_soft_reset (void *handle)
@@ -5403,11 +5406,13 @@ static int gfx_v8_0_soft_reset(void *handle)static void gfx_v8_0_init_hqd (struct amdgpu_device *adev,struct amdgpu_ring *ring) { +mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );WREG32 (mmCP_HQD_DEQUEUE_REQUEST,0 );WREG32 (mmCP_HQD_PQ_RPTR,0 );WREG32 (mmCP_HQD_PQ_WPTR,0 );vi_srbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); }static int gfx_v8_0_post_soft_reset (void *handle)
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Tuesday, April 04, 2017 10:29 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Fixsrbm_indexingin init/inactive hqd codeSigned-off-by Tom St Denis <[email protected]>
Quoted 47 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1
-0@@ -5289,6 +5289,7 @@ static void gfx_v8_0_inactive_hqd(structamdgpu_device *adev, { int i; +mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 ); if (RREG32(mmCP_HQD_ACTIVE) &
CP_HQD_ACTIVE__ACTIVE_MASK) {
WREG32_FIELD(CP_HQD_DEQUEUE_REQUEST,DEQUEUE_REQ, 2);drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-0@@ -5298,6 +5299,8 @@ static void gfx_v8_0_inactive_hqd(struct amdgpu_device *adev,udelay (1 ); } } +vi_srbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); }static int
gfx_v8_0_pre_soft_reset(void *handle)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-1@@ -5403,11 +5406,13 @@ static int gfx_v8_0_soft_reset(void *handle)static void gfx_v8_0_init_hqd (struct amdgpu_device *adev,struct amdgpu_ring *ring) { +mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );WREG32 (mmCP_HQD_DEQUEUE_REQUEST,0 );WREG32 (mmCP_HQD_PQ_RPTR,0 );WREG32 (mmCP_HQD_PQ_WPTR,0 );vi_srbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); }static int gfx_v8_0_post_soft_reset (void *handle) --2.12.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx