summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-08-27 09:52:11 +0200
committerMichel Dänzer <daenzer@vmware.com>2009-08-27 09:52:11 +0200
commit7d36f13afa5da742aa6c989a2652e92c96e5f80e (patch)
treed9a6207b1683cc934a9854659d998d2a44d52e8a
parent066c90e8f5b93c80195dc43486ad3efa083a1f3a (diff)
KMS: Remove explicit radeon_bo_wait calls before radeon_bo_map.
libdrm_radeon always takes care of this implicitly now.
-rw-r--r--src/radeon_exa.c2
-rw-r--r--src/radeon_exa_funcs.c1
-rw-r--r--src/radeon_textured_video.c2
3 files changed, 0 insertions, 5 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index b7013c95..ca4c5237 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -350,8 +350,6 @@ static Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
if (driver_priv->bo->cref > 1)
radeon_cs_flush_indirect(pScrn);
- radeon_bo_wait(driver_priv->bo);
-
/* flush IB */
ret = radeon_bo_map(driver_priv->bo, 1);
if (ret) {
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 58cd5270..c74b9d92 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -572,7 +572,6 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
RADEON_GEM_DOMAIN_GTT);
FLUSH_RING();
- radeon_bo_wait(scratch);
r = radeon_bo_map(scratch, 0);
if (r) {
r = FALSE;
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index a9d6fc3c..932759bb 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -367,7 +367,6 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
pPriv->src_offset = pPriv->video_offset;
if (info->cs) {
int ret;
- radeon_bo_wait(pPriv->src_bo);
ret = radeon_bo_map(pPriv->src_bo, 1);
if (ret)
return BadAlloc;
@@ -690,7 +689,6 @@ Bool radeon_load_bicubic_texture(ScrnInfoPtr pScrn)
uint8_t *bicubic_addr;
int ret;
if (info->cs) {
- radeon_bo_wait(info->bicubic_bo);
ret = radeon_bo_map(info->bicubic_bo, 1);
if (ret)
return FALSE;