Skip to content

Commit

Permalink
drm/r600: avoid assigning vb twice in blit code
Browse files Browse the repository at this point in the history 
There is no need to assign vb before you know that space is available.

[agd5f: adapted for kernel tree.]

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Robert Noland authored and Dave Airlie committed Oct 7, 2009
1 parent 9d8401f commit 49c458e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
10 changes: 3 additions & 7 deletions drivers/gpu/drm/radeon/r600_blit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,6 @@ r600_blit_copy(struct drm_device *dev,
u64 vb_addr;
u32 *vb;

vb = r600_nomm_get_vb_ptr(dev);

if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {
max_bytes = 8192;

Expand Down Expand Up @@ -619,8 +617,8 @@ r600_blit_copy(struct drm_device *dev,
if (!dev_priv->blit_vb)
return;
set_shaders(dev);
vb = r600_nomm_get_vb_ptr(dev);
}
vb = r600_nomm_get_vb_ptr(dev);

vb[0] = i2f(dst_x);
vb[1] = 0;
Expand Down Expand Up @@ -708,8 +706,8 @@ r600_blit_copy(struct drm_device *dev,
return;

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

vb[0] = i2f(dst_x / 4);
vb[1] = 0;
Expand Down Expand Up @@ -777,8 +775,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 @@ -787,8 +783,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);

if (cpp == 4) {
cb_format = COLOR_8_8_8_8;
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/radeon/r600_blit_kms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ void r600_kms_blit_copy(struct radeon_device *rdev,

DRM_DEBUG("emitting copy %16llx %16llx %d %d\n", src_gpu_addr, dst_gpu_addr,
size_bytes, rdev->r600_blit.vb_used);
vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);
if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {
max_bytes = 8192;

Expand Down Expand Up @@ -653,6 +652,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev,
vb = r600_nomm_get_vb_ptr(dev);
#endif
}
vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);

vb[0] = i2f(dst_x);
vb[1] = 0;
Expand Down Expand Up @@ -747,6 +747,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev,
vb = r600_nomm_get_vb_ptr(dev);
}
#endif
vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);

vb[0] = i2f(dst_x / 4);
vb[1] = 0;
Expand Down

0 comments on commit 49c458e

Please sign in to comment.