OSDN Git Service

drm/amd/pm: Skip smu_post_init in SRIOV
authorJingwen Chen <Jingwen.Chen2@amd.com>
Thu, 17 Sep 2020 07:58:40 +0000 (15:58 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 18 Sep 2020 20:14:56 +0000 (16:14 -0400)
smu_post_init needs to enable SMU feature, while this require
virtualization off. Skip it since this feature is not used in SRIOV.

v2: move the check to the early stage of smu_post_init.

v3: fix typo

Signed-off-by: Jingwen Chen <Jingwen.Chen2@amd.com>
Reviewed-by: Emily.Deng <Emily.Deng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

index 846c9c9..985c706 100644 (file)
@@ -2633,6 +2633,9 @@ static int navi10_post_smu_init(struct smu_context *smu)
        uint64_t feature_mask = 0;
        int ret = 0;
 
+       if (amdgpu_sriov_vf(adev))
+               return 0;
+
        /* For Naiv1x, enable these features only after DAL initialization */
        if (adev->pm.pp_feature & PP_SOCCLK_DPM_MASK)
                feature_mask |= FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);