aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r600_blit.c
diff options
context:
space:
mode:
authorRobert Noland <rnoland@2hip.net>2009-10-20 14:07:38 -0400
committerDave Airlie <airlied@redhat.com>2009-10-25 23:28:21 -0400
commit33fdb15c99aac20d238af487fa363d3e5c7ed197 (patch)
treec16113310eaf398e5a9d6397aa6c484e4cad88b7 /drivers/gpu/drm/radeon/r600_blit.c
parentc54b1820d69a1043acaf50d084852e628266e0e2 (diff)
drm/radeon/r600: only assign vb after we know space is available.
This patch only changes this is the swap path, where it doesn't loop. Signed-off-by: Robert Noland <rnoland@2hip.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_blit.c')
-rw-r--r--drivers/gpu/drm/radeon/r600_blit.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
index 626a9ab7075a..5ea432347589 100644
--- a/drivers/gpu/drm/radeon/r600_blit.c
+++ b/drivers/gpu/drm/radeon/r600_blit.c
@@ -778,8 +778,6 @@ r600_blit_swap(struct drm_device *dev,
778 u64 vb_addr; 778 u64 vb_addr;
779 u32 *vb; 779 u32 *vb;
780 780
781 vb = r600_nomm_get_vb_ptr(dev);
782
783 if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) { 781 if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {
784 782
785 r600_nomm_put_vb(dev); 783 r600_nomm_put_vb(dev);
@@ -788,8 +786,8 @@ r600_blit_swap(struct drm_device *dev,
788 return; 786 return;
789 787
790 set_shaders(dev); 788 set_shaders(dev);
791 vb = r600_nomm_get_vb_ptr(dev);
792 } 789 }
790 vb = r600_nomm_get_vb_ptr(dev);
793 791
794 sx2 = sx + w; 792 sx2 = sx + w;
795 sy2 = sy + h; 793 sy2 = sy + h;