drm/amdgpu: use drm_file_err in fence timeouts

use drm_file_err instead of DRM_ERROR which adds
process and pid information in the userqueue error
logging.

Sample log:

[   19.802315] amdgpu 0000:0a:00.0: [drm] *ERROR* comm: ibus-x11 pid: 2055 client: Unset ... Couldn't unmap all the queues
[   19.802319] amdgpu 0000:0a:00.0: [drm] *ERROR* comm: ibus-x11 pid: 2055 client: Unset ... Failed to evict userqueue
[   19.838432] amdgpu 0000:0a:00.0: [drm] *ERROR* comm: systemd-logind pid: 1042 client: Unset ... Couldn't unmap all the queues
[   19.838436] amdgpu 0000:0a:00.0: [drm] *ERROR* comm: systemd-logind pid: 1042 client: Unset ... Failed to evict userqueue

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index c7a3abfccd133d0073e28c92b2295f0db7273f27..8b1323babb96201f18a276911c5520fb711b67d2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -87,15 +87,14 @@ static void
 amdgpu_userq_wait_for_last_fence(struct amdgpu_userq_mgr *uq_mgr,
                                 struct amdgpu_usermode_queue *queue)
 {
-       struct amdgpu_device *adev = uq_mgr->adev;
        struct dma_fence *f = queue->last_fence;
        int ret;
 
        if (f && !dma_fence_is_signaled(f)) {
                ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
                if (ret <= 0)
-                       dev_err(adev->dev, "Timed out waiting for fence=%llu:%llu\n",
-                               f->context, f->seqno);
+                       drm_file_err(uq_mgr->file, "Timed out waiting for fence=%llu:%llu\n",
+                                    f->context, f->seqno);
        }
 }
 
@@ -711,8 +710,8 @@ amdgpu_userq_wait_for_signal(struct amdgpu_userq_mgr *uq_mgr)
                        continue;
                ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
                if (ret <= 0) {
-                       DRM_ERROR("Timed out waiting for fence=%llu:%llu\n",
-                                 f->context, f->seqno);
+                       drm_file_err(uq_mgr->file, "Timed out waiting for fence=%llu:%llu\n",
+                                    f->context, f->seqno);
                        return -ETIMEDOUT;
                }
        }