From f96a89c2e86c70d67f9dbcce32f9cbac90ca1580 Mon Sep 17 00:00:00 2001
From: Kent Russell <kent.russell@amd.com>
Date: Thu, 15 Oct 2020 10:37:55 -0400
Subject: [PATCH] drm/amdgpu: Change *use_mm to kthread_*use_mm
The KCL already covers this, so make the change to handle newer kernels
that have the new definition utilized.
Signed-off-by: Kent Russell <kent.russell@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 71a4fdcfb3a89..508fca41ca1bf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -205,9 +205,9 @@ uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *s
if ((mmptr) == current->mm) { \
valid = !get_user((dst), (wptr)); \
} else if (current->mm == NULL) { \
- use_mm(mmptr); \
+ kthread_use_mm(mmptr); \
valid = !get_user((dst), (wptr)); \
- unuse_mm(mmptr); \
+ kthread_unuse_mm(mmptr); \
} \
pagefault_enable(); \
} \
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index c306e7b391106..3a494e9bf6cc1 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -2295,7 +2295,7 @@ void copy_context_work_handler (struct work_struct *work)
p = workarea->p;
mm = get_task_mm(p->lead_thread);
- use_mm(mm);
+ kthread_use_mm(mm);
list_for_each_entry(pdd, &p->per_device_data, per_device_list) {
struct device_queue_manager *dqm = pdd->dev->dqm;
struct qcm_process_device *qpd = &pdd->qpd;
@@ -2321,7 +2321,7 @@ void copy_context_work_handler (struct work_struct *work)
dqm_unlock(dqm);
}
- unuse_mm(mm);
+ kthread_unuse_mm(mm);
mmput(mm);
}
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 03684324af584..91bf0109c283a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -199,7 +199,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
if (!mm)
goto cleanup;
- use_mm(mm);
+ kthread_use_mm(mm);
list_for_each_entry(sdma_q, &sdma_q_list.list, list) {
val = 0;
@@ -213,7 +213,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
}
}
- unuse_mm(mm);
+ kthread_unuse_mm(mm);
mmput(mm);
/*