diff options
| author | Maarten Lankhorst <[email protected]> | 2013-01-15 13:56:37 +0000 |
|---|---|---|
| committer | Maarten Lankhorst <[email protected]> | 2013-01-15 13:56:37 +0000 |
| commit | 63d0a4195560362e2e00a3ad38fc331d34e1da9b (patch) | |
| tree | 64df3550af24b6f583c17aac878a9f1fb6fa85eb /drivers/gpu/drm/ttm/ttm_execbuf_util.c | |
| parent | drm/nouveau: increase reservation sequence every retry (diff) | |
| download | kernel-63d0a4195560362e2e00a3ad38fc331d34e1da9b.tar.gz kernel-63d0a4195560362e2e00a3ad38fc331d34e1da9b.zip | |
drm/ttm: remove lru_lock around ttm_bo_reserve
There should no longer be assumptions that reserve will always succeed
with the lru lock held, so we can safely break the whole atomic
reserve/lru thing. As a bonus this fixes most lockdep annotations for
reservations.
Signed-off-by: Maarten Lankhorst <[email protected]>
Reviewed-by: Jerome Glisse <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_execbuf_util.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_execbuf_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index cd9e4523dc56..bd37b5cb8553 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -153,7 +153,7 @@ retry: struct ttm_buffer_object *bo = entry->bo; retry_this_bo: - ret = ttm_bo_reserve_locked(bo, true, true, true, val_seq); + ret = ttm_bo_reserve_nolru(bo, true, true, true, val_seq); switch (ret) { case 0: break; |