]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: enable IH ring 1&2 for Vega20 as well
authorChristian König <christian.koenig@amd.com>
Mon, 4 Mar 2019 18:59:36 +0000 (19:59 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Mar 2019 20:36:58 +0000 (15:36 -0500)
That doesn't seem to have any negative effects.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/vega10_ih.c

index fa45234f020f148b45a0d590b0b338ba1e60bb49..1b2f69a9a24ef957f5ec701ab664e1e9de3653f1 100644 (file)
@@ -469,23 +469,19 @@ static int vega10_ih_sw_init(void *handle)
        adev->irq.ih.use_doorbell = true;
        adev->irq.ih.doorbell_index = adev->doorbell_index.ih << 1;
 
-       if (adev->asic_type == CHIP_VEGA10) {
-               r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true);
-               if (r)
-                       return r;
-
-               adev->irq.ih1.use_doorbell = true;
-               adev->irq.ih1.doorbell_index =
-                       (adev->doorbell_index.ih + 1) << 1;
-
-               r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true);
-               if (r)
-                       return r;
-
-               adev->irq.ih2.use_doorbell = true;
-               adev->irq.ih2.doorbell_index =
-                       (adev->doorbell_index.ih + 2) << 1;
-       }
+       r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true);
+       if (r)
+               return r;
+
+       adev->irq.ih1.use_doorbell = true;
+       adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih + 1) << 1;
+
+       r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true);
+       if (r)
+               return r;
+
+       adev->irq.ih2.use_doorbell = true;
+       adev->irq.ih2.doorbell_index = (adev->doorbell_index.ih + 2) << 1;
 
        r = amdgpu_irq_init(adev);