]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/amdgpu: do autoload right after MEC loaded for SRIOV VF
authorMonk Liu <Monk.Liu@amd.com>
Tue, 26 Nov 2019 11:38:22 +0000 (19:38 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 3 Dec 2019 16:57:39 +0000 (11:57 -0500)
since we don't have RLCG ucode loading and no SRlist as well

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

index 2770cba56a6b2732e3e4bfad2f781a14624a3022..44be3a45b25eaf2453a649d244365f2f5a727eb5 100644 (file)
@@ -1487,8 +1487,8 @@ out:
                        return ret;
 
                /* Start rlc autoload after psp recieved all the gfx firmware */
-               if (psp->autoload_supported && ucode->ucode_id ==
-                       AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM) {
+               if (psp->autoload_supported && ucode->ucode_id == (amdgpu_sriov_vf(adev) ?
+                   AMDGPU_UCODE_ID_CP_MEC2 : AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM)) {
                        ret = psp_rlc_autoload(psp);
                        if (ret) {
                                DRM_ERROR("Failed to start rlc autoload\n");