diff options
| author | Christian König | 2014-12-03 15:46:48 +0100 |
|---|---|---|
| committer | Alex Deucher | 2014-12-04 00:26:52 +0100 |
| commit | aa35071c590461f95d0179cc8e730d49d610f773 (patch) | |
| tree | 72f9c722700be9a265857bff56f3843c7f0e298d /drivers/gpu/drm/ttm | |
| parent | drm/radeon: check the right ring in radeon_evict_flags() (diff) | |
| download | kernel-qcow2-linux-aa35071c590461f95d0179cc8e730d49d610f773.tar.gz kernel-qcow2-linux-aa35071c590461f95d0179cc8e730d49d610f773.tar.xz kernel-qcow2-linux-aa35071c590461f95d0179cc8e730d49d610f773.zip | |
drm/ttm: optionally move duplicates to a separate list
This patch adds an optional list_head parameter to ttm_eu_reserve_buffers.
If specified duplicates in the execbuf list are no longer reported as errors,
but moved to this list instead.
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_execbuf_util.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 8ce508e76208..3820ae97a030 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -93,7 +93,8 @@ EXPORT_SYMBOL(ttm_eu_backoff_reservation); */ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket, - struct list_head *list, bool intr) + struct list_head *list, bool intr, + struct list_head *dups) { struct ttm_bo_global *glob; struct ttm_validate_buffer *entry; @@ -117,6 +118,13 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket, __ttm_bo_unreserve(bo); ret = -EBUSY; + + } else if (ret == -EALREADY && dups) { + struct ttm_validate_buffer *safe = entry; + entry = list_prev_entry(entry, head); + list_del(&safe->head); + list_add(&safe->head, dups); + continue; } if (!ret) { |