]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: fix build error without CONFIG_HSA_AMD
authorShirish S <shirish.s@amd.com>
Tue, 10 Sep 2019 07:15:01 +0000 (12:45 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 16 Sep 2019 15:05:07 +0000 (10:05 -0500)
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 733331837d925fb0a3e867852c0e739c6b427e81..d1bd0c5d81a16f3648e64e0173f9f13d714bbffc 100644 (file)
@@ -169,7 +169,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;
index 1affaa4ee1eecc78a5351777e2e737fa60bf4942..b893ec935b841c290ba73a6a82ed5b4123cb92bc 100644 (file)
@@ -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++) {