summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2018-09-14 09:24:19 +0200
committerThomas Hellstrom <thellstrom@vmware.com>2018-09-20 08:05:14 +0200
commite71cf591876536f7dd5a54ef68d631278ca6faa1 (patch)
tree59ad96b9531fd1745aa6c78be69f86acff2091b2
parenta4bd815a94b7aae27e2413f2ce7b458f9843b8ae (diff)
downloadop-kernel-dev-e71cf591876536f7dd5a54ef68d631278ca6faa1.zip
op-kernel-dev-e71cf591876536f7dd5a54ef68d631278ca6faa1.tar.gz
drm/vmwgfx: Fix buffer object eviction
Commit 19be55701071 ("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>
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 1f13457..f0ab6b2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -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)
OpenPOWER on IntegriCloud