aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2011-10-13 19:08:44 -0400
committerDave Airlie <airlied@redhat.com>2011-10-18 04:44:45 -0400
commit6a2f371d718b76669dea772d32e6d4703f7eb0e4 (patch)
tree7e54ea190fdc0a60da8881143d119e40b6fca877
parent74740c8324fdcb35f7dfca89075779528ff98827 (diff)
drm/radeon: Remove now unused functions in radeon driver
With the dropped inlines gccs starts warning about genuinely unused functions. Remove r600_bpe_from_format, evergreen_cs_track_validate_cb, evergreen-cs_packet_next_is_pkt3_nop which are all unused. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/evergreen_cs.c28
-rw-r--r--drivers/gpu/drm/radeon/r600_cs.c19
2 files changed, 0 insertions, 47 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 35dce993c8f8..7fdfa8ea7570 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -122,12 +122,6 @@ static void evergreen_cs_track_init(struct evergreen_cs_track *track)
122 track->db_s_write_bo = NULL; 122 track->db_s_write_bo = NULL;
123} 123}
124 124
125static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
126{
127 /* XXX fill in */
128 return 0;
129}
130
131static int evergreen_cs_track_check(struct radeon_cs_parser *p) 125static int evergreen_cs_track_check(struct radeon_cs_parser *p)
132{ 126{
133 struct evergreen_cs_track *track = p->track; 127 struct evergreen_cs_track *track = p->track;
@@ -236,28 +230,6 @@ static int evergreen_cs_packet_next_reloc(struct radeon_cs_parser *p,
236} 230}
237 231
238/** 232/**
239 * evergreen_cs_packet_next_is_pkt3_nop() - test if next packet is packet3 nop for reloc
240 * @parser: parser structure holding parsing context.
241 *
242 * Check next packet is relocation packet3, do bo validation and compute
243 * GPU offset using the provided start.
244 **/
245static int evergreen_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p)
246{
247 struct radeon_cs_packet p3reloc;
248 int r;
249
250 r = evergreen_cs_packet_parse(p, &p3reloc, p->idx);
251 if (r) {
252 return 0;
253 }
254 if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) {
255 return 0;
256 }
257 return 1;
258}
259
260/**
261 * evergreen_cs_packet_next_vline() - parse userspace VLINE packet 233 * evergreen_cs_packet_next_vline() - parse userspace VLINE packet
262 * @parser: parser structure holding parsing context. 234 * @parser: parser structure holding parsing context.
263 * 235 *
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 7339c0bd9562..0a2e023c1557 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -223,25 +223,6 @@ static int fmt_get_nblocksy(u32 format, u32 h)
223 return (h + bh - 1) / bh; 223 return (h + bh - 1) / bh;
224} 224}
225 225
226static int r600_bpe_from_format(u32 *bpe, u32 format)
227{
228 unsigned res;
229
230 if (format >= ARRAY_SIZE(color_formats_table))
231 goto fail;
232
233 res = color_formats_table[format].blocksize;
234 if (res == 0)
235 goto fail;
236
237 *bpe = res;
238 return 0;
239
240fail:
241 *bpe = 16;
242 return -EINVAL;
243}
244
245struct array_mode_checker { 226struct array_mode_checker {
246 int array_mode; 227 int array_mode;
247 u32 group_size; 228 u32 group_size;