diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3801-drm-amdgpu-remove-needless-usage-of-ifdef.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3801-drm-amdgpu-remove-needless-usage-of-ifdef.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3801-drm-amdgpu-remove-needless-usage-of-ifdef.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3801-drm-amdgpu-remove-needless-usage-of-ifdef.patch new file mode 100644 index 00000000..eabfcfba --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3801-drm-amdgpu-remove-needless-usage-of-ifdef.patch @@ -0,0 +1,50 @@ +From 96c669b5cf7448b05ef1dae4763e5a66988fe289 Mon Sep 17 00:00:00 2001 +From: Shirish S <shirish.s@amd.com> +Date: Thu, 12 Sep 2019 12:03:55 +0530 +Subject: [PATCH 3801/4256] 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: 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 2f6d165a1ac0..8c2c52fe43a9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -175,6 +175,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 078df285b86a..d3152aa16396 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -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++) { +-- +2.17.1 + |