aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchaohong guo <Minskey.Guo@Sun.COM>2007-10-15 10:45:49 +1000
committerDave Airlie <airlied@redhat.com>2007-10-15 10:45:49 +1000
commiteed0f722b3fccb1eb2706b5f484cb511d46f70b8 (patch)
tree70c3fb4bb784dfb1c8cb0253ea95672d1b540c91
parent54583bf4efda79388fc13163e35c016c8bc5de81 (diff)
radeon: Commit the ring after each partial texture upload blit.
This makes sure each blit starts as early as possible, which may improve texture upload performance in some cases. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/char/drm/radeon_state.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index ada820717ad..69c9f2febf4 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -1861,6 +1861,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
OUT_RING((image->width << 16) | height);
RADEON_WAIT_UNTIL_2D_IDLE();
ADVANCE_RING();
+ COMMIT_RING();
radeon_cp_discard_buffer(dev, buf);
@@ -1878,6 +1879,8 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
RADEON_FLUSH_CACHE();
RADEON_WAIT_UNTIL_2D_IDLE();
ADVANCE_RING();
+ COMMIT_RING();
+
return 0;
}
@@ -2378,7 +2381,6 @@ static int radeon_cp_texture(struct drm_device *dev, void *data, struct drm_file
ret = radeon_cp_dispatch_texture(dev, file_priv, tex, &image);
- COMMIT_RING();
return ret;
}