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, 7 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index c364ef94cc36..f8408f88cd37 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -2057,13 +2057,13 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
                 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
                 else
                         amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
                 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
                 break;
@@ -2071,13 +2071,14 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
                 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
                 else
                         amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block);
-                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
+
                 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
                 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
                 break;
@@ -2085,11 +2086,11 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
                 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
-                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 break;
         default:
                 BUG();