drm/amdgpu: correct wptr initialization for sdma
Subsystems (2)
PATCH 1/1 drm/amdgpu: correct wptr initialization for sdma
If doorbell is used for wptr update, we also need to use it to initialize wptr to 0.
Change-Id Ieb31a6726a9ac8d45e51f0370ef5f77dc5ec7c06
Signed-off-by Yintian Tao <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +2 -4
@@ -643,8 +643,9 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_CNTL + sdma_offsets[i], rb_cntl);/* Initialize the ring buffer's read and write pointers */ + ring->wptr =0 ;WREG32 (mmSDMA0_GFX_RB_RPTR + sdma_offsets[i],0 ); -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],0 ); +sdma_v3_0_ring_set_wptr (ring);WREG32 (mmSDMA0_GFX_IB_RPTR + sdma_offsets[i],0 );WREG32 (mmSDMA0_GFX_IB_OFFSET + sdma_offsets[i],0 );
@@ -659,9 +660,6 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i], ring->gpu_addr >>8 );WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); - ring->wptr =0 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],lower_32_bits (ring->wptr) <<2 ); - doorbell =RREG32 (mmSDMA0_GFX_DOORBELL + sdma_offsets[i]);if (ring->use_doorbell) {
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Reviewed-byAm 12.05.2017 um 11:18 schrieb Yintian Tao:
Quoted 5 lines
If doorbell is used for wptr update, we also need to use it to initialize wptr to 0.
Change-Id Ieb31a6726a9ac8d45e51f0370ef5f77dc5ec7c06Signed-off-by Yintian Tao <[email protected]>
Reviewed-by Christian König <[email protected]>
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +2
-1@@ -643,8 +643,9 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_CNTL + sdma_offsets[i], rb_cntl);/* Initialize the ring buffer's read and write pointers */ + ring->wptr =0 ;WREG32 (mmSDMA0_GFX_RB_RPTR + sdma_offsets[i],0 ); -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],0 ); +sdma_v3_0_ring_set_wptr (ring);WREG32 (mmSDMA0_GFX_IB_RPTR + sdma_offsets[i],0 );WREG32 (mmSDMA0_GFX_IB_OFFSET + sdma_offsets[i],0 );
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev) · line 665
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +0
-3@@ -659,9 +660,6 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i], ring->gpu_addr >>8 );WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); - ring->wptr =0 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],lower_32_bits (ring->wptr) <<2 ); - doorbell =RREG32 (mmSDMA0_GFX_DOORBELL + sdma_offsets[i]);if (ring->use_doorbell) {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx