make it look like winsys

1 files changed, 89 insertions, 90 deletions

diff --git a/r600_atom.c b/r600_atom.c
index 3b08600..f5d012f 100644
--- a/r600_atom.c
+++ b/r600_atom.c
@@ -14,15 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include "radeon_device.h"
-#include "r600_winsys.h"
+#include "r600.h"
 #include "r600d.h"
 
 /*
  * r600_cb
  */
-int r600_cb_emit(struct radeon_device *rdev,
-			struct radeon_atom *atom,
+int r600_cb_emit(struct r600_winsys *rdev,
+			struct r600_atom *atom,
 			void *data,
 			struct radeon_ib *ib)
 {
@@ -37,14 +36,14 @@ int r600_cb_emit(struct radeon_device *rdev,
 }
 
 /* FIXME delete */
-void r600_tflat(struct radeon_atom *atom);
-int r600_cb_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+void r600_tflat(struct r600_atom *atom);
+int r600_cb_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_cb *cb;
 	u32 bpe, tmp;
 	int r;
 
-	cb = kmalloc(sizeof(struct drm_r600_cb), GFP_KERNEL);
+	cb = malloc(sizeof(struct drm_r600_cb));
 	if (cb == NULL)
 		return -ENOMEM;
 	memcpy(cb, data, sizeof(struct drm_r600_cb));
@@ -104,7 +103,7 @@ int r600_cb_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d
 		break;
 	case V_0280A0_COLOR_INVALID:
 	default:
-		dev_err(rdev->dev, "%s cb invalid format %d\n", __func__,
+		fprintf(stderr, "%s cb invalid format %d\n", __func__,
 			S_0280A0_FORMAT(cb->color_info));
 		return -EINVAL;
 	}
@@ -112,60 +111,60 @@ int r600_cb_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d
 	case V_0280A0_ARRAY_LINEAR_GENERAL:
 	case V_0280A0_ARRAY_LINEAR_ALIGNED:
 		if ((cb->width) & 0x3f) {
-			dev_err(rdev->dev, "%s:%d cb pitch (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb pitch (%d) invalid\n",
 				__func__, __LINE__, cb->width);
 			return -EINVAL;
 		}
 		if ((cb->width * bpe) & (rdev->group_bytes - 1)) {
-			dev_err(rdev->dev, "%s:%d cb pitch (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb pitch (%d) invalid\n",
 				__func__, __LINE__, cb->width);
 			return -EINVAL;
 		}
 		break;
 	case V_0280A0_ARRAY_1D_TILED_THIN1:
 		if ((cb->width) & 0x7) {
-			dev_err(rdev->dev, "%s:%d cb pitch (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb pitch (%d) invalid\n",
 				__func__, __LINE__, cb->width);
 			return -EINVAL;
 		}
 		if ((cb->width * 8 * bpe * cb->nsamples) & (rdev->group_bytes - 1)) {
-			dev_err(rdev->dev, "%s:%d cb pitch (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb pitch (%d) invalid\n",
 				__func__, __LINE__, cb->width);
 			return -EINVAL;
 		}
 		if (cb->height & 0x7) {
-			dev_err(rdev->dev, "%s:%d cb height (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb height (%d) invalid\n",
 				__func__, __LINE__, cb->height);
 			return -EINVAL;
 		}
 		break;
 	case V_0280A0_ARRAY_2D_TILED_THIN1:
 		if ((cb->width) & ((8 * rdev->nbanks) - 1)) {
-			dev_err(rdev->dev, "%s:%d cb pitch (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb pitch (%d) invalid\n",
 				__func__, __LINE__, cb->width);
 			return -EINVAL;
 		}
 		tmp = cb->width * 8 * bpe * cb->nsamples;
 		tmp = tmp / rdev->nbanks;
 		if (tmp & (rdev->group_bytes - 1)) {
-			dev_err(rdev->dev, "%s:%d cb pitch (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb pitch (%d) invalid\n",
 				__func__, __LINE__, cb->width);
 			return -EINVAL;
 		}
 		if (cb->height & ((8 * rdev->npipes) - 1)) {
-			dev_err(rdev->dev, "%s:%d cb height (%d) invalid\n",
+			fprintf(stderr, "%s:%d cb height (%d) invalid\n",
 				__func__, __LINE__, cb->height);
 			return -EINVAL;
 		}
 		break;
 	default:
-		dev_err(rdev->dev, "%s invalid tiling %d\n", __func__,
+		fprintf(stderr, "%s invalid tiling %d\n", __func__,
 			G_0280A0_ARRAY_MODE(cb->color_info));
 		return -EINVAL;
 	}
 	/* cb require a buffer of at list cb->size */
 	if (radeon_bo_size(atom->bo[0]) < cb->width * cb->height * bpe) {
-		dev_err(rdev->dev, "%s bo too small (%d) need (%d) %d %d %d\n",
+		fprintf(stderr, "%s bo too small (%d) need (%d) %d %d %d\n",
 			__func__, radeon_bo_size(atom->bo[0]),
 			cb->width * cb->height * bpe, cb->width, cb->height, bpe);
 		return -EINVAL;
@@ -232,12 +231,12 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * r600_cb_cntl
  */
-int r600_cb_cntl_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_cb_cntl_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_cb_cntl *cb_cntl;
 	int r;
 
-	cb_cntl = kmalloc(sizeof(struct drm_r600_cb_cntl), GFP_KERNEL);
+	cb_cntl = malloc(sizeof(struct drm_r600_cb_cntl));
 	if (cb_cntl == NULL)
 		return -ENOMEM;
 	memcpy(cb_cntl, data, sizeof(struct drm_r600_cb_cntl));
@@ -285,78 +284,78 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * r600_pa
  */
-int r600_pa_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_rasterizer_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_pa *pa;
+	struct drm_r600_rasterizer *rasterizer;
 	int r;
 
-	pa = kmalloc(sizeof(struct drm_r600_pa), GFP_KERNEL);
-	if (pa == NULL)
+	rasterizer = malloc(sizeof(struct drm_r600_rasterizer));
+	if (rasterizer == NULL)
 		return -ENOMEM;
-	memcpy(pa, data, sizeof(struct drm_r600_pa));
-	atom->state = pa;
+	memcpy(rasterizer, data, sizeof(struct drm_r600_rasterizer));
+	atom->state = rasterizer;
 	/* PA_SC_MPASS_PS_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000292;
-	atom->pkts[atom->npkts++] = pa->pa_sc_mpass_ps_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_sc_mpass_ps_cntl;
 	/* PA_SC_LINE_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000300;
-	atom->pkts[atom->npkts++] = pa->pa_sc_line_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_sc_line_cntl;
 	/* PA_SC_AA_CONFIG */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000301;
-	atom->pkts[atom->npkts++] = pa->pa_sc_aa_config;
+	atom->pkts[atom->npkts++] = rasterizer->pa_sc_aa_config;
 	/* PA_SC_AA_SAMPLE_LOCS_MCTX */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000307;
-	atom->pkts[atom->npkts++] = pa->pa_sc_aa_sample_locs_mctx;
+	atom->pkts[atom->npkts++] = rasterizer->pa_sc_aa_sample_locs_mctx;
 	/* PA_SC_AA_MASK */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000312;
-	atom->pkts[atom->npkts++] = pa->pa_sc_aa_mask;
+	atom->pkts[atom->npkts++] = rasterizer->pa_sc_aa_mask;
 	/* PA_CL_CLIP_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000204;
-	atom->pkts[atom->npkts++] = pa->pa_cl_clip_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_clip_cntl;
 	/* PA_CL_VS_OUT_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000207;
-	atom->pkts[atom->npkts++] = pa->pa_cl_vs_out_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_vs_out_cntl;
 	/* PA_CL_NANINF_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000208;
-	atom->pkts[atom->npkts++] = pa->pa_cl_naninf_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_naninf_cntl;
 	/* PA_CL_GB_VERT_CLIP_ADJ */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 4);
 	atom->pkts[atom->npkts++] = 0x00000303;
-	atom->pkts[atom->npkts++] = pa->pa_cl_gb_vert_clip_adj;
-	atom->pkts[atom->npkts++] = pa->pa_cl_gb_vert_disc_adj;
-	atom->pkts[atom->npkts++] = pa->pa_cl_gb_horz_clip_adj;
-	atom->pkts[atom->npkts++] = pa->pa_cl_gb_horz_disc_adj;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_gb_vert_clip_adj;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_gb_vert_disc_adj;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_gb_horz_clip_adj;
+	atom->pkts[atom->npkts++] = rasterizer->pa_cl_gb_horz_disc_adj;
 	/* PA_SU_SC_MODE_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000205;
-	atom->pkts[atom->npkts++] = pa->pa_su_sc_mode_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_sc_mode_cntl;
 	/* PA_SU_POINT_SIZE */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 4);
 	atom->pkts[atom->npkts++] = 0x00000280;
-	atom->pkts[atom->npkts++] = pa->pa_su_point_size;
-	atom->pkts[atom->npkts++] = pa->pa_su_point_minmax;
-	atom->pkts[atom->npkts++] = pa->pa_su_line_cntl;
-	atom->pkts[atom->npkts++] = pa->pa_sc_line_stipple;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_point_size;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_point_minmax;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_line_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_sc_line_stipple;
 	/* PA_SU_POLY_OFFSET_DB_FMT_CNTL */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2);
 	atom->pkts[atom->npkts++] = 0x0000037E;
-	atom->pkts[atom->npkts++] = pa->pa_su_poly_offset_db_fmt_cntl;
-	atom->pkts[atom->npkts++] = pa->pa_su_poly_offset_clamp;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_poly_offset_db_fmt_cntl;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_poly_offset_clamp;
 	/* PA_SU_POLY_OFFSET_FRONT_SCALE */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 4);
 	atom->pkts[atom->npkts++] = 0x00000380;
-	atom->pkts[atom->npkts++] = pa->pa_su_poly_offset_front_scale;
-	atom->pkts[atom->npkts++] = pa->pa_su_poly_offset_front_offset;
-	atom->pkts[atom->npkts++] = pa->pa_su_poly_offset_back_scale;
-	atom->pkts[atom->npkts++] = pa->pa_su_poly_offset_back_offset;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_poly_offset_front_scale;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_poly_offset_front_offset;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_poly_offset_back_scale;
+	atom->pkts[atom->npkts++] = rasterizer->pa_su_poly_offset_back_offset;
 fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 	return 0;
 }
