瀏覽代碼

drm/amdgpu:fix powerplay logic

1,like pp_hw_init, we shouldn't report error if PP disabled
2,disable pp_en if sriov

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Monk Liu 8 年之前
父節點
當前提交
8fdf269258
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
  2. 1 1
      drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+ 1 - 1
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c

@@ -43,7 +43,7 @@ static int amdgpu_create_pp_handle(struct amdgpu_device *adev)
 	amd_pp = &(adev->powerplay);
 	amd_pp = &(adev->powerplay);
 	pp_init.chip_family = adev->family;
 	pp_init.chip_family = adev->family;
 	pp_init.chip_id = adev->asic_type;
 	pp_init.chip_id = adev->asic_type;
-	pp_init.pm_en = amdgpu_dpm != 0 ? true : false;
+	pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false;
 	pp_init.feature_mask = amdgpu_pp_feature_mask;
 	pp_init.feature_mask = amdgpu_pp_feature_mask;
 	pp_init.device = amdgpu_cgs_create_device(adev);
 	pp_init.device = amdgpu_cgs_create_device(adev);
 	ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle));
 	ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle));

+ 1 - 1
drivers/gpu/drm/amd/powerplay/amd_powerplay.c

@@ -286,7 +286,7 @@ static int pp_resume(void *handle)
 	}
 	}
 
 
 	if (ret1 == PP_DPM_DISABLED)
 	if (ret1 == PP_DPM_DISABLED)
-		return ret1;
+		return 0;
 
 
 	eventmgr = pp_handle->eventmgr;
 	eventmgr = pp_handle->eventmgr;