> -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Monk Liu > Sent: Tuesday, February 07, 2017 1:11 AM > To: amd-gfx at lists.freedesktop.org > Cc: Liu, Monk > Subject: [PATCH 01/20] drm/amdgpu:fix powerplay logic > > 1,like pp_hw_init, we shouldn't report error if PP disabled > 2,disable pp_en if sriov > > Change-Id: I6d259f9609f223998bea236f64676b9c22133e4e > Signed-off-by: Monk Liu <Monk.Liu at amd.com> Acked-by: Alex Deucher <alexander.deucher at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- > drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c > index 8856ecc..d56d200 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c > +++ b/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); > pp_init.chip_family = adev->family; > 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.device = amdgpu_cgs_create_device(adev); > ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle)); > diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c > b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c > index 429f18b..e9cf207 100644 > --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c > +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c > @@ -286,7 +286,7 @@ static int pp_resume(void *handle) > } > > if (ret1 == PP_DPM_DISABLED) > - return ret1; > + return 0; > > eventmgr = pp_handle->eventmgr; > > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
