Commit 33fdb15c authored by Robert Noland's avatar Robert Noland Committed by Dave Airlie

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: default avatarRobert Noland <rnoland@2hip.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c54b1820
...@@ -778,8 +778,6 @@ r600_blit_swap(struct drm_device *dev, ...@@ -778,8 +778,6 @@ r600_blit_swap(struct drm_device *dev,
u64 vb_addr; u64 vb_addr;
u32 *vb; u32 *vb;
vb = r600_nomm_get_vb_ptr(dev);
if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) { if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {
r600_nomm_put_vb(dev); r600_nomm_put_vb(dev);
...@@ -788,8 +786,8 @@ r600_blit_swap(struct drm_device *dev, ...@@ -788,8 +786,8 @@ r600_blit_swap(struct drm_device *dev,
return; return;
set_shaders(dev); set_shaders(dev);
vb = r600_nomm_get_vb_ptr(dev);
} }
vb = r600_nomm_get_vb_ptr(dev);
sx2 = sx + w; sx2 = sx + w;
sy2 = sy + h; sy2 = sy + h;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment