[-fixes] drm/vmwgfx: Fix buffer object eviction
diff mbox series

Message ID 20180914073539.3824-1-thellstrom@vmware.com
State New
Headers show
Series
  • [-fixes] drm/vmwgfx: Fix buffer object eviction
Related show

Commit Message

Thomas Hellstrom Sept. 14, 2018, 7:35 a.m. UTC
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: Christian König <christian.koenig@amd.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christian König Sept. 14, 2018, 7:45 a.m. UTC | #1
Am 14.09.2018 um 09:35 schrieb Thomas Hellstrom:
> 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: Christian König <christian.koenig@amd.com>
> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>

Ups, sorry for that. Patch is Reviewed-by: Christian König 
<christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> index 1f134570b759..f0ab6b2313bb 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)
Thomas Hellstrom Sept. 14, 2018, 4:02 p.m. UTC | #2
On 09/14/2018 09:45 AM, Christian König wrote:
> Am 14.09.2018 um 09:35 schrieb Thomas Hellstrom:
>> 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: Christian König <christian.koenig@amd.com>
>> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
>
> Ups, sorry for that. Patch is Reviewed-by: Christian König 
> <christian.koenig@amd.com>

Thanks!
/Thomas

Patch
diff mbox series

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 1f134570b759..f0ab6b2313bb 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)