3 files changed, 111 insertions, 177 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index c4de1610088c..e106f30787fd 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2363,14 +2363,14 @@ int r600_copy_blit(struct radeon_device *rdev,
 
         mutex_lock(&rdev->r600_blit.mutex);
         rdev->r600_blit.vb_ib = NULL;
-        r = r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE);
+        r = r600_blit_prepare_copy(rdev, num_pages);
         if (r) {
                 if (rdev->r600_blit.vb_ib)
                         radeon_ib_free(rdev, &rdev->r600_blit.vb_ib);
                 mutex_unlock(&rdev->r600_blit.mutex);
                 return r;
         }
-        r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * RADEON_GPU_PAGE_SIZE);
+        r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages);
         r600_blit_done_copy(rdev, fence);
         mutex_unlock(&rdev->r600_blit.mutex);
         return 0;
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
index bbbafe685543..3940be619af7 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@ -42,6 +42,10 @@
 #define COLOR_5_6_5           0x8
 #define COLOR_8_8_8_8         0x1a
 
+#define RECT_UNIT_H           32
+#define RECT_UNIT_W           (RADEON_GPU_PAGE_SIZE / 4 / RECT_UNIT_H)
+#define MAX_RECT_DIM          8192
+
 /* emits 21 on rv770+, 23 on r600 */
 static void
 set_render_target(struct radeon_device *rdev, int format,
@@ -600,13 +604,59 @@ static void r600_vb_ib_put(struct radeon_device *rdev)
         radeon_ib_free(rdev, &rdev->r600_blit.vb_ib);
 }
 
-int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
+/* FIXME: the function is very similar to evergreen_blit_create_rect, except
+   that it different predefined constants; consider commonizing */
+static unsigned r600_blit_create_rect(unsigned num_pages, int *width, int *height)
+{
+        unsigned max_pages;
+        unsigned pages = num_pages;
+        int w, h;
+
+        if (num_pages == 0) {
+                /* not supposed to be called with no pages, but just in case */
+                h = 0;
+                w = 0;
+                pages = 0;
+                WARN_ON(1);
+        } else {
+                int rect_order = 2;
+                h = RECT_UNIT_H;
+                while (num_pages / rect_order) {
+                        h *= 2;
+                        rect_order *= 4;
+                        if (h >= MAX_RECT_DIM) {
+                                h = MAX_RECT_DIM;
+                                break;
+                        }
+                }
+                max_pages = (MAX_RECT_DIM * h) / (RECT_UNIT_W * RECT_UNIT_H);
+                if (pages > max_pages)
+                        pages = max_pages;
+                w = (pages * RECT_UNIT_W * RECT_UNIT_H) / h;
+                w = (w / RECT_UNIT_W) * RECT_UNIT_W;
+                pages = (w * h) / (RECT_UNIT_W * RECT_UNIT_H);
+                BUG_ON(pages == 0);
+        }
+
+
+        DRM_DEBUG("blit_rectangle: h=%d, w=%d, pages=%d\n", h, w, pages);
+
+        /* return width and height only of the caller wants it */
+        if (height)
+                *height = h;
+        if (width)
+                *width = w;
+
+        return pages;
+}
+
+
+int r600_blit_prepare_copy(struct radeon_device *rdev, unsigned num_pages)
 {
         int r;
-        int ring_size, line_size;
-        int max_size;
+        int ring_size;
         /* loops of emits 64 + fence emit possible */
-        int dwords_per_loop = 76, num_loops;
+        int dwords_per_loop = 76, num_loops = 0;
 
         r = r600_vb_ib_get(rdev);
         if (r)
@@ -616,18 +666,12 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
         if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770)
                 dwords_per_loop += 2;
 
-        /* 8 bpp vs 32 bpp for xfer unit */
-        if (size_bytes & 3)
-                line_size = 8192;
-        else
-                line_size = 8192*4;
-
-        max_size = 8192 * line_size;
+        /* num loops */
+        while (num_pages) {
+                num_pages -= r600_blit_create_rect(num_pages, NULL, NULL);
+                num_loops++;
+        }
 
-        /* major loops cover the max size transfer */
-        num_loops = ((size_bytes + max_size) / max_size);
-        /* minor loops cover the extra non aligned bits */
-        num_loops += ((size_bytes % line_size) ? 1 : 0);
         /* calculate number of loops correctly */
         ring_size = num_loops * dwords_per_loop;
         /* set default  + shaders */
@@ -659,182 +703,72 @@ void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence)
 
 void r600_kms_blit_copy(struct radeon_device *rdev,
                         u64 src_gpu_addr, u64 dst_gpu_addr,
-                        int size_bytes)
+                        unsigned num_pages)
 {
-        int max_bytes;
         u64 vb_gpu_addr;
         u32 *vb;
 
         DRM_DEBUG("emitting copy %16llx %16llx %d %d\n", src_gpu_addr, dst_gpu_addr,
-                  size_bytes, rdev->r600_blit.vb_used);
+                  num_pages, 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;
-
-                while (size_bytes) {
-                        int cur_size = size_bytes;
-                        int src_x = src_gpu_addr & 255;
-                        int dst_x = dst_gpu_addr & 255;
-                        int h = 1;
-                        src_gpu_addr = src_gpu_addr & ~255ULL;
-                        dst_gpu_addr = dst_gpu_addr & ~255ULL;
-
-                        if (!src_x && !dst_x) {
-                                h = (cur_size / max_bytes);
-                                if (h > 8192)
-                                        h = 8192;
-                                if (h == 0)
-                                        h = 1;
-                                else
-                                        cur_size = max_bytes;
-                        } else {
-                                if (cur_size > max_bytes)
-                                        cur_size = max_bytes;
-                                if (cur_size > (max_bytes - dst_x))
-                                        cur_size = (max_bytes - dst_x);
-                                if (cur_size > (max_bytes - src_x))
-                                        cur_size = (max_bytes - src_x);
-                        }
 
-                        if ((rdev->r600_blit.vb_used + 48) > rdev->r600_blit.vb_total) {
-                                WARN_ON(1);
-                        }
+        while (num_pages) {
+                int w, h;
+                unsigned size_in_bytes;
+                unsigned pages_per_loop = r600_blit_create_rect(num_pages, &w, &h);