diff options
| author | Robert Noland <rnoland@2hip.net> | 2009-10-20 13:07:38 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-10-26 13:28:21 +1000 |
| commit | 33fdb15c99aac20d238af487fa363d3e5c7ed197 (patch) | |
| tree | c16113310eaf398e5a9d6397aa6c484e4cad88b7 | |
| parent | c54b1820d69a1043acaf50d084852e628266e0e2 (diff) | |
| download | kernel_samsung_smdk4412-33fdb15c99aac20d238af487fa363d3e5c7ed197.zip kernel_samsung_smdk4412-33fdb15c99aac20d238af487fa363d3e5c7ed197.tar.gz kernel_samsung_smdk4412-33fdb15c99aac20d238af487fa363d3e5c7ed197.tar.bz2 | |
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_blit.c | 4 |
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 626a9ab..5ea4323 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, 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); @@ -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; |