]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/vmwgfx: Fix buffer object eviction
authorThomas Hellstrom <thellstrom@vmware.com>
Fri, 14 Sep 2018 07:24:19 +0000 (09:24 +0200)
committerThomas Hellstrom <thellstrom@vmware.com>
Thu, 20 Sep 2018 06:05:14 +0000 (08:05 +0200)
Commit a006f0a4c9f1 ("drm/ttm: add operation ctx to ttm_bo_validate v2")
introduced a regression where the vmwgfx driver refused to evict a
buffer that was still busy instead of waiting for it to become idle.

Fix this.

Cc: <stable@vger.kernel.org>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

index 1f134570b7599483e2768cfcbe785409f2b7ba04..f0ab6b2313bbed89f5879fd27a6e2c268fc8c613 100644 (file)
@@ -3729,7 +3729,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv,
 {
        struct vmw_buffer_object *vbo =
                container_of(bo, struct vmw_buffer_object, base);
-       struct ttm_operation_ctx ctx = { interruptible, true };
+       struct ttm_operation_ctx ctx = { interruptible, false };
        int ret;
 
        if (vbo->pin_count > 0)