Commit a35ad98b authored by Shirish S's avatar Shirish S Committed by Alex Deucher
Browse files

drm/amdgpu: remove needless usage of #ifdef 



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: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarShirish S <shirish.s@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8c9f69bc

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −5
Original line number Diff line number Diff line
@@ -1624,11 +1624,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++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE