drm/radeon/kms: cleanup r600 blit code

reorganize the code such that only the primitives (i.e., the functions
that load the CP ring) are hardware specific; dynamically link the
primitives in a (new) pointer structure inside r600_blit at
blit initialization time so that the functions that control the blit
operations can be made common for r600 and evergreen parts

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

1 files changed, 21 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 9f6d206104d..6b1d09904e1 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -522,9 +522,30 @@ struct r600_ih {
         bool                    enabled;
 };
 
+struct r600_blit_cp_primitives {
+        void (*set_render_target)(struct radeon_device *rdev, int format,
+                                  int w, int h, u64 gpu_addr);
+        void (*cp_set_surface_sync)(struct radeon_device *rdev,
+                                    u32 sync_type, u32 size,
+                                    u64 mc_addr);
+        void (*set_shaders)(struct radeon_device *rdev);
+        void (*set_vtx_resource)(struct radeon_device *rdev, u64 gpu_addr);
+        void (*set_tex_resource)(struct radeon_device *rdev,
+                                 int format, int w, int h, int pitch,
+                                 u64 gpu_addr);
+        void (*set_scissors)(struct radeon_device *rdev, int x1, int y1,
+                             int x2, int y2);
+        void (*draw_auto)(struct radeon_device *rdev);
+        void (*set_default_state)(struct radeon_device *rdev);
+};
+
 struct r600_blit {
         struct mutex            mutex;
         struct radeon_bo        *shader_obj;
+        struct r600_blit_cp_primitives primitives;
+        int max_dim;
+        int ring_size_common;
+        int ring_size_per_loop;
         u64 shader_gpu_addr;
         u32 vs_offset, ps_offset;
         u32 state_offset;