diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-08-07 20:39:04 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-08-31 19:25:48 +0100 |
| commit | d3ed74027f1dd197b7e08247a40d3bf9be1852b0 (patch) | |
| tree | 9d4fbd62d8fb5d505c1b934f13bccb762ab47dff /drivers/gpu/drm/radeon/radeon_object.h | |
| parent | dfadbbdb57b3f2bb33e14f129a43047c6f0caefa (diff) | |
| download | blackbird-op-linux-d3ed74027f1dd197b7e08247a40d3bf9be1852b0.tar.gz blackbird-op-linux-d3ed74027f1dd197b7e08247a40d3bf9be1852b0.zip | |
drm/radeon/kms: add a new gem_wait ioctl with read/write flags
The new DRM_RADEON_GEM_WAIT ioctl combines GEM_WAIT_IDLE and GEM_BUSY (there
is a NO_WAIT flag to get the latter) with USAGE_READ and USAGE_WRITE flags
to take advantage of the new ttm_bo_wait changes.
Also bump the DRM version.
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h index e9dc8b249c5f..a057a8e5a6e6 100644 --- a/drivers/gpu/drm/radeon/radeon_object.h +++ b/drivers/gpu/drm/radeon/radeon_object.h @@ -119,7 +119,7 @@ static inline u64 radeon_bo_mmap_offset(struct radeon_bo *bo) } static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, - bool no_wait) + bool no_wait, enum ttm_buffer_usage usage) { int r; @@ -130,7 +130,7 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, 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, TTM_USAGE_READWRITE); + r = ttm_bo_wait(&bo->tbo, true, true, no_wait, usage); spin_unlock(&bo->tbo.bdev->fence_lock); ttm_bo_unreserve(&bo->tbo); return r; |
