Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next

More new features and fixes for 4.20:
- Add dynamic powergating support for VCN on picasso
- Scheduler cleanup
- Vega20 support for KFD
- DC cleanups and bug fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927184348.2696-1-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 44d10c2172f6..b5775c6a857b 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
@@ -276,7 +276,7 @@ static void cik_ih_decode_iv(struct amdgpu_device *adev,
         dw[2] = le32_to_cpu(adev->irq.ih.ring[ring_index + 2]);
         dw[3] = le32_to_cpu(adev->irq.ih.ring[ring_index + 3]);
 
-        entry->client_id = AMDGPU_IH_CLIENTID_LEGACY;
+        entry->client_id = AMDGPU_IRQ_CLIENTID_LEGACY;
         entry->src_id = dw[0] & 0xff;
         entry->src_data[0] = dw[1] & 0xfffffff;
         entry->ring_id = dw[2] & 0xff;
@@ -318,7 +318,7 @@ static int cik_ih_sw_init(void *handle)
         int r;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-        r = amdgpu_ih_ring_init(adev, 64 * 1024, false);
+        r = amdgpu_ih_ring_init(adev, &adev->irq.ih, 64 * 1024, false);
         if (r)
                 return r;
 
@@ -332,7 +332,7 @@ static int cik_ih_sw_fini(void *handle)
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
         amdgpu_irq_fini(adev);
-        amdgpu_ih_ring_fini(adev);
+        amdgpu_ih_ring_fini(adev, &adev->irq.ih);
         amdgpu_irq_remove_domain(adev);
 
         return 0;
@@ -468,8 +468,7 @@ static const struct amdgpu_ih_funcs cik_ih_funcs = {
 
 static void cik_ih_set_interrupt_funcs(struct amdgpu_device *adev)
 {
-        if (adev->irq.ih_funcs == NULL)
-                adev->irq.ih_funcs = &cik_ih_funcs;
+        adev->irq.ih_funcs = &cik_ih_funcs;
 }
 
 const struct amdgpu_ip_block_version cik_ih_ip_block =