]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amdkfd: remove redundant iommu cleanup code
authorYifan Zhang <yifan1.zhang@amd.com>
Fri, 24 Sep 2021 03:15:35 +0000 (11:15 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 5 Oct 2021 17:02:13 +0000 (13:02 -0400)
kfd_resume doesn't involve iommu operation, remove
redundant iommu cleanup code.

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Tested-by: James Zhu <James.Zhu@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdkfd/kfd_device.c

index c2a4d920da40e485a425d36c3a3250d68959fb80..4a416231b24c8b42a1269227c5e7789702f9016e 100644 (file)
@@ -1085,18 +1085,12 @@ static int kfd_resume(struct kfd_dev *kfd)
        int err = 0;
 
        err = kfd->dqm->ops.start(kfd->dqm);
-       if (err) {
+       if (err)
                dev_err(kfd_device,
                        "Error starting queue manager for device %x:%x\n",
                        kfd->pdev->vendor, kfd->pdev->device);
-               goto dqm_start_error;
-       }
 
        return err;
-
-dqm_start_error:
-       kfd_iommu_suspend(kfd);
-       return err;
 }
 
 static inline void kfd_queue_work(struct workqueue_struct *wq,