aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index b53b31a7b76f..74f06d540591 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1254,7 +1254,7 @@ int r100_reloc_pitch_offset(struct radeon_cs_parser *p,
1254 int r; 1254 int r;
1255 u32 tile_flags = 0; 1255 u32 tile_flags = 0;
1256 u32 tmp; 1256 u32 tmp;
1257 struct radeon_cs_reloc *reloc; 1257 struct radeon_bo_list *reloc;
1258 u32 value; 1258 u32 value;
1259 1259
1260 r = radeon_cs_packet_next_reloc(p, &reloc, 0); 1260 r = radeon_cs_packet_next_reloc(p, &reloc, 0);
@@ -1293,7 +1293,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p,
1293 int idx) 1293 int idx)
1294{ 1294{
1295 unsigned c, i; 1295 unsigned c, i;
1296 struct radeon_cs_reloc *reloc; 1296 struct radeon_bo_list *reloc;
1297 struct r100_cs_track *track; 1297 struct r100_cs_track *track;
1298 int r = 0; 1298 int r = 0;
1299 volatile uint32_t *ib; 1299 volatile uint32_t *ib;
@@ -1542,7 +1542,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
1542 struct radeon_cs_packet *pkt, 1542 struct radeon_cs_packet *pkt,
1543 unsigned idx, unsigned reg) 1543 unsigned idx, unsigned reg)
1544{ 1544{
1545 struct radeon_cs_reloc *reloc; 1545 struct radeon_bo_list *reloc;
1546 struct r100_cs_track *track; 1546 struct r100_cs_track *track;
1547 volatile uint32_t *ib; 1547 volatile uint32_t *ib;
1548 uint32_t tmp; 1548 uint32_t tmp;
@@ -1901,7 +1901,7 @@ int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p,
1901static int r100_packet3_check(struct radeon_cs_parser *p, 1901static int r100_packet3_check(struct radeon_cs_parser *p,
1902 struct radeon_cs_packet *pkt) 1902 struct radeon_cs_packet *pkt)
1903{ 1903{
1904 struct radeon_cs_reloc *reloc; 1904 struct radeon_bo_list *reloc;
1905 struct r100_cs_track *track; 1905 struct r100_cs_track *track;
1906 unsigned idx; 1906 unsigned idx;
1907 volatile uint32_t *ib; 1907 volatile uint32_t *ib;
@@ -2061,7 +2061,7 @@ int r100_cs_parse(struct radeon_cs_parser *p)
2061 } 2061 }
2062 if (r) 2062 if (r)
2063 return r; 2063 return r;
2064 } while (p->idx < p->chunks[p->chunk_ib_idx].length_dw); 2064 } while (p->idx < p->chunk_ib->length_dw);
2065 return 0; 2065 return 0;
2066} 2066}
2067 2067