drm/amdgpu: Remove duplicate code in gfx_v8_0.c
Subsystems (2)
PATCH 1/2 drm/amdgpu: Remove duplicate code in gfx_v8_0.c
There are no any logical changes here.
1. if kcq can be enabled via kiq, we don't need to do kiq ring test.
2. amdgpu_ring_test_ring function can be used to sync the ring complete, remove the duplicate code.
v2: alloc 6 (not 7) dws for unmap_queues
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 80 ++++++----------------------------- 1 file changed, 13 insertions(+), 67 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +13 -67
@@ -4604,7 +4604,6 @@ static void gfx_v8_0_kiq_setting(struct amdgpu_ring *ring)static int gfx_v8_0_kiq_kcq_enable (struct amdgpu_device *adev) {struct amdgpu_ring *kiq_ring = &adev->gfx.kiq.ring; -uint32_t scratch, tmp =0 ;uint64_t queue_mask =0 ;int r, i;
@@ -4623,17 +4622,10 @@ static int gfx_v8_0_kiq_kcq_enable(struct amdgpu_device *adev) queue_mask |= (1ull << i); } - r =amdgpu_gfx_scratch_get (adev, &scratch); -if (r) { -DRM_ERROR ("Failed to get scratch reg (%d).\n" , r); -return r; - } -WREG32 (scratch,0xCAFEDEAD ); - - r =amdgpu_ring_alloc (kiq_ring, (8 * adev->gfx.num_compute_rings) +11 ); + kiq_ring->ready = true; + r =amdgpu_ring_alloc (kiq_ring, (8 * adev->gfx.num_compute_rings) +8 );if (r) {DRM_ERROR ("Failed to lock KIQ (%d).\n" , r); -amdgpu_gfx_scratch_free (adev, scratch);return r; }/* set resources */
@@ -4665,25 +4657,12 @@ static int gfx_v8_0_kiq_kcq_enable(struct amdgpu_device *adev)amdgpu_ring_write (kiq_ring,lower_32_bits (wptr_addr));amdgpu_ring_write (kiq_ring,upper_32_bits (wptr_addr)); } -/* write to scratch for completion */ -amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_SET_UCONFIG_REG ,1 )); -amdgpu_ring_write (kiq_ring, (scratch -PACKET3_SET_UCONFIG_REG_START )); -amdgpu_ring_write (kiq_ring,0xDEADBEEF ); -amdgpu_ring_commit (kiq_ring); -for (i =0 ; i < adev->usec_timeout; i++) { - tmp =RREG32 (scratch); -if (tmp ==0xDEADBEEF ) -break ; -DRM_UDELAY (1 ); - } -if (i >= adev->usec_timeout) { -DRM_ERROR ("KCQ enable failed (scratch(0x%04X)=0x%08X)\n" , - scratch, tmp); - r = -EINVAL ; + r =amdgpu_ring_test_ring (kiq_ring); +if (r) { +DRM_ERROR ("KCQ enable failed\n" ); + kiq_ring->ready = false; } -amdgpu_gfx_scratch_free (adev, scratch); -return r; }
@@ -5014,15 +4993,6 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)if (r) goto done; -/* Test KIQ */ - ring = &adev->gfx.kiq.ring; - ring->ready = true; - r =amdgpu_ring_test_ring (ring); -if (r) { - ring->ready = false; - goto done; - } -/* Test KCQs */ for (i =0 ; i < adev->gfx.num_compute_rings; i++) { ring = &adev->gfx.compute_ring[i];
@@ -5092,23 +5062,11 @@ static int gfx_v8_0_hw_init(void *handle)static int gfx_v8_0_kcq_disable (struct amdgpu_ring *kiq_ring,struct amdgpu_ring *ring) { -struct amdgpu_device *adev = kiq_ring->adev; -uint32_t scratch, tmp =0 ; -int r, i; - - r =amdgpu_gfx_scratch_get (adev, &scratch); -if (r) { -DRM_ERROR ("Failed to get scratch reg (%d).\n" , r); -return r; - } -WREG32 (scratch,0xCAFEDEAD ); +int r; - r =amdgpu_ring_alloc (kiq_ring,10 ); -if (r) { + r =amdgpu_ring_alloc (kiq_ring,6 ); +if (r)DRM_ERROR ("Failed to lock KIQ (%d).\n" , r); -amdgpu_gfx_scratch_free (adev, scratch); -return r; - }/* unmap queues */ amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_UNMAP_QUEUES ,4 ));
@@ -5121,23 +5079,11 @@ static int gfx_v8_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ringamdgpu_ring_write (kiq_ring,0 );amdgpu_ring_write (kiq_ring,0 );amdgpu_ring_write (kiq_ring,0 ); -/* write to scratch for completion */ -amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_SET_UCONFIG_REG ,1 )); -amdgpu_ring_write (kiq_ring, (scratch -PACKET3_SET_UCONFIG_REG_START )); -amdgpu_ring_write (kiq_ring,0xDEADBEEF ); -amdgpu_ring_commit (kiq_ring); -for (i =0 ; i < adev->usec_timeout; i++) { - tmp =RREG32 (scratch); -if (tmp ==0xDEADBEEF ) -break ; -DRM_UDELAY (1 ); - } -if (i >= adev->usec_timeout) { -DRM_ERROR ("KCQ disabled failed (scratch(0x%04X)=0x%08X)\n" , scratch, tmp); - r = -EINVAL ; - } -amdgpu_gfx_scratch_free (adev, scratch); + r =amdgpu_ring_test_ring (kiq_ring); +if (r) +DRM_ERROR ("KCQ disable failed\n" ); +return r; }
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1534489619-1491-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: Refine gfx_v8_0_kcq_disable function
Send all kcq unmap_queue packets and then wait for complete.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +15 -14
@@ -5060,26 +5060,29 @@ static int gfx_v8_0_hw_init(void *handle)return r; } -static int gfx_v8_0_kcq_disable (struct amdgpu_ring *kiq_ring,struct amdgpu_ring *ring) +static int gfx_v8_0_kcq_disable (struct amdgpu_device *adev) { -int r; +int r, i; +struct amdgpu_ring *kiq_ring = &adev->gfx.kiq.ring; - r =amdgpu_ring_alloc (kiq_ring,6 ); + r =amdgpu_ring_alloc (kiq_ring,6 * adev->gfx.num_compute_rings);if (r)DRM_ERROR ("Failed to lock KIQ (%d).\n" , r); -/* unmap queues */ -amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_UNMAP_QUEUES ,4 )); -amdgpu_ring_write (kiq_ring,/* Q_sel: 0, vmid: 0, engine: 0, num_Q: 1 */ +for (i =0 ; i < adev->gfx.num_compute_rings; i++) { +struct amdgpu_ring *ring = &adev->gfx.compute_ring[i]; + +amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_UNMAP_QUEUES ,4 )); +amdgpu_ring_write (kiq_ring,/* Q_sel: 0, vmid: 0, engine: 0, num_Q: 1 */ PACKET3_UNMAP_QUEUES_ACTION (1 ) |/* RESET_QUEUES */ PACKET3_UNMAP_QUEUES_QUEUE_SEL (0 ) |PACKET3_UNMAP_QUEUES_ENGINE_SEL (0 ) |PACKET3_UNMAP_QUEUES_NUM_QUEUES (1 )); -amdgpu_ring_write (kiq_ring,PACKET3_UNMAP_QUEUES_DOORBELL_OFFSET0 (ring->doorbell_index)); -amdgpu_ring_write (kiq_ring,0 ); -amdgpu_ring_write (kiq_ring,0 ); -amdgpu_ring_write (kiq_ring,0 ); - +amdgpu_ring_write (kiq_ring,PACKET3_UNMAP_QUEUES_DOORBELL_OFFSET0 (ring->doorbell_index)); +amdgpu_ring_write (kiq_ring,0 ); +amdgpu_ring_write (kiq_ring,0 ); +amdgpu_ring_write (kiq_ring,0 ); + } r =amdgpu_ring_test_ring (kiq_ring);if (r)DRM_ERROR ("KCQ disable failed\n" );
@@ -5090,7 +5093,6 @@ static int gfx_v8_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ringstatic int gfx_v8_0_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -int i;amdgpu_irq_put (adev, &adev->gfx.priv_reg_irq,0 );amdgpu_irq_put (adev, &adev->gfx.priv_inst_irq,0 );
@@ -5100,8 +5102,7 @@ static int gfx_v8_0_hw_fini(void *handle)amdgpu_irq_put (adev, &adev->gfx.sq_irq,0 );/* disable KCQ to avoid CPC touch memory not valid anymore */ -for (i =0 ; i < adev->gfx.num_compute_rings; i++) -gfx_v8_0_kcq_disable (&adev->gfx.kiq.ring, &adev->gfx.compute_ring[i]); +gfx_v8_0_kcq_disable (adev);if (amdgpu_sriov_vf (adev)) {pr_debug ("For SRIOV client, shouldn't do anything.\n" );
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 17.08.2018 um 09:06 schrieb Rex Zhu:
Quoted 10 lines
There are no any logical changes here.
1. if kcq can be enabled via kiq, we don't need to do kiq ring test.
2.amdgpu_ring_test_ringfunction can be used to sync the ring complete, remove the duplicate code.v2: alloc 6 (not 7) dws for
unmap_queuesSigned-off-by Rex Zhu <[email protected]>
At least of hand looks like a nice cleanup to be, but I can't fully judge because I'm not so familiar with the KIQ (I should probably change that at some point).
Series is Acked-by: Christian König <[email protected]>.
Regards,
Christian.
Quoted 127 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 80 ++++++----------------------------- 1 file changed, 13 insertions(+), 67 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +9
-64@@ -4604,7 +4604,6 @@ static void gfx_v8_0_kiq_setting(struct amdgpu_ring *ring)static int gfx_v8_0_kiq_kcq_enable (struct amdgpu_device *adev) {struct amdgpu_ring *kiq_ring = &adev->gfx.kiq.ring; -uint32_t scratch, tmp =0 ;uint64_t queue_mask =0 ;int r, i;@@ -4623,17 +4622,10 @@ static int gfx_v8_0_kiq_kcq_enable(struct amdgpu_device *adev) queue_mask |= (1ull << i); } - r =amdgpu_gfx_scratch_get (adev, &scratch); -if (r) { -DRM_ERROR ("Failed to get scratch reg (%d).\n" , r); -return r; - } -WREG32 (scratch,0xCAFEDEAD ); - - r =amdgpu_ring_alloc (kiq_ring, (8 * adev->gfx.num_compute_rings) +11 ); + kiq_ring->ready = true; + r =amdgpu_ring_alloc (kiq_ring, (8 * adev->gfx.num_compute_rings) +8 );if (r) {DRM_ERROR ("Failed to lock KIQ (%d).\n" , r); -amdgpu_gfx_scratch_free (adev, scratch);return r; }/* set resources */ @@ -4665,25 +4657,12 @@ static int gfx_v8_0_kiq_kcq_enable(struct amdgpu_device *adev)amdgpu_ring_write (kiq_ring,lower_32_bits (wptr_addr));amdgpu_ring_write (kiq_ring,upper_32_bits (wptr_addr)); } -/* write to scratch for completion */ -amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_SET_UCONFIG_REG ,1 )); -amdgpu_ring_write (kiq_ring, (scratch -PACKET3_SET_UCONFIG_REG_START )); -amdgpu_ring_write (kiq_ring,0xDEADBEEF ); -amdgpu_ring_commit (kiq_ring); -for (i =0 ; i < adev->usec_timeout; i++) { - tmp =RREG32 (scratch); -if (tmp ==0xDEADBEEF ) -break ; -DRM_UDELAY (1 ); - } -if (i >= adev->usec_timeout) { -DRM_ERROR ("KCQ enable failed (scratch(0x%04X)=0x%08X)\n" , - scratch, tmp); - r = -EINVAL ; + r =amdgpu_ring_test_ring (kiq_ring); +if (r) { +DRM_ERROR ("KCQ enable failed\n" ); + kiq_ring->ready = false; } -amdgpu_gfx_scratch_free (adev, scratch); -return r; }@@ -5014,15 +4993,6 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)if (r) goto done; -/* Test KIQ */ - ring = &adev->gfx.kiq.ring; - ring->ready = true; - r =amdgpu_ring_test_ring (ring); -if (r) { - ring->ready = false; - goto done; - } -/* Test KCQs */ for (i =0 ; i < adev->gfx.num_compute_rings; i++) { ring = &adev->gfx.compute_ring[i];@@ -5092,23 +5062,11 @@ static int gfx_v8_0_hw_init(void *handle)static int gfx_v8_0_kcq_disable (struct amdgpu_ring *kiq_ring,struct amdgpu_ring *ring) { -struct amdgpu_device *adev = kiq_ring->adev; -uint32_t scratch, tmp =0 ; -int r, i; - - r =amdgpu_gfx_scratch_get (adev, &scratch); -if (r) { -DRM_ERROR ("Failed to get scratch reg (%d).\n" , r); -return r; - } -WREG32 (scratch,0xCAFEDEAD ); +int r; - r =amdgpu_ring_alloc (kiq_ring,10 ); -if (r) { + r =amdgpu_ring_alloc (kiq_ring,6 ); +if (r)DRM_ERROR ("Failed to lock KIQ (%d).\n" , r); -amdgpu_gfx_scratch_free (adev, scratch); -return r; - }/* unmap queues */ amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_UNMAP_QUEUES ,4 ));@@ -5121,23 +5079,11 @@ static int gfx_v8_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ringamdgpu_ring_write (kiq_ring,0 );amdgpu_ring_write (kiq_ring,0 );amdgpu_ring_write (kiq_ring,0 ); -/* write to scratch for completion */ -amdgpu_ring_write (kiq_ring,PACKET3 (PACKET3_SET_UCONFIG_REG ,1 )); -amdgpu_ring_write (kiq_ring, (scratch -PACKET3_SET_UCONFIG_REG_START )); -amdgpu_ring_write (kiq_ring,0xDEADBEEF ); -amdgpu_ring_commit (kiq_ring); -for (i =0 ; i < adev->usec_timeout; i++) { - tmp =RREG32 (scratch); -if (tmp ==0xDEADBEEF ) -break ; -DRM_UDELAY (1 ); - } -if (i >= adev->usec_timeout) { -DRM_ERROR ("KCQ disabled failed (scratch(0x%04X)=0x%08X)\n" , scratch, tmp);
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static int gfx_v8_0_kcq_disable(struct amdgpu_ring *kiq_ring,struct amdgpu_ring · line 5089
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +4
-3- r = -EINVAL ; - } -amdgpu_gfx_scratch_free (adev, scratch); + r =amdgpu_ring_test_ring (kiq_ring); +if (r) +DRM_ERROR ("KCQ disable failed\n" ); +return r; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx