On 2019-09-12 2:44 a.m., S, Shirish wrote: > define sched_policy in case CONFIG_HSA_AMD is not > enabled, with this there is no need to check for CONFIG_HSA_AMD > else where in driver code. > > Suggested-by: Felix Kuehling <[email protected]> > Signed-off-by: Shirish S <[email protected]>
Reviewed-by: Felix Kuehling <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +----- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index a1516a3..6ff02bb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -171,6 +171,8 @@ extern int amdgpu_noretry; > extern int amdgpu_force_asic_type; > #ifdef CONFIG_HSA_AMD > extern int sched_policy; > +#else > +static const int sched_policy = KFD_SCHED_POLICY_HWS; > #endif > > #ifdef CONFIG_DRM_AMDGPU_SI > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 740638e..3b5282b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1623,11 +1623,7 @@ static int amdgpu_device_ip_early_init(struct > amdgpu_device *adev) > } > > adev->pm.pp_feature = amdgpu_pp_feature_mask; > - if (amdgpu_sriov_vf(adev) > - #ifdef CONFIG_HSA_AMD > - || sched_policy == KFD_SCHED_POLICY_NO_HWS > - #endif > - ) > + if (amdgpu_sriov_vf(adev) || sched_policy == KFD_SCHED_POLICY_NO_HWS) > adev->pm.pp_feature &= ~PP_GFXOFF_MASK; > > for (i = 0; i < adev->num_ip_blocks; i++) { _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
