drm/amdgpu/userq: remove the vital queue unmap logging

Mesa userqueues free does not wait for the free to complete and go ahead
in unmapping the vital bos while kernel is still in queue free and
corresponding cleanup.

So ideally we don't need the logging for that and hence remove the warn
message as this is expected behaviour and functionally, we are making
sure to wait for the required fences before unmap.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 758a868043dcb07eca923bc451c16da3e73dc47c)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index e937099de3e7058c82f5252f2b4a50a2bb6088ed..986ef5ca00878951eccf87887e51b9766127c988 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -1344,8 +1344,7 @@ int amdgpu_userq_start_sched_for_enforce_isolation(struct amdgpu_device *adev,
 }
 
 void amdgpu_userq_gem_va_unmap_validate(struct amdgpu_device *adev,
-                                       struct amdgpu_bo_va_mapping *mapping,
-                                       uint64_t saddr)
+                                       struct amdgpu_bo_va_mapping *mapping)
 {
        u32 ip_mask = amdgpu_userq_get_supported_ip_mask(adev);
        struct amdgpu_bo_va *bo_va = mapping->bo_va;
@@ -1354,12 +1353,9 @@ void amdgpu_userq_gem_va_unmap_validate(struct amdgpu_device *adev,
        if (!ip_mask)
                return;
 
-       dev_warn_once(adev->dev, "now unmapping a vital queue va:%llx\n", saddr);
        /**
-        * The userq VA mapping reservation should include the eviction fence,
-        * if the eviction fence can't signal successfully during unmapping,
-        * then driver will warn to flag this improper unmap of the userq VA.
-        * Note: The eviction fence may be attached to different BOs, and this
+        * The userq VA mapping reservation should include the eviction fence.
+        * Note: The eviction fence may be attached to different BOs and this
         * unmap is only for one kind of userq VAs, so at this point suppose
         * the eviction fence is always unsignaled.
         */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
index 28cfc668233379b759ef2b4630392b2cd2458c39..d1751febaefe4473ef932368e23d4e4ab5f51aad 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
@@ -182,6 +182,5 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev,
                                   u64 addr, u64 expected_size, u64 *va_out);
 
 void amdgpu_userq_gem_va_unmap_validate(struct amdgpu_device *adev,
-                                       struct amdgpu_bo_va_mapping *mapping,
-                                       uint64_t saddr);
+                                       struct amdgpu_bo_va_mapping *mapping);
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index c9f88ecce1a7596ab5ac17cdd669cdd1b2e67adf..381901bc539fde7af35fb244dcae512b0949fc05 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2006,7 +2006,7 @@ int amdgpu_vm_bo_unmap(struct amdgpu_device *adev,
         * from user space.
         */
        if (unlikely(bo_va->userq_va_mapped))
-               amdgpu_userq_gem_va_unmap_validate(adev, mapping, saddr);
+               amdgpu_userq_gem_va_unmap_validate(adev, mapping);
 
        list_del(&mapping->list);
        amdgpu_vm_it_remove(mapping, &vm->va);