diff options
| author | Hawking Zhang <Hawking.Zhang@amd.com> | 2020-04-26 22:43:15 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-03-23 22:52:33 -0400 |
| commit | 9fbd96a136f209656766714d4e043e3ad0becdd1 (patch) | |
| tree | 77f6dd9234e35f7fccc87b2d032e7c3ff513bb87 /drivers/gpu/drm/amd/amdgpu/soc15.c | |
| parent | efec10c1eb3d9d8e9c3ce1b5d9f73a6d2922d631 (diff) | |
| download | linux-stable-9fbd96a136f209656766714d4e043e3ad0becdd1.tar.gz linux-stable-9fbd96a136f209656766714d4e043e3ad0becdd1.tar.bz2 linux-stable-9fbd96a136f209656766714d4e043e3ad0becdd1.zip | |
drm/amdgpu: enable psp v13 ip block for aldebaran
Add psp v13 ip block to soc ip init list for aldebaran
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Le Ma <Le.Ma@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index de45fe18705d..cc260822a790 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -1065,7 +1065,17 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) case CHIP_ALDEBARAN: amdgpu_device_ip_block_add(adev, &vega10_common_ip_block); amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block); - amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block); + + if (amdgpu_sriov_vf(adev)) { + if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) + amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block); + amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block); + } else { + amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block); + if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) + amdgpu_device_ip_block_add(adev, &psp_v13_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); break; |