]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: drop some validation failure messages
authorChristian König <christian.koenig@amd.com>
Fri, 17 May 2019 07:31:44 +0000 (09:31 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 11 Jun 2019 16:52:03 +0000 (11:52 -0500)
The messages about amdgpu_cs_list_validate are duplicated because the
caller will complain into the logs as well and we can also get
interrupted by a signal here.

Also fix the the caller to not report -EAGAIN from validation.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

index fff558cf385b8ec4b016372bb44e5f8cb4183c6d..20f2955d2a556ea5d60745bde82c175a83ce2960 100644 (file)
@@ -671,16 +671,12 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
        }
 
        r = amdgpu_cs_list_validate(p, &duplicates);
-       if (r) {
-               DRM_ERROR("amdgpu_cs_list_validate(duplicates) failed.\n");
+       if (r)
                goto error_validate;
-       }
 
        r = amdgpu_cs_list_validate(p, &p->validated);
-       if (r) {
-               DRM_ERROR("amdgpu_cs_list_validate(validated) failed.\n");
+       if (r)
                goto error_validate;
-       }
 
        amdgpu_cs_report_moved_bytes(p->adev, p->bytes_moved,
                                     p->bytes_moved_vis);
@@ -1383,7 +1379,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
        if (r) {
                if (r == -ENOMEM)
                        DRM_ERROR("Not enough memory for command submission!\n");
-               else if (r != -ERESTARTSYS)
+               else if (r != -ERESTARTSYS && r != -EAGAIN)
                        DRM_ERROR("Failed to process the buffer list %d!\n", r);
                goto out;
        }