diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_cs.c')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 5c8b358f9fba..a1dece6f9b9e 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #define MIN(a,b) (((a)<(b))?(a):(b)) | 35 | #define MIN(a,b) (((a)<(b))?(a):(b)) |
36 | 36 | ||
37 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, | 37 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, |
38 | struct radeon_cs_reloc **cs_reloc); | 38 | struct radeon_bo_list **cs_reloc); |
39 | struct evergreen_cs_track { | 39 | struct evergreen_cs_track { |
40 | u32 group_size; | 40 | u32 group_size; |
41 | u32 nbanks; | 41 | u32 nbanks; |
@@ -1094,7 +1094,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p, | |||
1094 | static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) | 1094 | static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) |
1095 | { | 1095 | { |
1096 | struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track; | 1096 | struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track; |
1097 | struct radeon_cs_reloc *reloc; | 1097 | struct radeon_bo_list *reloc; |
1098 | u32 last_reg; | 1098 | u32 last_reg; |
1099 | u32 m, i, tmp, *ib; | 1099 | u32 m, i, tmp, *ib; |
1100 | int r; | 1100 | int r; |
@@ -1792,7 +1792,7 @@ static bool evergreen_is_safe_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) | |||
1792 | static int evergreen_packet3_check(struct radeon_cs_parser *p, | 1792 | static int evergreen_packet3_check(struct radeon_cs_parser *p, |
1793 | struct radeon_cs_packet *pkt) | 1793 | struct radeon_cs_packet *pkt) |
1794 | { | 1794 | { |
1795 | struct radeon_cs_reloc *reloc; | 1795 | struct radeon_bo_list *reloc; |
1796 | struct evergreen_cs_track *track; | 1796 | struct evergreen_cs_track *track; |
1797 | volatile u32 *ib; | 1797 | volatile u32 *ib; |
1798 | unsigned idx; | 1798 | unsigned idx; |
@@ -2685,7 +2685,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) | |||
2685 | int evergreen_dma_cs_parse(struct radeon_cs_parser *p) | 2685 | int evergreen_dma_cs_parse(struct radeon_cs_parser *p) |
2686 | { | 2686 | { |
2687 | struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx]; | 2687 | struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx]; |
2688 | struct radeon_cs_reloc *src_reloc, *dst_reloc, *dst2_reloc; | 2688 | struct radeon_bo_list *src_reloc, *dst_reloc, *dst2_reloc; |
2689 | u32 header, cmd, count, sub_cmd; | 2689 | u32 header, cmd, count, sub_cmd; |
2690 | volatile u32 *ib = p->ib.ptr; | 2690 | volatile u32 *ib = p->ib.ptr; |
2691 | u32 idx; | 2691 | u32 idx; |