drop drm_ prefixHEADmaster

7 files changed, 106 insertions, 106 deletions

diff --git a/r600.h b/r600.h
index a8482ba..7805f05 100644
--- a/r600.h
+++ b/r600.h
@@ -35,7 +35,7 @@
 #include "radeon_drm.h"
 #include "r600_winsys.h"
 
-#define R600_MAX_BATCH	256
+#define R600_MAX_WORK	256
 
 struct r600_winsys;
 struct r600_atom;
@@ -71,21 +71,21 @@ struct r600_atom_flush {
 	struct radeon_bo	*bo;
 };
 
-struct r600_batch {
+struct r600_work {
 	struct r600_atom		*atoms[R600_BATCH_NATOMS];
 	struct r600_atom		*emit_atoms[R600_BATCH_NATOMS];
 	u32				nemit_atoms;
 	u32				nflush;
 	struct r600_atom_flush		flush[480];
 	u32				npkts;
-	struct drm_r600_batch		drm;
+	struct r600_batch		drm;
 };
 
 struct r600_scheduler {
 	struct radeon_ib		*ib;
 	u32				npkts;
-	u32				nbatch;
-	struct r600_batch		batch[R600_MAX_BATCH];
+	u32				nwork;
+	struct r600_work		work[R600_MAX_WORK];
 	u32				last_id[R600_BATCH_NATOMS];
 };
 
@@ -113,8 +113,8 @@ extern u64 crc_64(void *d, size_t len);
 /* R700 */
 extern void r700_scheduler_states_default(struct r600_winsys *rdev, struct r600_scheduler *scheduler);
 extern int r600_atoms_init(struct r600_winsys *rdev);
-extern int r600_draw_cmd_size(struct drm_r600_batch *batch);
-extern int r600_draw_cmd_emit(struct radeon_ib *ib, struct drm_r600_batch *batch);
+extern int r600_draw_cmd_size(struct r600_batch *batch);
+extern int r600_draw_cmd_emit(struct radeon_ib *ib, struct r600_batch *batch);
 extern void r600_memcpy_bo(struct radeon_bo *bo, u32 *src, u32 size);
 
 static inline int radeon_ib_begin(struct radeon_ib *ib, u32 ndw)
diff --git a/r600_atom.c b/r600_atom.c
index 58df2fe..6706d73 100644
--- a/r600_atom.c
+++ b/r600_atom.c
@@ -34,7 +34,7 @@ int r600_framebuffer_emit(struct r600_winsys *rdev,
 				void *data,
 				struct radeon_ib *ib)
 {
-	struct drm_r600_framebuffer *fb = atom->state;
+	struct r600_framebuffer *fb = atom->state;
 	int i, j;
 
 	for (i = 0, j = 0; i < (fb->ncb * 26); i += 26, j++) {
@@ -50,14 +50,14 @@ int r600_framebuffer_emit(struct r600_winsys *rdev,
 
 int r600_framebuffer_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_framebuffer *fb;
+	struct r600_framebuffer *fb;
 	u32 cb_target_mask, cb_shader_mask;
 	int r, i;
 
-	fb = malloc(sizeof(struct drm_r600_framebuffer));
+	fb = malloc(sizeof(struct r600_framebuffer));
 	if (fb == NULL)
 		return -ENOMEM;
-	memcpy(fb, data, sizeof(struct drm_r600_framebuffer));
+	memcpy(fb, data, sizeof(struct r600_framebuffer));
 	atom->state = fb;
 	atom->nflushes = 1;
 	/* take a references on the bo */
@@ -169,13 +169,13 @@ int r600_framebuffer_create(struct r600_winsys *rdev, struct r600_atom *atom, vo
  */
 int r600_cb_cntl_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_cb_cntl *cb_cntl;
+	struct r600_cb_cntl *cb_cntl;
 	int r;
 
-	cb_cntl = malloc(sizeof(struct drm_r600_cb_cntl));
+	cb_cntl = malloc(sizeof(struct r600_cb_cntl));
 	if (cb_cntl == NULL)
 		return -ENOMEM;
-	memcpy(cb_cntl, data, sizeof(struct drm_r600_cb_cntl));
+	memcpy(cb_cntl, data, sizeof(struct r600_cb_cntl));
 	atom->state = cb_cntl;
 	/* CB_CLRCMP_CONTROL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 4);
@@ -216,13 +216,13 @@ int r600_cb_cntl_create(struct r600_winsys *rdev, struct r600_atom *atom, void *
  */
 int r600_rasterizer_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_rasterizer *rasterizer;
+	struct r600_rasterizer *rasterizer;
 	int r;
 
-	rasterizer = malloc(sizeof(struct drm_r600_rasterizer));
+	rasterizer = malloc(sizeof(struct r600_rasterizer));
 	if (rasterizer == NULL)
 		return -ENOMEM;
-	memcpy(rasterizer, data, sizeof(struct drm_r600_rasterizer));
+	memcpy(rasterizer, data, sizeof(struct r600_rasterizer));
 	atom->state = rasterizer;
 	/* PA_SC_MPASS_PS_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
@@ -294,13 +294,13 @@ int r600_rasterizer_create(struct r600_winsys *rdev, struct r600_atom *atom, voi
  */
 int r600_viewport_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_viewport *vport;
+	struct r600_viewport *vport;
 	int r;
 
-	vport = malloc(sizeof(struct drm_r600_viewport));
+	vport = malloc(sizeof(struct r600_viewport));
 	if (vport == NULL)
 		return -ENOMEM;
-	memcpy(vport, data, sizeof(struct drm_r600_viewport));
+	memcpy(vport, data, sizeof(struct r600_viewport));
 	atom->state = vport;
 	/* PA_CL_VPORT_XSCALE_0 */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 6);
@@ -323,13 +323,13 @@ int r600_viewport_create(struct r600_winsys *rdev, struct r600_atom *atom, void
  */
 int r600_scissor_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_scissor *scissor;
+	struct r600_scissor *scissor;
 	int r;
 
-	scissor = malloc(sizeof(struct drm_r600_scissor));
+	scissor = malloc(sizeof(struct r600_scissor));
 	if (scissor == NULL)
 		return -ENOMEM;
-	memcpy(scissor, data, sizeof(struct drm_r600_scissor));
+	memcpy(scissor, data, sizeof(struct r600_scissor));
 	atom->state = scissor;
 	/* PA_SC_VPORT_SCISSOR_0_BR */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2);
@@ -344,13 +344,13 @@ int r600_scissor_create(struct r600_winsys *rdev, struct r600_atom *atom, void *
  */
 int r600_blend_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_blend *blend;
+	struct r600_blend *blend;
 	int r;
 
-	blend = malloc(sizeof(struct drm_r600_blend));
+	blend = malloc(sizeof(struct r600_blend));
 	if (blend == NULL)
 		return -ENOMEM;
-	memcpy(blend, data, sizeof(struct drm_r600_blend));
+	memcpy(blend, data, sizeof(struct r600_blend));
 	atom->state = blend;
 	/* CB_BLEND0_CONTROL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 8);
@@ -375,13 +375,13 @@ int r600_blend_create(struct r600_winsys *rdev, struct r600_atom *atom, void *da
  */
 int r600_constants_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_constants *constants;
+	struct r600_constants *constants;
 	int r;
 
-	constants = malloc(sizeof(struct drm_r600_constants));
+	constants = malloc(sizeof(struct r600_constants));
 	if (constants == NULL)
 		return -ENOMEM;
-	memcpy(constants, data, sizeof(struct drm_r600_constants));
+	memcpy(constants, data, sizeof(struct r600_constants));
 	atom->state = constants;
 	if ((constants->nconstants & 0x3) || (constants->offset & 0x3)) {
 		fprintf(stderr, "invalid offset or number of constants (0x%08X %d)\n",
@@ -404,13 +404,13 @@ int r600_constants_create(struct r600_winsys *rdev, struct r600_atom *atom, void
  */
 int r600_dsa_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_dsa *dsa;
+	struct r600_dsa *dsa;
 	int r;
 
-	dsa = malloc(sizeof(struct drm_r600_dsa));
+	dsa = malloc(sizeof(struct r600_dsa));
 	if (dsa == NULL)
 		return -ENOMEM;
-	memcpy(dsa, data, sizeof(struct drm_r600_dsa));
+	memcpy(dsa, data, sizeof(struct r600_dsa));
 	atom->state = dsa;
 	/* DB_STENCIL_CLEAR */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2);
@@ -464,14 +464,14 @@ int r600_vs_shader_emit(struct r600_winsys *rdev,
 
 int r600_vs_shader_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_vs_shader *vs_shader;
+	struct r600_vs_shader *vs_shader;
 	int r, i, j;
 	u32 tmp;
 
-	vs_shader = malloc(sizeof(struct drm_r600_vs_shader));
+	vs_shader = malloc(sizeof(struct r600_vs_shader));
 	if (vs_shader == NULL)
 		return -ENOMEM;
-	memcpy(vs_shader, data, sizeof(struct drm_r600_vs_shader));
+	memcpy(vs_shader, data, sizeof(struct r600_vs_shader));
 	atom->bo[0] = radeon_bo_lookup(rdev, vs_shader->handle);
 	atom->flags[0] = 0x08000000;
 	if (atom->bo[0] == NULL) {
@@ -539,14 +539,14 @@ int r600_fs_shader_emit(struct r600_winsys *rdev,
 
 int r600_fs_shader_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_fs_shader *fs_shader;
+	struct r600_fs_shader *fs_shader;
 	u32 ninputs;
 	int r, i;
 
-	fs_shader = malloc(sizeof(struct drm_r600_fs_shader));
+	fs_shader = malloc(sizeof(struct r600_fs_shader));
 	if (fs_shader == NULL)
 		return -ENOMEM;
-	memcpy(fs_shader, data, sizeof(struct drm_r600_fs_shader));
+	memcpy(fs_shader, data, sizeof(struct r600_fs_shader));
 	atom->state = fs_shader;
 	atom->bo[0] = radeon_bo_lookup(rdev, fs_shader->handle);
 	atom->flags[0] = 0x08000000;
@@ -592,7 +592,7 @@ int r600_shader_resource_emit(struct r600_winsys *rdev,
 			void *data,
 			struct radeon_ib *ib)
 {
-	struct drm_r600_shader_resource *shader_resource = atom->state;
+	struct r600_shader_resource *shader_resource = atom->state;
 	int i;
 
 	for (i = 0; i < shader_resource->nresource; i++) {
@@ -603,14 +603,14 @@ int r600_shader_resource_emit(struct r600_winsys *rdev,
 
 int r600_shader_resource_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_shader_resource *shader_resource;
+	struct r600_shader_resource *shader_resource;
 	u32 ninputs;
 	int r, i;
 
-	shader_resource = malloc(sizeof(struct drm_r600_shader_resource));
+	shader_resource = malloc(sizeof(struct r600_shader_resource));
 	if (shader_resource == NULL)
 		return -ENOMEM;
-	memcpy(shader_resource, data, sizeof(struct drm_r600_shader_resource));
+	memcpy(shader_resource, data, sizeof(struct r600_shader_resource));
 	atom->state = shader_resource;
 	for (i = 0, atom->nbo = 0; i < shader_resource->nresource; i++, atom->nbo++) {
 		atom->bo[i] = radeon_bo_lookup(rdev, shader_resource->resource[i].handle);
@@ -636,7 +636,7 @@ int r600_shader_resource_create(struct r600_winsys *rdev, struct r600_atom *atom
 	return 0;
 }
 
-int r600_draw_cmd_size(struct drm_r600_batch *batch)
+int r600_draw_cmd_size(struct r600_batch *batch)
 {
 	switch (G_0287F0_SOURCE_SELECT(batch->vgt_draw_initiator)) {
 	case 2:
@@ -646,7 +646,7 @@ int r600_draw_cmd_size(struct drm_r600_batch *batch)
 	}
 }
 
-int r600_draw_cmd_emit(struct radeon_ib *ib, struct drm_r600_batch *batch)
+int r600_draw_cmd_emit(struct radeon_ib *ib, struct r600_batch *batch)
 {
 	u32 pkts[32], i = 0;
 
@@ -685,27 +685,27 @@ struct r600_atom_funcs {
 
 static struct r600_atom_funcs _r600_atom_funcs[] = {
 	{0, 0, NULL, NULL},
-	{R600_ATOM_FRAMEBUFFER, sizeof(struct drm_r600_framebuffer),
+	{R600_ATOM_FRAMEBUFFER, sizeof(struct r600_framebuffer),
 		&r600_framebuffer_create, &r600_framebuffer_emit},
-	{R600_ATOM_RASTERIZER, sizeof(struct drm_r600_rasterizer),
+	{R600_ATOM_RASTERIZER, sizeof(struct r600_rasterizer),
 		&r600_rasterizer_create, &r600_atom_emit_default},
-	{R600_ATOM_CB_CNTL, sizeof(struct drm_r600_cb_cntl),
+	{R600_ATOM_CB_CNTL, sizeof(struct r600_cb_cntl),
 		&r600_cb_cntl_create, &r600_atom_emit_default},
-	{R600_ATOM_VIEWPORT, sizeof(struct drm_r600_viewport),
+	{R600_ATOM_VIEWPORT, sizeof(struct r600_viewport),
 		&r600_viewport_create, &r600_atom_emit_default},
-	{R600_ATOM_SCISSOR, sizeof(struct drm_r600_scissor),
+	{R600_ATOM_SCISSOR, sizeof(struct r600_scissor),
 		&r600_scissor_create, &r600_atom_emit_default},
-	{R600_ATOM_BLEND, sizeof(struct drm_r600_blend),
+	{R600_ATOM_BLEND, sizeof(struct r600_blend),
 		&r600_blend_create, &r600_atom_emit_default},
-	{R600_ATOM_CONSTANTS, sizeof(struct drm_r600_constants),
+	{R600_ATOM_CONSTANTS, sizeof(struct r600_constants),
 		&r600_constants_create, &r600_atom_emit_default},
-	{R600_ATOM_DSA, sizeof(struct drm_r600_dsa),
+	{R600_ATOM_DSA, sizeof(struct r600_dsa),
 		&r600_dsa_create, &r600_atom_emit_default},
-	{R600_ATOM_VS_SHADER, sizeof(struct drm_r600_vs_shader),
+	{R600_ATOM_VS_SHADER, sizeof(struct r600_vs_shader),
 		&r600_vs_shader_create, &r600_vs_shader_emit},
-	{R600_ATOM_FS_SHADER, sizeof(struct drm_r600_fs_shader),
+	{R600_ATOM_FS_SHADER, sizeof(struct r600_fs_shader),
 		&r600_fs_shader_create, &r600_fs_shader_emit},
-	{R600_ATOM_SHADER_RESOURCE, sizeof(struct drm_r600_shader_resource),
+	{R600_ATOM_SHADER_RESOURCE, sizeof(struct r600_shader_resource),
 		&r600_shader_resource_create, &r600_shader_resource_emit},
 };
 
diff --git a/r600_clear.c b/r600_clear.c
index 240f93e..c56bdd4 100644
--- a/r600_clear.c
+++ b/r600_clear.c
@@ -77,8 +77,8 @@ int r600_clear_queue(struct r600_winsys *rw, struct r600_atom *fb,
 			struct r600_clear_data *rclear, unsigned buffers,
 			const float *rgba, float depth, unsigned stencil)
 {
-	struct drm_r600_scissor scissor;
-	struct drm_r600_framebuffer *pfb;
+	struct r600_scissor scissor;
+	struct r600_framebuffer *pfb;
 	struct r600_request rq;
 	int r;
 
@@ -121,16 +121,16 @@ int r600_clear_init(struct r600_winsys *rw,
 			struct radeon_bo_manager *bom,
 			struct r600_clear_data *rclear)
 {
-	struct drm_r600_blend blend;
-	struct drm_r600_framebuffer fb;
-	struct drm_r600_cb_cntl cb_cntl;
-	struct drm_r600_dsa dsa;
-	struct drm_r600_rasterizer rasterizer;
-	struct drm_r600_viewport vport;
-	struct drm_r600_constants vs_constants;
-	struct drm_r600_vs_shader vs_shader;
-	struct drm_r600_fs_shader fs_shader;
-	struct drm_r600_shader_resource vs_resource;
+	struct r600_blend blend;
+	struct r600_framebuffer fb;
+	struct r600_cb_cntl cb_cntl;
+	struct r600_dsa dsa;
+	struct r600_rasterizer rasterizer;
+	struct r600_viewport vport;
+	struct r600_constants vs_constants;
+	struct r600_vs_shader vs_shader;
+	struct r600_fs_shader fs_shader;
+	struct r600_shader_resource vs_resource;
 	struct r600_request rq;
 	struct radeon_bo *vbo = NULL;
 	struct radeon_bo *vs = NULL;
diff --git a/r600_clear.h b/r600_clear.h
index 227551d..bc1fdff 100644
--- a/r600_clear.h
+++ b/r600_clear.h
@@ -29,7 +29,7 @@
 #include "r600_winsys.h"
 
 struct r600_clear_data {
-	struct drm_r600_batch	batch;
+	struct r600_batch	batch;
 };
 
 int r600_clear_queue(struct r600_winsys *rw, struct r600_atom *fb,
diff --git a/r600_scheduler.c b/r600_scheduler.c
index fb02dd0..6114e3a 100644
--- a/r600_scheduler.c
+++ b/r600_scheduler.c
@@ -61,7 +61,7 @@ static void r600_emit_flush(struct r600_winsys *rdev,
 						RADEON_GEM_DOMAIN_GTT);
 }
 
-void r600_atom_flush_add(struct r600_batch *batch, struct radeon_bo *bo, u32 flags)
+void r600_atom_flush_add(struct r600_work *batch, struct radeon_bo *bo, u32 flags)
 {
 	int i;
 
@@ -81,16 +81,16 @@ void r600_atom_flush_add(struct r600_batch *batch, struct radeon_bo *bo, u32 fla
  */
 static void r600_scheduler_clear_locked(struct r600_winsys *rw, struct r600_scheduler *scheduler)
 {
-	struct r600_batch *batch, *n;
+	struct r600_work *batch, *n;
 	int i, j;
 
-	for (i = 0; i < scheduler->nbatch; i++) {
+	for (i = 0; i < scheduler->nwork; i++) {
 		for (j = 0; j < R600_BATCH_NATOMS; j++) {
-			r600_atom_destroy(scheduler->batch[i].atoms[j]);
+			r600_atom_destroy(scheduler->work[i].atoms[j]);
 		}
 	}
 	scheduler->ib->cpkts = 0;
-	scheduler->nbatch = 0;
+	scheduler->nwork = 0;
 	r700_scheduler_states_default(rw, scheduler);
 	scheduler->npkts = scheduler->ib->cpkts;
 }
@@ -100,21 +100,21 @@ int r600_scheduler_flush(struct r600_winsys *rw)
 	struct r600_scheduler *scheduler =  &rw->scheduler;
 	int r, i, j;
 
-	for (i = 0; i < scheduler->nbatch; i++) {
-		for (j = 0; j < scheduler->batch[i].nflush; j++) {
+	for (i = 0; i < scheduler->nwork; i++) {
+		for (j = 0; j < scheduler->work[i].nflush; j++) {
 			r600_emit_flush(rw, scheduler->ib,
-					scheduler->batch[i].flush[j].bo,
-					scheduler->batch[i].flush[j].flags);
+					scheduler->work[i].flush[j].bo,
+					scheduler->work[i].flush[j].flags);
 		}
-		for (j = 0; j < scheduler->batch[i].nemit_atoms; j++) {
-			r = scheduler->batch[i].emit_atoms[j]->emit(rw,
-							scheduler->batch[i].emit_atoms[j],
-							&scheduler->batch[i],
+		for (j = 0; j < scheduler->work[i].nemit_atoms; j++) {
+			r = scheduler->work[i].emit_atoms[j]->emit(rw,
+							scheduler->work[i].emit_atoms[j],
+							&scheduler->work[i],
 							scheduler->ib);
 			if (r)
 				goto out_err;
 		}
-		r = r600_draw_cmd_emit(scheduler->ib, &scheduler->batch[i].drm);
+		r = r600_draw_cmd_emit(scheduler->ib, &scheduler->work[i].drm);
 		/* flush + wait until */
 		scheduler->ib->ptr[scheduler->ib->cpkts++] = PKT3(PKT3_EVENT_WRITE, 0);
 		scheduler->ib->ptr[scheduler->ib->cpkts++] = 0x00000016;
@@ -134,18 +134,18 @@ out_err:
 
 int r600_scheduler_queue(struct r600_winsys *rw, struct r600_request *rq)
 {
-	struct drm_r600_batch *batch = rq->data;
-	struct r600_batch *rbatch;
+	struct r600_batch *batch = rq->data;
+	struct r600_work *rbatch;
 	struct r600_scheduler *scheduler =  &rw->scheduler;
 	int r, i, j;
 
-	if (scheduler->nbatch >= R600_MAX_BATCH) {
+	if (scheduler->nwork >= R600_MAX_WORK) {
 		r = r600_scheduler_flush(rw);
 		if (r)
 			return r;
 	}
-	rbatch = &scheduler->batch[scheduler->nbatch];
-	memset(rbatch, 0, sizeof(struct r600_batch));
+	rbatch = &scheduler->work[scheduler->nwork];
+	memset(rbatch, 0, sizeof(struct r600_work));
 	i = 0;
 	if (batch->blend == NULL || batch->cb_cntl == NULL ||
 		batch->rasterizer == NULL || batch->viewport == NULL ||
@@ -171,7 +171,7 @@ int r600_scheduler_queue(struct r600_winsys *rw, struct r600_request *rq)
 	for (i = 0; i < R600_BATCH_NATOMS; i++) {
 		r600_atom_ref(rbatch->atoms[i]);
 	}
-	memcpy(&rbatch->drm, batch, sizeof(struct drm_r600_batch));
+	memcpy(&rbatch->drm, batch, sizeof(struct r600_batch));
 reprocess:
 	rbatch->nflush = 0;
 	rbatch->npkts = 0;
@@ -212,7 +212,7 @@ reprocess:
 	}
 	printf("batch %d dw scheduler with %d dw\n", rbatch->npkts, scheduler->npkts);
 	scheduler->npkts += rbatch->npkts;
-	scheduler->nbatch++;
+	scheduler->nwork++;
 	return 0;
 out_err:
 	for (i = 0; i < R600_BATCH_NATOMS; i++) {
diff --git a/r600_winsys.h b/r600_winsys.h
index ce60ee7..54bdf83 100644
--- a/r600_winsys.h
+++ b/r600_winsys.h
@@ -49,7 +49,7 @@ struct r600_atom;
 #define R600_ATOM_SHADER_RESOURCE	11
 #define R600_BATCH_NATOMS		12
 
-struct drm_r600_surface {
+struct r600_surface {
 	u32			width;
 	u32			height;
 	u32			color_info;
@@ -61,11 +61,11 @@ struct drm_r600_surface {
 	u32			handle;
 };
 
-struct drm_r600_framebuffer {
+struct r600_framebuffer {
 	u32			width;
 	u32			height;
 	u32			ncb;
-	struct drm_r600_surface	cb[8];
+	struct r600_surface	cb[8];
 	u32			db_offset;
 	u32			db_placements[2];
 	u32			db_handle;
@@ -76,7 +76,7 @@ struct drm_r600_framebuffer {
 	u32			db_prefetch_limit;
 };
 
-struct drm_r600_cb_cntl {
+struct r600_cb_cntl {
 	u32			cb_clrcmp_control;
 	u32			cb_clrcmp_src;
 	u32			cb_clrcmp_dst;
@@ -96,7 +96,7 @@ struct drm_r600_cb_cntl {
 };
 
 /* pa - primitive assembly */
-struct drm_r600_rasterizer {
+struct r600_rasterizer {
 	u32			pa_sc_mpass_ps_cntl;
 	u32			pa_sc_line_cntl;
 	u32			pa_sc_aa_config;
@@ -123,7 +123,7 @@ struct drm_r600_rasterizer {
 };
 
 /* vport - viewport */
-struct drm_r600_viewport {
+struct r600_viewport {
 	u32			pa_cl_vte_cntl;
 	u32			pa_cl_vport_xscale_0;
 	u32			pa_cl_vport_yscale_0;
@@ -134,13 +134,13 @@ struct drm_r600_viewport {
 };
 
 /* pipe_scissor_state */
-struct drm_r600_scissor {
+struct r600_scissor {
 	u32			pa_sc_vport_scissor_0_tl;
 	u32			pa_sc_vport_scissor_0_br;
 };
 
 /* blend - blending */
-struct drm_r600_blend {
+struct r600_blend {
 	u32			cb_blend0_control;
 	u32			cb_blend1_control;
 	u32			cb_blend2_control;
@@ -153,14 +153,14 @@ struct drm_r600_blend {
 };
 
 /* constant */
-struct drm_r600_constants {
+struct r600_constants {
 	u32			offset;
 	u32			nconstants;
 	u32			constants[512];
 };
 
 /* depth, stencil, alpha control */
-struct drm_r600_dsa {
+struct r600_dsa {
 	u32			db_stencil_clear;
 	u32			db_depth_clear;
 	u32			db_stencilrefmask;
@@ -175,7 +175,7 @@ struct drm_r600_dsa {
 };
 
 /* vs_shader - vertex shader */
-struct drm_r600_vs_shader {
+struct r600_vs_shader {
 	u32			sq_pgm_resources_vs;
 	u8			input_semantic[32];
 	u8			input_gpr[32];
@@ -189,7 +189,7 @@ struct drm_r600_vs_shader {
 };
 
 /* fragment shader */
-struct drm_r600_fs_shader {
+struct r600_fs_shader {
 	u32			spi_ps_in_control_0;
 	u32			spi_ps_in_control_1;
 	u32			spi_ps_input_cntl[32];
@@ -200,7 +200,7 @@ struct drm_r600_fs_shader {
 	u32			offset;
 };
 
-struct drm_r600_resource {
+struct r600_resource {
 	u32			handle;
 	u32			resource_id;
 	u32			sq_vtx_constant_word0;
@@ -212,12 +212,12 @@ struct drm_r600_resource {
 	u32			sq_vtx_constant_word6;
 };
 
-struct drm_r600_shader_resource {
+struct r600_shader_resource {
 	u32				nresource;
-	struct drm_r600_resource	resource[32];
+	struct r600_resource	resource[32];
 };
 
-struct drm_r600_batch {
+struct r600_batch {
 	struct r600_atom		*vs_constants;
 	struct r600_atom		*ps_constants;
 	struct r600_atom		*blend;
diff --git a/test.c b/test.c
index fa1f2df..bc72e4d 100644
--- a/test.c
+++ b/test.c
@@ -32,7 +32,7 @@ int main(void)
 {
 	struct radeon radeon;
 	struct r600_winsys *rw;
-	struct drm_r600_framebuffer fb;
+	struct r600_framebuffer fb;
 	struct r600_atom *fbatom;
 	struct r600_request rq;
 	struct r600_clear_data rclear;