drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.
authorJack Zhang <Jack.Zhang1@amd.com>
Thu, 21 Nov 2019 06:09:08 +0000 (14:09 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 22 Nov 2019 19:27:11 +0000 (14:27 -0500)
After rlcg fw 2.1, kmd driver starts to load extra fw for
LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw
because all rlcg related fw have been loaded by host driver.
Guest driver would load the three fw fail without this change.

Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

index b2cb9e5..96a6b00 100644 (file)
@@ -1470,7 +1470,10 @@ out:
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL
+                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM
+                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM))
                        /*skip ucode loading in SRIOV VF */
                        continue;