drm/amdgpu: remove needless usage of #ifdef

Submitted by S, Shirish on Sept. 12, 2019, 6:44 a.m.

Details

Message ID 1568270671-21346-1-git-send-email-shirish.s@amd.com
State New
Headers show
Series "drm/amdgpu: remove needless usage of #ifdef" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

S, Shirish Sept. 12, 2019, 6:44 a.m.
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 <Felix.Kuehling@amd.com>
Signed-off-by: Shirish S <shirish.s@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

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++) {

Comments

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 <Felix.Kuehling@amd.com>

> Signed-off-by: Shirish S <shirish.s@amd.com>


Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>



> ---

>   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++) {