drm/vmwgfx: Fix buffer object eviction

thomashvmw · thomashvmw · commit e71cf5918765 · 2018-09-20T08:05:14.000+02:00
Commit 19be557 ("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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -3729,7 +3729,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv,`
`3729`	`3729`	`{`
`3730`	`3730`	`struct vmw_buffer_object *vbo =`
`3731`	`3731`	`container_of(bo, struct vmw_buffer_object, base);`
`3732`		`- struct ttm_operation_ctx ctx = { interruptible, true };`
	`3732`	`+ struct ttm_operation_ctx ctx = { interruptible, false };`
`3733`	`3733`	`int ret;`
`3734`	`3734`
`3735`	`3735`	`if (vbo->pin_count > 0)`