]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu/psp: skip loading SDMA/RLCG under SRIOV VF
authorDaniel Wang <Daniel.Wang2@amd.com>
Thu, 20 Apr 2017 03:45:09 +0000 (11:45 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 28 Apr 2017 21:32:56 +0000 (17:32 -0400)
Now GPU hypervisor will load SDMA and RLCG ucode, so skip it
in guest.

Signed-off-by: Daniel Wang <Daniel.Wang2@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-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 1e380fe29b5efe81c531b76cb2730748b6709a06..ac5e92e5d59d3c69c46b36992558d683ac56f7c5 100644 (file)
@@ -289,6 +289,12 @@ static int psp_np_fw_load(struct psp_context *psp)
                if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC &&
                    psp_smu_reload_quirk(psp))
                        continue;
+               if (amdgpu_sriov_vf(adev) &&
+                  (ucode->ucode_id == AMDGPU_UCODE_ID_SDMA0
+                   || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA1
+                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                       /*skip ucode loading in SRIOV VF */
+                       continue;
 
                ret = psp_prep_cmd_buf(ucode, psp->cmd);
                if (ret)