diff options
| author | Christian König <christian.koenig@amd.com> | 2019-10-01 10:02:58 +0200 | 
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2019-10-25 11:40:28 +0200 | 
| commit | 7fb03cc3e0794f00b8f154f335ad5b4eb4d78c58 (patch) | |
| tree | 9b556061a491d7eb6faf37e779cb9c81b696415c /drivers/gpu/drm/ttm/ttm_execbuf_util.c | |
| parent | c6a5f8daff1179a443f3bf797c0400d84a8818a0 (diff) | |
drm/ttm, drm/vmwgfx: move cpu_writers handling into vmwgfx
This feature is only used by vmwgfx and superfluous for everybody else.
Signed-off-by: Christian König <christian.koenig@amd.com>
Co-developed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Tested-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/333650/
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_execbuf_util.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_execbuf_util.c | 7 | 
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 131dae8f4170..0519e1b5a49c 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -113,12 +113,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,  		struct ttm_buffer_object *bo = entry->bo;  		ret = __ttm_bo_reserve(bo, intr, (ticket == NULL), ticket); -		if (!ret && unlikely(atomic_read(&bo->cpu_writers) > 0)) { -			dma_resv_unlock(bo->base.resv); - -			ret = -EBUSY; - -		} else if (ret == -EALREADY && dups) { +		if (ret == -EALREADY && dups) {  			struct ttm_validate_buffer *safe = entry;  			entry = list_prev_entry(entry, head);  			list_del(&safe->head);  | 
