drm/amdkfd: Minor cleanups

These were missed previously when rebasing changes for upstreaming.

v2: Remove redundant sched_policy conditions

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

3 files changed, 7 insertions, 7 deletions

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 e2fc4c5d42cd..e202921c150e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -389,12 +389,11 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q)
         if (sched_policy != KFD_SCHED_POLICY_NO_HWS) {
                 retval = unmap_queues_cpsch(dqm,
                                 KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
-                if (retval != 0) {
+                if (retval) {
                         pr_err("unmap queue failed\n");
                         goto out_unlock;
                 }
-        } else if (sched_policy == KFD_SCHED_POLICY_NO_HWS &&
-                   prev_active &&
+        } else if (prev_active &&
                    (q->properties.type == KFD_QUEUE_TYPE_COMPUTE ||
                     q->properties.type == KFD_QUEUE_TYPE_SDMA)) {
                 retval = mqd->destroy_mqd(mqd, q->mqd,
@@ -421,8 +420,7 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q)
 
         if (sched_policy != KFD_SCHED_POLICY_NO_HWS)
                 retval = map_queues_cpsch(dqm);
-        else if (sched_policy == KFD_SCHED_POLICY_NO_HWS &&
-                 q->properties.is_active &&
+        else if (q->properties.is_active &&
                  (q->properties.type == KFD_QUEUE_TYPE_COMPUTE ||
                   q->properties.type == KFD_QUEUE_TYPE_SDMA))
                 retval = mqd->load_mqd(mqd, q->mqd, q->pipe, q->queue,
@@ -832,7 +830,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
 
         if (q->properties.type == KFD_QUEUE_TYPE_SDMA) {
                 retval = allocate_sdma_queue(dqm, &q->sdma_id);
-                if (retval != 0)
+                if (retval)
                         goto out;
                 q->properties.sdma_queue_id =
                         q->sdma_id / CIK_SDMA_QUEUES_PER_ENGINE;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 78b5d61780cb..9e4134c5b481 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -507,6 +507,8 @@ struct kfd_process {
          * In any process, the thread that started main() is the lead
          * thread and outlives the rest.
          * It is here because amd_iommu_bind_pasid wants a task_struct.
+         * It can also be used for safely getting a reference to the
+         * mm_struct of the process.
          */
         struct task_struct *lead_thread;
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index db08f8f53d4b..1f5ccd28bd41 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -416,7 +416,7 @@ int kfd_bind_processes_to_device(struct kfd_dev *dev)
                 err = amd_iommu_bind_pasid(dev->pdev, p->pasid,
                                 p->lead_thread);
                 if (err < 0) {
-                        pr_err("unexpected pasid %d binding failure\n",
+                        pr_err("Unexpected pasid %d binding failure\n",
                                         p->pasid);
                         mutex_unlock(&p->mutex);
                         break;