diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-10-27 18:15:10 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-27 18:15:10 +0200 |
| commit | 83f30d0e0343ad010afbc3523007b68e8b439694 (patch) | |
| tree | 7f24184e5560f9daa63c34fa37a8824694822313 /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux i... (diff) | |
| download | linux-83f30d0e0343ad010afbc3523007b68e8b439694.tar.xz linux-83f30d0e0343ad010afbc3523007b68e8b439694.zip | |
Revert "drm/radeon/kms: add a new gem_wait ioctl with read/write flags"
This reverts commit d3ed74027f1dd197b7e08247a40d3bf9be1852b0.
Further upstream discussion between Thomas and Marek decided this needed
more work and driver specifics. So revert before it goes upstream.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 138839312e8b..b8f75f5d344b 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -516,8 +516,7 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo) return 0; } -int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait, - enum ttm_buffer_usage usage) +int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait) { int r; @@ -528,7 +527,7 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait, if (mem_type) *mem_type = bo->tbo.mem.mem_type; if (bo->tbo.sync_obj) - r = ttm_bo_wait(&bo->tbo, true, true, no_wait, usage); + r = ttm_bo_wait(&bo->tbo, true, true, no_wait, false); spin_unlock(&bo->tbo.bdev->fence_lock); ttm_bo_unreserve(&bo->tbo); return r; |