Skip to content

Commit

Permalink
drm/radeon/r600: only assign vb after we know space is available.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Robert Noland authored and Dave Airlie committed Oct 26, 2009
1 parent c54b182 commit 33fdb15
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/gpu/drm/radeon/r600_blit.c
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,6 @@ r600_blit_swap(struct drm_device *dev,
u64 vb_addr;
u32 *vb;

vb = r600_nomm_get_vb_ptr(dev);

if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {

r600_nomm_put_vb(dev);
Expand All @@ -788,8 +786,8 @@ r600_blit_swap(struct drm_device *dev,
return;

set_shaders(dev);
vb = r600_nomm_get_vb_ptr(dev);
}
vb = r600_nomm_get_vb_ptr(dev);

sx2 = sx + w;
sy2 = sy + h;
Expand Down

0 comments on commit 33fdb15

Please sign in to comment.