more code shuffling

2 files changed, 66 insertions, 67 deletions

diff --git a/r600_atom.h b/r600_atom.h
index 2c4da8b..56d4fee 100644
--- a/r600_atom.h
+++ b/r600_atom.h
@@ -61,5 +61,71 @@ struct drm_r600_batch {
 	struct r600_vs_input		inputs;
 };
 
+/* R600 */
+#define R600_BATCH_NATOMS	11
+struct r600_batch {
+	struct list_head		list;
+	struct list_head		pre_flushes;
+	struct list_head		post_flushes;
+	struct radeon_atom		*atoms[R600_BATCH_NATOMS];
+	struct radeon_atom		*emit_atoms[R600_BATCH_NATOMS];
+	u32				nemit_atoms;
+	u32				nflushes;
+	u32				npkts;
+	struct radeon_bo		*shaders;
+	u32				shaders_idx;
+	struct r600_vs_input		inputs;
+	u32				nfs_resources;
+};
+
+#define R600_SHADER_SIZE (32 * 1024)
+
+struct r600_batches {
+	struct radeon_ib		*ib;
+	u32				npkts;
+	struct list_head		batches;
+	u32				nfs_resources;
+	struct r600_vs_buffer		fs_resource[160];
+	u32				last_id[R600_BATCH_NATOMS];
+};
+
+struct r600_atoms {
+	struct list_head	blend_atoms;
+	struct list_head	cb_atoms;
+	struct list_head	cb_cntl_atoms;
+	struct list_head	constants_atoms;
+	struct list_head	db_atoms;
+	struct list_head	db_cntl_atoms;
+	struct list_head	pa_atoms;
+	struct list_head	sq_atoms;
+	struct list_head	vport_atoms;
+	struct list_head	vs_shader_atoms;
+	struct list_head	ps_shader_atoms;
+	struct idr		idr;
+	struct mutex		mutex;
+	struct r600_batches	batches;
+	unsigned		npipes;
+	unsigned		nbanks;
+	unsigned		group_bytes;
+};
+
+/* R600 */
+extern void r600_shader_disassemble(u32 *bytecode, u32 ndwords);
+extern int r600_shader_build_fs(struct radeon_device *rdev,
+				u32 *bytecode, u32 *ndwords,
+				struct drm_r600_vs_input *inputs,
+				struct drm_r600_vs_shader *vs);
+extern int r600_atoms_init(struct radeon_device *rdev, struct r600_atoms *atoms);
+extern void r600_atoms_release(struct radeon_device *rdev, struct r600_atoms *atoms);
+extern int r600_atom_create(struct radeon_device *rdev,
+				struct r600_atoms *atoms,
+				struct drm_radeon_atom *patom,
+				struct radeon_atom **atomptr);
+extern int r600_batches_queue(struct radeon_device *rdev,
+				struct r600_atoms *atoms,
+				struct drm_r600_batch *batch);
+extern int r600_batches_flush(struct radeon_device *rdev, struct r600_atoms *atoms);
+/* R700 */
+extern void r700_batches_states_default(struct radeon_device *rdev, struct r600_batches *batches);
 
 #endif
diff --git a/radeon_atom.h b/radeon_atom.h
index accbc66..7e5ba95 100644
--- a/radeon_atom.h
+++ b/radeon_atom.h
@@ -49,54 +49,6 @@ struct radeon_atom {
 	radeon_atom_emit_t		emit;
 };
 
-/* R600 */
-#define R600_BATCH_NATOMS	11
-struct r600_batch {
-	struct list_head		list;
-	struct list_head		pre_flushes;
-	struct list_head		post_flushes;
-	struct radeon_atom		*atoms[R600_BATCH_NATOMS];
-	struct radeon_atom		*emit_atoms[R600_BATCH_NATOMS];
-	u32				nemit_atoms;
-	u32				nflushes;
-	u32				npkts;
-	struct radeon_bo		*shaders;
-	u32				shaders_idx;
-	struct r600_vs_input		inputs;
-	u32				nfs_resources;
-};
-
-#define R600_SHADER_SIZE (32 * 1024)
-
-struct r600_batches {
-	struct radeon_ib		*ib;
-	u32				npkts;
-	struct list_head		batches;
-	u32				nfs_resources;
-	struct r600_vs_buffer		fs_resource[160];
-	u32				last_id[R600_BATCH_NATOMS];
-};
-
-struct r600_atoms {
-	struct list_head	blend_atoms;
-	struct list_head	cb_atoms;
-	struct list_head	cb_cntl_atoms;
-	struct list_head	constants_atoms;
-	struct list_head	db_atoms;
-	struct list_head	db_cntl_atoms;
-	struct list_head	pa_atoms;
-	struct list_head	sq_atoms;
-	struct list_head	vport_atoms;
-	struct list_head	vs_shader_atoms;
-	struct list_head	ps_shader_atoms;
-	struct idr		idr;
-	struct mutex		mutex;
-	struct r600_batches	batches;
-	unsigned		npipes;
-	unsigned		nbanks;
-	unsigned		group_bytes;
-};
-
 extern int radeon_atom_init(struct radeon_atom *atom,
 				struct idr *idp,
 				radeon_atom_emit_t emit);
@@ -127,23 +79,4 @@ static inline void radeon_atom_put(struct radeon_atom *atom)
 }
 struct radeon_bo *radeon_bo_lookup(struct radeon_device *rdev, u32 handle);
 
-/* R600 */
-extern void r600_shader_disassemble(u32 *bytecode, u32 ndwords);
-extern int r600_shader_build_fs(struct radeon_device *rdev,
-				u32 *bytecode, u32 *ndwords,
-				struct drm_r600_vs_input *inputs,
-				struct drm_r600_vs_shader *vs);
-extern int r600_atoms_init(struct radeon_device *rdev, struct r600_atoms *atoms);
-extern void r600_atoms_release(struct radeon_device *rdev, struct r600_atoms *atoms);
-extern int r600_atom_create(struct radeon_device *rdev,
-				struct r600_atoms *atoms,
-				struct drm_radeon_atom *patom,
-				struct radeon_atom **atomptr);
-extern int r600_batches_queue(struct radeon_device *rdev,
-				struct r600_atoms *atoms,
-				struct drm_r600_batch *batch);
-extern int r600_batches_flush(struct radeon_device *rdev, struct r600_atoms *atoms);
-/* R700 */
-extern void r700_batches_states_default(struct radeon_device *rdev, struct r600_batches *batches);
-
 #endif