drm/amdgpu: simplify IH programming

Calculate all the addresses and pointers in amdgpu_ih.c

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
index 884aa9b81e86..721c757156e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
@@ -103,9 +103,9 @@ static void cik_ih_disable_interrupts(struct amdgpu_device *adev)
  */
 static int cik_ih_irq_init(struct amdgpu_device *adev)
 {
+        struct amdgpu_ih_ring *ih = &adev->irq.ih;
         int rb_bufsz;
         u32 interrupt_cntl, ih_cntl, ih_rb_cntl;
-        u64 wptr_off;
 
         /* disable irqs */
         cik_ih_disable_interrupts(adev);
@@ -131,9 +131,8 @@ static int cik_ih_irq_init(struct amdgpu_device *adev)
         ih_rb_cntl |= IH_RB_CNTL__WPTR_WRITEBACK_ENABLE_MASK;
 
         /* set the writeback address whether it's enabled or not */
-        wptr_off = adev->wb.gpu_addr + (adev->irq.ih.wptr_offs * 4);
-        WREG32(mmIH_RB_WPTR_ADDR_LO, lower_32_bits(wptr_off));
-        WREG32(mmIH_RB_WPTR_ADDR_HI, upper_32_bits(wptr_off) & 0xFF);
+        WREG32(mmIH_RB_WPTR_ADDR_LO, lower_32_bits(ih->wptr_addr));
+        WREG32(mmIH_RB_WPTR_ADDR_HI, upper_32_bits(ih->wptr_addr) & 0xFF);
 
         WREG32(mmIH_RB_CNTL, ih_rb_cntl);
 
@@ -188,7 +187,7 @@ static u32 cik_ih_get_wptr(struct amdgpu_device *adev,
 {
         u32 wptr, tmp;
 
-        wptr = le32_to_cpu(adev->wb.wb[ih->wptr_offs]);
+        wptr = le32_to_cpu(*ih->wptr_cpu);
 
         if (wptr & IH_RB_WPTR__RB_OVERFLOW_MASK) {
                 wptr &= ~IH_RB_WPTR__RB_OVERFLOW_MASK;