Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/radeon/r600: Replace repeated calculations with variable.

Browse source 
- Reduce the chance of error and avoid a bit of overhead.
  - Use switch to assign color and format

Signed-off-by: Robert Noland <rnoland@2hip.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Robert Noland 2009-10-20 08:11:36 -05:00 committed by Dave Airlie
parent bc293e58cb
commit c54b1820d6
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
drivers/gpu/drm/radeon/r600_blit.c
View file

@ -774,6 +774,7 @@ r600_blit_swap(struct drm_device *dev,
{ {
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
int cb_format, tex_format; int cb_format, tex_format;
int sx2, sy2, dx2, dy2;
u64 vb_addr; u64 vb_addr;
u32 *vb; u32 *vb;
@ -790,16 +791,10 @@ r600_blit_swap(struct drm_device *dev,
vb = r600_nomm_get_vb_ptr(dev); vb = r600_nomm_get_vb_ptr(dev);
} }
if (cpp == 4) { sx2 = sx + w;
cb_format = COLOR_8_8_8_8; sy2 = sy + h;
tex_format = FMT_8_8_8_8; dx2 = dx + w;
} else if (cpp == 2) { dy2 = dy + h;
cb_format = COLOR_5_6_5;
tex_format = FMT_5_6_5;
} else {
cb_format = COLOR_8;
tex_format = FMT_8;
}
vb[0] = i2f(dx); vb[0] = i2f(dx);
vb[1] = i2f(dy); vb[1] = i2f(dy);
@ -807,31 +802,46 @@ r600_blit_swap(struct drm_device *dev,
vb[3] = i2f(sy); vb[3] = i2f(sy);
vb[4] = i2f(dx); vb[4] = i2f(dx);
vb[5] = i2f(dy + h); vb[5] = i2f(dy2);
vb[6] = i2f(sx); vb[6] = i2f(sx);
vb[7] = i2f(sy + h); vb[7] = i2f(sy2);
vb[8] = i2f(dx + w); vb[8] = i2f(dx2);
vb[9] = i2f(dy + h); vb[9] = i2f(dy2);
vb[10] = i2f(sx + w); vb[10] = i2f(sx2);
vb[11] = i2f(sy + h); vb[11] = i2f(sy2);
switch(cpp) {
case 4:
cb_format = COLOR_8_8_8_8;
tex_format = FMT_8_8_8_8;
break;
case 2:
cb_format = COLOR_5_6_5;
tex_format = FMT_5_6_5;
break;
default:
cb_format = COLOR_8;
tex_format = FMT_8;
break;
}
/* src */ /* src */
set_tex_resource(dev_priv, tex_format, set_tex_resource(dev_priv, tex_format,
src_pitch / cpp, src_pitch / cpp,
sy + h, src_pitch / cpp, sy2, src_pitch / cpp,
src_gpu_addr); src_gpu_addr);
cp_set_surface_sync(dev_priv, cp_set_surface_sync(dev_priv,
R600_TC_ACTION_ENA, (src_pitch * (sy + h)), src_gpu_addr); R600_TC_ACTION_ENA, src_pitch * sy2, src_gpu_addr);
/* dst */ /* dst */
set_render_target(dev_priv, cb_format, set_render_target(dev_priv, cb_format,
dst_pitch / cpp, dy + h, dst_pitch / cpp, dy2,
dst_gpu_addr); dst_gpu_addr);
/* scissors */ /* scissors */
set_scissors(dev_priv, dx, dy, dx + w, dy + h); set_scissors(dev_priv, dx, dy, dx2, dy2);
/* Vertex buffer setup */ /* Vertex buffer setup */
vb_addr = dev_priv->gart_buffers_offset + vb_addr = dev_priv->gart_buffers_offset +
@ -844,7 +854,7 @@ r600_blit_swap(struct drm_device *dev,
cp_set_surface_sync(dev_priv, cp_set_surface_sync(dev_priv,
R600_CB_ACTION_ENA | R600_CB0_DEST_BASE_ENA, R600_CB_ACTION_ENA | R600_CB0_DEST_BASE_ENA,
dst_pitch * (dy + h), dst_gpu_addr); dst_pitch * dy2, dst_gpu_addr);
dev_priv->blit_vb->used += 12 * 4; dev_priv->blit_vb->used += 12 * 4;
} }