drm/radeon/kms: blit code commoning

factor out most of evergreen blit code and use the refactored code
from r600 that is now common for both r600 and evergreen

Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 2 insertions, 23 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 7cd402412054..b37b6a0bbec9 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3087,7 +3087,7 @@ static int evergreen_startup(struct radeon_device *rdev)
 
         r = evergreen_blit_init(rdev);
         if (r) {
-                evergreen_blit_fini(rdev);
+                r600_blit_fini(rdev);
                 rdev->asic->copy = NULL;
                 dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
         }
@@ -3172,27 +3172,6 @@ int evergreen_suspend(struct radeon_device *rdev)
         return 0;
 }
 
-int evergreen_copy_blit(struct radeon_device *rdev,
-                        uint64_t src_offset, uint64_t dst_offset,
-                        unsigned num_pages, struct radeon_fence *fence)
-{
-        int r;
-
-        mutex_lock(&rdev->r600_blit.mutex);
-        rdev->r600_blit.vb_ib = NULL;
-        r = evergreen_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;
-        }
-        evergreen_kms_blit_copy(rdev, src_offset, dst_offset, num_pages);
-        evergreen_blit_done_copy(rdev, fence);
-        mutex_unlock(&rdev->r600_blit.mutex);
-        return 0;
-}
-
 /* Plan is to move initialization in that function and use
  * helper function so that radeon_device_init pretty much
  * do nothing more than calling asic specific function. This
@@ -3301,7 +3280,7 @@ int evergreen_init(struct radeon_device *rdev)
 
 void evergreen_fini(struct radeon_device *rdev)
 {
-        evergreen_blit_fini(rdev);
+        r600_blit_fini(rdev);
         r700_cp_fini(rdev);
         r600_irq_fini(rdev);
         radeon_wb_fini(rdev);