From 02c15491cf440046c031d4838eee6bcca494b423 Mon Sep 17 00:00:00 2001 From: chaohong guo Date: Mon, 15 Oct 2007 10:45:49 +1000 Subject: [PATCH] --- yaml --- r: 68791 b: refs/heads/master c: eed0f722b3fccb1eb2706b5f484cb511d46f70b8 h: refs/heads/master i: 68789: 16e37fdcc13f71969bcfec9b213dd2884d042ddf 68787: 7758eb0e3dd04a2f83fa17a2fe164677265b7443 68783: abbe729dae9119aff4a6de8dce0d61ece5787456 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_state.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eac689237815..e672c4c0677a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54583bf4efda79388fc13163e35c016c8bc5de81 +refs/heads/master: eed0f722b3fccb1eb2706b5f484cb511d46f70b8 diff --git a/trunk/drivers/char/drm/radeon_state.c b/trunk/drivers/char/drm/radeon_state.c index ada820717ade..69c9f2febf43 100644 --- a/trunk/drivers/char/drm/radeon_state.c +++ b/trunk/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; }