diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3762-drm-amdgpu-fix-build-error-without-CONFIG_HSA_AMD.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3762-drm-amdgpu-fix-build-error-without-CONFIG_HSA_AMD.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3762-drm-amdgpu-fix-build-error-without-CONFIG_HSA_AMD.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3762-drm-amdgpu-fix-build-error-without-CONFIG_HSA_AMD.patch new file mode 100644 index 00000000..7a0a8816 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3762-drm-amdgpu-fix-build-error-without-CONFIG_HSA_AMD.patch @@ -0,0 +1,55 @@ +From 977264aed4e0866a522df9906846284b9059976b Mon Sep 17 00:00:00 2001 +From: Shirish S <shirish.s@amd.com> +Date: Tue, 10 Sep 2019 12:45:01 +0530 +Subject: [PATCH 3762/4256] drm/amdgpu: fix build error without CONFIG_HSA_AMD + +If CONFIG_HSA_AMD is not set, build fails: + +drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: In function `amdgpu_device_ip_early_init': +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1626: undefined reference to `sched_policy' + +Use CONFIG_HSA_AMD to guard this. + +Fixes: 1abb680ad371 ("drm/amdgpu: disable gfxoff while use no H/W scheduling policy") + +Signed-off-by: Shirish S <shirish.s@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 55e3d3e2e69c..2f6d165a1ac0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -173,7 +173,9 @@ extern int amdgpu_discovery; + extern int amdgpu_mes; + extern int amdgpu_noretry; + extern int amdgpu_force_asic_type; ++#ifdef CONFIG_HSA_AMD + extern int sched_policy; ++#endif + + #ifdef CONFIG_DRM_AMDGPU_SI + extern int amdgpu_si_support; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 92e01084911c..8d113a29b0df 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1624,7 +1624,11 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) + } + + adev->pm.pp_feature = amdgpu_pp_feature_mask; +- if (amdgpu_sriov_vf(adev) || sched_policy == KFD_SCHED_POLICY_NO_HWS) ++ if (amdgpu_sriov_vf(adev) ++ #ifdef CONFIG_HSA_AMD ++ || sched_policy == KFD_SCHED_POLICY_NO_HWS ++ #endif ++ ) + adev->pm.pp_feature &= ~PP_GFXOFF_MASK; + + for (i = 0; i < adev->num_ip_blocks; i++) { +-- +2.17.1 + |