From: Tao Zhou <tao.zhou1@amd.com>
Date: Tue, 13 Jul 2021 21:19:25 +0000 (-0400)
Subject: drm/amdgpu: set ip blocks for cyan_skillfish
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f36fb5a0e3611aaf2e68623fc12fae41c4990de5;p=linux.git

drm/amdgpu: set ip blocks for cyan_skillfish

Add ip blocks for cyan_skillfish.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index bc89d00ff7bc4..de0c08ec8ed07 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -892,6 +892,15 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);
 		amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);
 		break;
+	case CHIP_CYAN_SKILLFISH:
+		amdgpu_device_ip_block_add(adev, &nv_common_ip_block);
+                amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+                if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
+                        amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
+		break;
 	default:
 		return -EINVAL;
 	}