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

- 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>

1 files changed, 31 insertions, 21 deletions

diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
index d988eece0187..626a9ab7075a 100644
--- a/drivers/gpu/drm/radeon/r600_blit.c
+++ b/drivers/gpu/drm/radeon/r600_blit.c
@@ -774,6 +774,7 @@ r600_blit_swap(struct drm_device *dev,
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         int cb_format, tex_format;
+        int sx2, sy2, dx2, dy2;
         u64 vb_addr;
         u32 *vb;
 
@@ -790,16 +791,10 @@ r600_blit_swap(struct drm_device *dev,
                 vb = r600_nomm_get_vb_ptr(dev);
         }
 
-        if (cpp == 4) {
-                cb_format = COLOR_8_8_8_8;
-                tex_format = FMT_8_8_8_8;
-        } else if (cpp == 2) {
-                cb_format = COLOR_5_6_5;
-                tex_format = FMT_5_6_5;
-        } else {
-                cb_format = COLOR_8;
-                tex_format = FMT_8;
-        }
+        sx2 = sx + w;
+        sy2 = sy + h;
+        dx2 = dx + w;
+        dy2 = dy + h;
 
         vb[0] = i2f(dx);
         vb[1] = i2f(dy);
@@ -807,31 +802,46 @@ r600_blit_swap(struct drm_device *dev,
         vb[3] = i2f(sy);
 
         vb[4] = i2f(dx);
-        vb[5] = i2f(dy + h);
+        vb[5] = i2f(dy2);
         vb[6] = i2f(sx);
-        vb[7] = i2f(sy + h);
+        vb[7] = i2f(sy2);
 
-        vb[8] = i2f(dx + w);
-        vb[9] = i2f(dy + h);
-        vb[10] = i2f(sx + w);
-        vb[11] = i2f(sy + h);
+        vb[8] = i2f(dx2);
+        vb[9] = i2f(dy2);
+        vb[10] = i2f(sx2);
+        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 */
         set_tex_resource(dev_priv, tex_format,
                          src_pitch / cpp,
-                         sy + h, src_pitch / cpp,
+                         sy2, src_pitch / cpp,
                          src_gpu_addr);
 
         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 */
         set_render_target(dev_priv, cb_format,
-                          dst_pitch / cpp, dy + h,
+                          dst_pitch / cpp, dy2,
                           dst_gpu_addr);
 
         /* scissors */
-        set_scissors(dev_priv, dx, dy, dx + w, dy + h);
+        set_scissors(dev_priv, dx, dy, dx2, dy2);
 
         /* Vertex buffer setup */
         vb_addr = dev_priv->gart_buffers_offset +
@@ -844,7 +854,7 @@ r600_blit_swap(struct drm_device *dev,
 
         cp_set_surface_sync(dev_priv,
                             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;
 }