@@ -364,12 +363,12 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * pipe_viewport_state
  */
-int r600_viewport_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_viewport_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_viewport *vport;
 	int r;
 
-	vport = kmalloc(sizeof(struct drm_r600_viewport), GFP_KERNEL);
+	vport = malloc(sizeof(struct drm_r600_viewport));
 	if (vport == NULL)
 		return -ENOMEM;
 	memcpy(vport, data, sizeof(struct drm_r600_viewport));
@@ -394,12 +393,12 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * pipe_scissor_state
  */
-int r600_scissor_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_scissor_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_scissor *scissor;
 	int r;
 
-	scissor = kmalloc(sizeof(struct drm_r600_scissor), GFP_KERNEL);
+	scissor = malloc(sizeof(struct drm_r600_scissor));
 	if (scissor == NULL)
 		return -ENOMEM;
 	memcpy(scissor, data, sizeof(struct drm_r600_scissor));
@@ -415,12 +414,12 @@ int r600_scissor_create(struct radeon_device *rdev, struct radeon_atom *atom, vo
 /*
  * r600_blend
  */
-int r600_blend_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_blend_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_blend *blend;
 	int r;
 
-	blend = kmalloc(sizeof(struct drm_r600_blend), GFP_KERNEL);
+	blend = malloc(sizeof(struct drm_r600_blend));
 	if (blend == NULL)
 		return -ENOMEM;
 	memcpy(blend, data, sizeof(struct drm_r600_blend));
@@ -447,18 +446,18 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * r600_constant
  */
-int r600_constants_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_constants_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_constants *constants;
 	int r;
 
-	constants = kmalloc(sizeof(struct drm_r600_constants), GFP_KERNEL);
+	constants = malloc(sizeof(struct drm_r600_constants));
 	if (constants == NULL)
 		return -ENOMEM;
 	memcpy(constants, data, sizeof(struct drm_r600_constants));
 	atom->state = constants;
 	if ((constants->nconstants & 0x3) || (constants->offset & 0x3)) {
-		dev_err(rdev->dev, "invalid offset or number of constants (0x%08X %d)\n",
+		fprintf(stderr, "invalid offset or number of constants (0x%08X %d)\n",
 			constants->offset, constants->nconstants);
 			return -EINVAL;
 	}
@@ -475,8 +474,8 @@ int r600_constants_create(struct radeon_device *rdev, struct radeon_atom *atom,
 /*
  * r600_db
  */
-int r600_db_emit(struct radeon_device *rdev,
-			struct radeon_atom *atom,
+int r600_db_emit(struct r600_winsys *rdev,
+			struct r600_atom *atom,
 			void *data,
 			struct radeon_ib *ib)
 {
@@ -490,14 +489,14 @@ int r600_db_emit(struct radeon_device *rdev,
 	return r;
 }
 
-int r600_db_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_db_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_db *db;
 	u32 nslices, ntiles_per_slice, ntiles, bpe;
 	int has_s;
 	int r;
 
-	db = kmalloc(sizeof(struct drm_r600_db), GFP_KERNEL);
+	db = malloc(sizeof(struct drm_r600_db));
 	if (db == NULL)
 		return -ENOMEM;
 	memcpy(db, data, sizeof(struct drm_r600_db));
@@ -536,7 +535,7 @@ int r600_db_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d
 		break;
 	case V_028010_DEPTH_INVALID:
 	default:
-		dev_err(rdev->dev, "invalid db format %d\n", G_028010_FORMAT(db->db_depth_info));
+		fprintf(stderr, "invalid db format %d\n", G_028010_FORMAT(db->db_depth_info));
 		return -EINVAL;
 		break;
 	}
@@ -544,17 +543,17 @@ int r600_db_create(struct radeon_device *rdev, struct radeon_atom *atom, void *d
 	ntiles_per_slice = G_028000_SLICE_TILE_MAX(db->db_depth_size) + 1;
 	ntiles = nslices * ntiles_per_slice;
 	if ((ntiles * 64 * bpe) > radeon_bo_size(atom->bo[0])) {
-		dev_err(rdev->dev, "db buffer too small %d need %d (%d %d)\n",
+		fprintf(stderr, "db buffer too small %d need %d (%d %d)\n",
 			radeon_bo_size(atom->bo[0]), ntiles * 64 * bpe,
 			nslices, ntiles_per_slice);
 		return -EINVAL;
 	}
 	if (db->hz_handle) {
-		dev_err(rdev->dev, "we don't know how to compute hiz buffer size\n");
+		fprintf(stderr, "we don't know how to compute hiz buffer size\n");
 		return -EINVAL;
 	}
 	if (!db->hz_handle && G_028010_TILE_SURFACE_ENABLE(db->db_depth_info)) {
-		dev_err(rdev->dev, "hyperz enabled but no buffer supplied\n");
+		fprintf(stderr, "hyperz enabled but no buffer supplied\n");
 		return -EINVAL;
 	}
 	/* R_02800C_DB_DEPTH_BASE */
@@ -597,12 +596,12 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * r600_db_cntl
  */
-int r600_db_cntl_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_db_cntl_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_db_cntl *db_cntl;
 	int r;
 
-	db_cntl = kmalloc(sizeof(struct drm_r600_db_cntl), GFP_KERNEL);
+	db_cntl = malloc(sizeof(struct drm_r600_db_cntl));
 	if (db_cntl == NULL)
 		return -ENOMEM;
 	memcpy(db_cntl, data, sizeof(struct drm_r600_db_cntl));
@@ -646,8 +645,8 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 /*
  * r600_vs_shader
  */
-int r600_vs_shader_emit(struct radeon_device *rdev,
-			struct radeon_atom *atom,
+int r600_vs_shader_emit(struct r600_winsys *rdev,
+			struct r600_atom *atom,
 			void *data,
 			struct radeon_ib *ib)
 {
@@ -658,13 +657,13 @@ int r600_vs_shader_emit(struct radeon_device *rdev,
 	return r;
 }
 
-int r600_vs_shader_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_vs_shader_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
 	struct drm_r600_vs_shader *vs_shader;
 	int r, i, j;
 	u32 tmp;
 
-	vs_shader = kmalloc(sizeof(struct drm_r600_vs_shader), GFP_KERNEL);
+	vs_shader = malloc(sizeof(struct drm_r600_vs_shader));
 	if (vs_shader == NULL)
 		return -ENOMEM;
 	memcpy(vs_shader, data, sizeof(struct drm_r600_vs_shader));
@@ -721,10 +720,10 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 }
 
 /*
- * r600_ps_shader
+ * r600_fs_shader
  */
-int r600_ps_shader_emit(struct radeon_device *rdev,
-			struct radeon_atom *atom,
+int r600_fs_shader_emit(struct r600_winsys *rdev,
+			struct r600_atom *atom,
 			void *data,
 			struct radeon_ib *ib)
 {
@@ -735,18 +734,18 @@ int r600_ps_shader_emit(struct radeon_device *rdev,
 	return r;
 }
 
-int r600_ps_shader_create(struct radeon_device *rdev, struct radeon_atom *atom, void *data)
+int r600_fs_shader_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data)
 {
-	struct drm_r600_ps_shader *ps_shader;
+	struct drm_r600_fs_shader *fs_shader;
 	u32 ninputs;
 	int r, i;
 
-	ps_shader = kmalloc(sizeof(struct drm_r600_ps_shader), GFP_KERNEL);
-	if (ps_shader == NULL)
+	fs_shader = malloc(sizeof(struct drm_r600_fs_shader));
+	if (fs_shader == NULL)
 		return -ENOMEM;
-	memcpy(ps_shader, data, sizeof(struct drm_r600_ps_shader));
-	atom->state = ps_shader;
-	atom->bo[0] = radeon_bo_lookup(rdev, ps_shader->handle);
+	memcpy(fs_shader, data, sizeof(struct drm_r600_fs_shader));
+	atom->state = fs_shader;
+	atom->bo[0] = radeon_bo_lookup(rdev, fs_shader->handle);
 	atom->flags[0] = 0x08000000;
 	if (atom->bo[0] == NULL) {
 		return -EINVAL;
@@ -756,29 +755,29 @@ int r600_ps_shader_create(struct radeon_device *rdev, struct radeon_atom *atom,
 	/* SQ_PGM_START_PS */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000210;
-	atom->pkts[atom->npkts++] = ps_shader->offset;
+	atom->pkts[atom->npkts++] = fs_shader->offset;
 	atom->pkts[atom->npkts++] = PKT3(PKT3_NOP, 0);
 	atom->pkts[atom->npkts++] = 0x00000000;
 	/* SQ_PGM_RESOURCES_PS */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2);
 	atom->pkts[atom->npkts++] = 0x00000214;
-	atom->pkts[atom->npkts++] = ps_shader->sq_pgm_resources_ps;
-	atom->pkts[atom->npkts++] = ps_shader->sq_pgm_exports_ps;
+	atom->pkts[atom->npkts++] = fs_shader->sq_pgm_resources_ps;
+	atom->pkts[atom->npkts++] = fs_shader->sq_pgm_exports_ps;
 	/* SQ_PGM_CF_OFFSET_PS */
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1);
 	atom->pkts[atom->npkts++] = 0x00000233;
 	atom->pkts[atom->npkts++] = 0;
 	/* setup pixel shader input */
-	ninputs = G_0286CC_NUM_INTERP(ps_shader->spi_ps_in_control_0) + 1;
+	ninputs = G_0286CC_NUM_INTERP(fs_shader->spi_ps_in_control_0) + 1;
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, ninputs);
 	atom->pkts[atom->npkts++] = 0x00000191;
 	for (i = 0; i < ninputs; i++) {
-		atom->pkts[atom->npkts++] = ps_shader->spi_ps_input_cntl[i];
+		atom->pkts[atom->npkts++] = fs_shader->spi_ps_input_cntl[i];
 	}
 	atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2);
 	atom->pkts[atom->npkts++] = 0x000001B3;
-	atom->pkts[atom->npkts++] = ps_shader->spi_ps_in_control_0;
-	atom->pkts[atom->npkts++] = ps_shader->spi_ps_in_control_1;
+	atom->pkts[atom->npkts++] = fs_shader->spi_ps_in_control_0;
+	atom->pkts[atom->npkts++] = fs_shader->spi_ps_in_control_1;
 fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 	return 0;
 }
@@ -794,7 +793,7 @@ fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts);
 		}\
 		WPKT(0x00000000);\
 	} while (0)
-void r600_tflat(struct radeon_atom *atom)
+void r600_tflat(struct r600_atom *atom)
 {
     WPKT(PKT3(PKT3_SET_CONTEXT_REG, 2));
     WPKT(0x00000094);