drm/amdgpu/vcn: Add vcn/vcn1 in white list to load its firmware under sriov

Previously since vcn0/vcn1 are not enabled, loading firmware
is skipped. Now add firmware loading back since vcn0/vcn1
has already been enabled on sriov

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Jane Jian <Jane.Jian@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/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index a7de2c2..e4af40b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -835,7 +835,9 @@ bool amdgpu_virt_fw_load_skip_check(struct amdgpu_device *adev, uint32_t ucode_i
                || ucode_id == AMDGPU_UCODE_ID_CP_MES
                || ucode_id == AMDGPU_UCODE_ID_CP_MES_DATA
                || ucode_id == AMDGPU_UCODE_ID_CP_MES1
-               || ucode_id == AMDGPU_UCODE_ID_CP_MES1_DATA)
+               || ucode_id == AMDGPU_UCODE_ID_CP_MES1_DATA
+               || ucode_id == AMDGPU_UCODE_ID_VCN1
+               || ucode_id == AMDGPU_UCODE_ID_VCN)
                        return false;
                else
                        return true;