35,7 → 35,7 |
#define MIN(a,b) (((a)<(b))?(a):(b)) |
|
int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, |
struct radeon_cs_reloc **cs_reloc); |
struct radeon_bo_list **cs_reloc); |
struct evergreen_cs_track { |
u32 group_size; |
u32 nbanks; |
1094,7 → 1094,7 |
static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) |
{ |
struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track; |
struct radeon_cs_reloc *reloc; |
struct radeon_bo_list *reloc; |
u32 last_reg; |
u32 m, i, tmp, *ib; |
int r; |
1792,7 → 1792,7 |
static int evergreen_packet3_check(struct radeon_cs_parser *p, |
struct radeon_cs_packet *pkt) |
{ |
struct radeon_cs_reloc *reloc; |
struct radeon_bo_list *reloc; |
struct evergreen_cs_track *track; |
volatile u32 *ib; |
unsigned idx; |
2661,7 → 2661,7 |
p->track = NULL; |
return r; |
} |
} while (p->idx < p->chunks[p->chunk_ib_idx].length_dw); |
} while (p->idx < p->chunk_ib->length_dw); |
#if 0 |
for (r = 0; r < p->ib.length_dw; r++) { |
printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); |
2684,8 → 2684,8 |
**/ |
int evergreen_dma_cs_parse(struct radeon_cs_parser *p) |
{ |
struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx]; |
struct radeon_cs_reloc *src_reloc, *dst_reloc, *dst2_reloc; |
struct radeon_cs_chunk *ib_chunk = p->chunk_ib; |
struct radeon_bo_list *src_reloc, *dst_reloc, *dst2_reloc; |
u32 header, cmd, count, sub_cmd; |
volatile u32 *ib = p->ib.ptr; |
u32 idx; |
3100,7 → 3100,7 |
DRM_ERROR("Unknown packet type %d at %d !\n", cmd, idx); |
return -EINVAL; |
} |
} while (p->idx < p->chunks[p->chunk_ib_idx].length_dw); |
} while (p->idx < p->chunk_ib->length_dw); |
#if 0 |
for (r = 0; r < p->ib->length_dw; r++) { |
printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); |