[PATCH 63/66] drm/amdgpu: add support for SRIOV in IP discovery path

[Alex Deucher]

Handle SRIOV requirements when adding IP blocks.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 44ab3d6739e3..821665fb73b0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -797,7 +797,8 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct 
amdgpu_device *adev)
                switch (adev->ip_versions[UVD_HWIP][0]) {
                case IP_VERSION(7, 0, 0):
                case IP_VERSION(7, 2, 0):
-                       amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block);
+                       if (!(adev->asic_type == CHIP_VEGA20 && 
amdgpu_sriov_vf(adev)))
+                               amdgpu_device_ip_block_add(adev, 
&uvd_v7_0_ip_block);
                        break;
                default:
                        return -EINVAL;
@@ -805,7 +806,8 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct 
amdgpu_device *adev)
                switch (adev->ip_versions[VCE_HWIP][0]) {
                case IP_VERSION(4, 0, 0):
                case IP_VERSION(4, 1, 0):
-                       amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
+                       if (!(adev->asic_type == CHIP_VEGA20 && 
amdgpu_sriov_vf(adev)))
+                               amdgpu_device_ip_block_add(adev, 
&vce_v4_0_ip_block);
                        break;
                default:
                        return -EINVAL;
@@ -837,7 +839,8 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct 
amdgpu_device *adev)
                case IP_VERSION(3, 1, 1):
                case IP_VERSION(3, 0, 2):
                        amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);
-                       amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);
+                       if (!amdgpu_sriov_vf(adev))
+                               amdgpu_device_ip_block_add(adev, 
&jpeg_v3_0_ip_block);
                        break;
                case IP_VERSION(3, 0, 33):
                        amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);
@@ -1179,14 +1182,24 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device 
*adev)
        if (r)
                return r;
 
-       r = amdgpu_discovery_set_ih_ip_blocks(adev);
-       if (r)
-               return r;
-
-       if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
+       /* For SR-IOV, PSP needs to be initialized before IH */
+       if (amdgpu_sriov_vf(adev)) {
                r = amdgpu_discovery_set_psp_ip_blocks(adev);
                if (r)
                        return r;
+               r = amdgpu_discovery_set_ih_ip_blocks(adev);
+               if (r)
+                       return r;
+       } else {
+               r = amdgpu_discovery_set_ih_ip_blocks(adev);
+               if (r)
+                       return r;
+
+               if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
+                       r = amdgpu_discovery_set_psp_ip_blocks(adev);
+                       if (r)
+                               return r;
+               }
        }
 
        if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
@@ -1207,7 +1220,8 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device 
*adev)
        if (r)
                return r;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {
+       if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&
+           !amdgpu_sriov_vf(adev)) {
                r = amdgpu_discovery_set_smu_ip_blocks(adev);
                if (r)
                        return r;
-- 
2.31.1