1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h
index 0daf0d76a891..f47cdca1c004 100644
--- a/drivers/gpu/drm/radeon/r100_track.h
+++ b/drivers/gpu/drm/radeon/r100_track.h
@@ -10,26 +10,30 @@
 * CS functions
 */
 struct r100_cs_track_cb {
-        struct radeon_object    *robj;
+        struct radeon_bo        *robj;
        unsigned                pitch;
        unsigned                cpp;
        unsigned                offset;
 };
 struct r100_cs_track_array {
-        struct radeon_object    *robj;
+        struct radeon_bo        *robj;
        unsigned                esize;
 };
 struct r100_cs_cube_info {
-        struct radeon_object    *robj;
+        struct radeon_bo        *robj;
-        unsigned                offset;
+        unsigned                offset;
        unsigned                width;
        unsigned                height;
 };
+#define R100_TRACK_COMP_NONE   0
+#define R100_TRACK_COMP_DXT1   1
+#define R100_TRACK_COMP_DXT35  2
 struct r100_cs_track_texture {
-        struct radeon_object    *robj;
+        struct radeon_bo        *robj;
        struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */
        unsigned                pitch;
        unsigned                width;
@@ -44,6 +48,7 @@ struct r100_cs_track_texture {
        bool                    enabled;
        bool                    roundup_w;
        bool                    roundup_h;
+        unsigned                compress_format;
 };
 struct r100_cs_track_limits {
@@ -59,16 +64,19 @@ struct r100_cs_track {
        unsigned                        maxy;
        unsigned                        vtx_size;
        unsigned                        vap_vf_cntl;
+        unsigned                        vap_alt_nverts;
        unsigned                        immd_dwords;
        unsigned                        num_arrays;
        unsigned                        max_indx;
+        unsigned                        color_channel_mask;
        struct r100_cs_track_array      arrays[11];
        struct r100_cs_track_cb         cb[R300_MAX_CB];
        struct r100_cs_track_cb         zb;
        struct r100_cs_track_texture    textures[R300_TRACK_MAX_TEXTURE];
        bool                            z_enabled;
        bool                            separate_cube;
+        bool                            zb_cb_clear;
+        bool                            blend_read_enable;
 };
 int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track);

diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index 0daf0d76a891..f47cdca1c004 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h
@@ -10,26 +10,30 @@
10	* CS functions	10	* CS functions
11	*/	11	*/
12	struct r100_cs_track_cb {	12	struct r100_cs_track_cb {
13	struct radeon_object *robj;	13	struct radeon_bo *robj;
14	unsigned pitch;	14	unsigned pitch;
15	unsigned cpp;	15	unsigned cpp;
16	unsigned offset;	16	unsigned offset;
17	};	17	};
18		18
19	struct r100_cs_track_array {	19	struct r100_cs_track_array {
20	struct radeon_object *robj;	20	struct radeon_bo *robj;
21	unsigned esize;	21	unsigned esize;
22	};	22	};
23		23
24	struct r100_cs_cube_info {	24	struct r100_cs_cube_info {
25	struct radeon_object *robj;	25	struct radeon_bo *robj;
26	unsigned offset;	26	unsigned offset;
27	unsigned width;	27	unsigned width;
28	unsigned height;	28	unsigned height;
29	};	29	};
30		30
		31	#define R100_TRACK_COMP_NONE 0
		32	#define R100_TRACK_COMP_DXT1 1
		33	#define R100_TRACK_COMP_DXT35 2
		34
31	struct r100_cs_track_texture {	35	struct r100_cs_track_texture {
32	struct radeon_object *robj;	36	struct radeon_bo *robj;
33	struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */	37	struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */
34	unsigned pitch;	38	unsigned pitch;
35	unsigned width;	39	unsigned width;
@@ -44,6 +48,7 @@ struct r100_cs_track_texture {
44	bool enabled;	48	bool enabled;
45	bool roundup_w;	49	bool roundup_w;
46	bool roundup_h;	50	bool roundup_h;
		51	unsigned compress_format;
47	};	52	};
48		53
49	struct r100_cs_track_limits {	54	struct r100_cs_track_limits {
@@ -59,16 +64,19 @@ struct r100_cs_track {
59	unsigned maxy;	64	unsigned maxy;
60	unsigned vtx_size;	65	unsigned vtx_size;
61	unsigned vap_vf_cntl;	66	unsigned vap_vf_cntl;
		67	unsigned vap_alt_nverts;
62	unsigned immd_dwords;	68	unsigned immd_dwords;
63	unsigned num_arrays;	69	unsigned num_arrays;
64	unsigned max_indx;	70	unsigned max_indx;
		71	unsigned color_channel_mask;
65	struct r100_cs_track_array arrays[11];	72	struct r100_cs_track_array arrays[11];
66	struct r100_cs_track_cb cb[R300_MAX_CB];	73	struct r100_cs_track_cb cb[R300_MAX_CB];
67	struct r100_cs_track_cb zb;	74	struct r100_cs_track_cb zb;
68	struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE];	75	struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE];
69	bool z_enabled;	76	bool z_enabled;
70	bool separate_cube;	77	bool separate_cube;
71		78	bool zb_cb_clear;
		79	bool blend_read_enable;
72	};	80	};
73		81
74	int r100_cs_track_check(struct radeon_device rdev, struct r100_cs_track track);	82	int r100_cs_track_check(struct radeon_device rdev, struct r100_cs_track track);