From: Jane Jian Date: Mon, 22 Aug 2022 07:19:11 +0000 (+0800) Subject: drm/amdgpu/vcn: Add vcn/vcn1 in white list to load its firmware under sriov X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=60e9c7ee3fec7e4f40b1bb8e4e58be03a12c9eb1;p=linux.git 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 Signed-off-by: Jane Jian Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index a7de2c2b0cae2..e4af40b9a8aac 100644 --- 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;