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

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index fb26039beeba..bf5e6a413dee 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -529,6 +529,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                         amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
                 else
                         amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
                 if (!amdgpu_sriov_vf(adev))
                         amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
                 if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
@@ -539,8 +541,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 #else
 #       warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
-                amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
                 if (!(adev->asic_type == CHIP_VEGA20 && amdgpu_sriov_vf(adev))) {
                         amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block);
                         amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
@@ -551,6 +551,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
                 amdgpu_device_ip_block_add(adev, &psp_v10_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
                 if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
@@ -560,8 +562,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 #else
 #       warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
-                amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
                 break;
         default: