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

 Add a new list.h helper for doing bulk updates.  Used by ttm.
- Fixes for display underflow on VI APUs at 4K with UVD running
- Endian fixes for powerplay on vega
- DC fixes for interlaced video
- Vega20 powerplay fixes
- RV/RV2/PCO powerplay fixes
- Fix for spurious ACPI events on HG laptops
- Fix a memory leak in DC on driver unload
- Fixes for manual fan control mode switching
- Suspend/resume robustness fixes
- Fix display handling on RV2
- VCN fixes for DPG on PCO
- Misc code cleanups and warning fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011014739.3117-1-alexander.deucher@amd.com

1 files changed, 8 insertions, 19 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
index d4ceaf440f26..adbaea6da0d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
@@ -502,12 +502,14 @@ static int si_dma_sw_init(void *handle)
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
         /* DMA0 trap event */
-        r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 224, &adev->sdma.trap_irq);
+        r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 224,
+                              &adev->sdma.trap_irq);
         if (r)
                 return r;
 
         /* DMA1 trap event */
-        r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 244, &adev->sdma.trap_irq_1);
+        r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 244,
+                              &adev->sdma.trap_irq);
         if (r)
                 return r;
 
@@ -649,17 +651,10 @@ static int si_dma_process_trap_irq(struct amdgpu_device *adev,
                                       struct amdgpu_irq_src *source,
                                       struct amdgpu_iv_entry *entry)
 {
-        amdgpu_fence_process(&adev->sdma.instance[0].ring);
-
-        return 0;
-}
-
-static int si_dma_process_trap_irq_1(struct amdgpu_device *adev,
-                                      struct amdgpu_irq_src *source,
-                                      struct amdgpu_iv_entry *entry)
-{
-        amdgpu_fence_process(&adev->sdma.instance[1].ring);
-
+        if (entry->src_id == 224)
+                amdgpu_fence_process(&adev->sdma.instance[0].ring);
+        else
+                amdgpu_fence_process(&adev->sdma.instance[1].ring);
         return 0;
 }
 
@@ -786,11 +781,6 @@ static const struct amdgpu_irq_src_funcs si_dma_trap_irq_funcs = {
         .process = si_dma_process_trap_irq,
 };
 
-static const struct amdgpu_irq_src_funcs si_dma_trap_irq_funcs_1 = {
-        .set = si_dma_set_trap_irq_state,
-        .process = si_dma_process_trap_irq_1,
-};
-
 static const struct amdgpu_irq_src_funcs si_dma_illegal_inst_irq_funcs = {
         .process = si_dma_process_illegal_inst_irq,
 };
@@ -799,7 +789,6 @@ static void si_dma_set_irq_funcs(struct amdgpu_device *adev)
 {
         adev->sdma.trap_irq.num_types = AMDGPU_SDMA_IRQ_LAST;
         adev->sdma.trap_irq.funcs = &si_dma_trap_irq_funcs;
-        adev->sdma.trap_irq_1.funcs = &si_dma_trap_irq_funcs_1;
         adev->sdma.illegal_inst_irq.funcs = &si_dma_illegal_inst_irq_funcs;
 }