Re: [PATCH] drm/amdkfd: Fix compile error if HMM support not enabled

[Felix Kuehling]

On 2024-07-25 19:25, Philip Yang wrote:

Fixes the below if kernel config not enable HMM support

drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_queue.c:107:26: error:

implicit declaration of function 'svm_range_from_addr'

drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_queue.c:107:24: error:

assignment to 'struct svm_range *' from 'int' makes pointer from integer
without a cast [-Wint-conversion]

drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_queue.c:111:28: error:

invalid use of undefined type 'struct svm_range'

Fixes: de165b53c93f ("drm/amdkfd: Validate user queue svm memory residency")
Reported-by: kernel test robot <l...@intel.com>
Closes: 
https://lore.kernel.org/oe-kbuild-all/202407252127.zvnxakra-...@intel.com/
Signed-off-by: Philip Yang <philip.y...@amd.com>

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

---
  drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
index 9807e8adf77d..64c292f0ba1b 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
@@ -85,6 +85,8 @@ void uninit_queue(struct queue *q)
        kfree(q);
  }

+#if IS_ENABLED(CONFIG_HSA_AMD_SVM)

+
  static int kfd_queue_buffer_svm_get(struct kfd_process_device *pdd, u64 addr, 
u64 size)
  {
        struct kfd_process *p = pdd->process;
@@ -178,6 +180,18 @@ static void kfd_queue_buffer_svm_put(struct 
kfd_process_device *pdd, u64 addr, u

mutex_unlock(&p->svms.lock);

  }
+#else
+
+static int kfd_queue_buffer_svm_get(struct kfd_process_device *pdd, u64 addr, 
u64 size)
+{
+       return -EINVAL;
+}
+
+static void kfd_queue_buffer_svm_put(struct kfd_process_device *pdd, u64 addr, 
u64 size)
+{
+}
+
+#endif

int kfd_queue_buffer_get(struct amdgpu_vm *vm, void __user *addr, struct amdgpu_bo **pbo,

                         u64 expected_size)