diff options
| author | Maarten Lankhorst | 2012-11-28 12:25:44 +0100 |
|---|---|---|
| committer | Dave Airlie | 2012-12-10 11:21:30 +0100 |
| commit | 97a875cbdf89a4638eea57c2b456c7cc4e3e8b21 (patch) | |
| tree | 286ff23a3f8e389ec4fa1a6f3b58cbee4fc8e9fe /include/drm/ttm/ttm_bo_api.h | |
| parent | drm/ttm: cope with reserved buffers on lru list in ttm_mem_evict_first, v2 (diff) | |
| download | kernel-qcow2-linux-97a875cbdf89a4638eea57c2b456c7cc4e3e8b21.tar.gz kernel-qcow2-linux-97a875cbdf89a4638eea57c2b456c7cc4e3e8b21.tar.xz kernel-qcow2-linux-97a875cbdf89a4638eea57c2b456c7cc4e3e8b21.zip | |
drm/ttm: remove no_wait_reserve, v3
All items on the lru list are always reservable, so this is a stupid
thing to keep. Not only that, it is used in a way which would
guarantee deadlocks if it were ever to be set to block on reserve.
This is a lot of churn, but mostly because of the removal of the
argument which can be nested arbitrarily deeply in many places.
No change of code in this patch except removal of the no_wait_reserve
argument, the previous patch removed the use of no_wait_reserve.
v2:
- Warn if -EBUSY is returned on reservation, all objects on the list
should be reservable. Adjusted patch slightly due to conflicts.
v3:
- Focus on no_wait_reserve removal only.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/ttm/ttm_bo_api.h')
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index c6cae733ddef..3cb5d848fb66 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -337,7 +337,6 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy, * @bo: The buffer object. * @placement: Proposed placement for the buffer object. * @interruptible: Sleep interruptible if sleeping. - * @no_wait_reserve: Return immediately if other buffers are busy. * @no_wait_gpu: Return immediately if the GPU is busy. * * Changes placement and caching policy of the buffer object @@ -350,7 +349,7 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy, */ extern int ttm_bo_validate(struct ttm_buffer_object *bo, struct ttm_placement *placement, - bool interruptible, bool no_wait_reserve, + bool interruptible, bool no_wait_gpu); /** |