Commit 1d0c0942 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/radeon: rename radeon_cs_reloc to radeon_bo_list

Better match what it is actually doing.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fc003bd4
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define MIN(a,b) (((a)<(b))?(a):(b)) #define MIN(a,b) (((a)<(b))?(a):(b))
int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, 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 { struct evergreen_cs_track {
u32 group_size; u32 group_size;
u32 nbanks; u32 nbanks;
...@@ -1094,7 +1094,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p, ...@@ -1094,7 +1094,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p,
static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) 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 evergreen_cs_track *track = (struct evergreen_cs_track *)p->track;
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
u32 last_reg; u32 last_reg;
u32 m, i, tmp, *ib; u32 m, i, tmp, *ib;
int r; int r;
...@@ -1792,7 +1792,7 @@ static bool evergreen_is_safe_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) ...@@ -1792,7 +1792,7 @@ static bool evergreen_is_safe_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
static int evergreen_packet3_check(struct radeon_cs_parser *p, static int evergreen_packet3_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt) struct radeon_cs_packet *pkt)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct evergreen_cs_track *track; struct evergreen_cs_track *track;
volatile u32 *ib; volatile u32 *ib;
unsigned idx; unsigned idx;
...@@ -2685,7 +2685,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) ...@@ -2685,7 +2685,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p)
int evergreen_dma_cs_parse(struct radeon_cs_parser *p) 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_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx];
struct radeon_cs_reloc *src_reloc, *dst_reloc, *dst2_reloc; struct radeon_bo_list *src_reloc, *dst_reloc, *dst2_reloc;
u32 header, cmd, count, sub_cmd; u32 header, cmd, count, sub_cmd;
volatile u32 *ib = p->ib.ptr; volatile u32 *ib = p->ib.ptr;
u32 idx; u32 idx;
......
...@@ -1254,7 +1254,7 @@ int r100_reloc_pitch_offset(struct radeon_cs_parser *p, ...@@ -1254,7 +1254,7 @@ int r100_reloc_pitch_offset(struct radeon_cs_parser *p,
int r; int r;
u32 tile_flags = 0; u32 tile_flags = 0;
u32 tmp; u32 tmp;
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
u32 value; u32 value;
r = radeon_cs_packet_next_reloc(p, &reloc, 0); r = radeon_cs_packet_next_reloc(p, &reloc, 0);
...@@ -1293,7 +1293,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, ...@@ -1293,7 +1293,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p,
int idx) int idx)
{ {
unsigned c, i; unsigned c, i;
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r100_cs_track *track; struct r100_cs_track *track;
int r = 0; int r = 0;
volatile uint32_t *ib; volatile uint32_t *ib;
...@@ -1542,7 +1542,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, ...@@ -1542,7 +1542,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt, struct radeon_cs_packet *pkt,
unsigned idx, unsigned reg) unsigned idx, unsigned reg)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r100_cs_track *track; struct r100_cs_track *track;
volatile uint32_t *ib; volatile uint32_t *ib;
uint32_t tmp; uint32_t tmp;
...@@ -1901,7 +1901,7 @@ int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, ...@@ -1901,7 +1901,7 @@ int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p,
static int r100_packet3_check(struct radeon_cs_parser *p, static int r100_packet3_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt) struct radeon_cs_packet *pkt)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r100_cs_track *track; struct r100_cs_track *track;
unsigned idx; unsigned idx;
volatile uint32_t *ib; volatile uint32_t *ib;
......
...@@ -146,7 +146,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, ...@@ -146,7 +146,7 @@ int r200_packet0_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt, struct radeon_cs_packet *pkt,
unsigned idx, unsigned reg) unsigned idx, unsigned reg)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r100_cs_track *track; struct r100_cs_track *track;
volatile uint32_t *ib; volatile uint32_t *ib;
uint32_t tmp; uint32_t tmp;
......
...@@ -598,7 +598,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, ...@@ -598,7 +598,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt, struct radeon_cs_packet *pkt,
unsigned idx, unsigned reg) unsigned idx, unsigned reg)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r100_cs_track *track; struct r100_cs_track *track;
volatile uint32_t *ib; volatile uint32_t *ib;
uint32_t tmp, tile_flags = 0; uint32_t tmp, tile_flags = 0;
...@@ -1142,7 +1142,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, ...@@ -1142,7 +1142,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
static int r300_packet3_check(struct radeon_cs_parser *p, static int r300_packet3_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt) struct radeon_cs_packet *pkt)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r100_cs_track *track; struct r100_cs_track *track;
volatile uint32_t *ib; volatile uint32_t *ib;
unsigned idx; unsigned idx;
......
...@@ -969,7 +969,7 @@ static int r600_cs_parse_packet0(struct radeon_cs_parser *p, ...@@ -969,7 +969,7 @@ static int r600_cs_parse_packet0(struct radeon_cs_parser *p,
static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
{ {
struct r600_cs_track *track = (struct r600_cs_track *)p->track; struct r600_cs_track *track = (struct r600_cs_track *)p->track;
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
u32 m, i, tmp, *ib; u32 m, i, tmp, *ib;
int r; int r;
...@@ -1626,7 +1626,7 @@ static bool r600_is_safe_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) ...@@ -1626,7 +1626,7 @@ static bool r600_is_safe_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
static int r600_packet3_check(struct radeon_cs_parser *p, static int r600_packet3_check(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt) struct radeon_cs_packet *pkt)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
struct r600_cs_track *track; struct r600_cs_track *track;
volatile u32 *ib; volatile u32 *ib;
unsigned idx; unsigned idx;
...@@ -2354,7 +2354,7 @@ static int r600_cs_parser_relocs_legacy(struct radeon_cs_parser *p) ...@@ -2354,7 +2354,7 @@ static int r600_cs_parser_relocs_legacy(struct radeon_cs_parser *p)
if (p->chunk_relocs_idx == -1) { if (p->chunk_relocs_idx == -1) {
return 0; return 0;
} }
p->relocs = kzalloc(sizeof(struct radeon_cs_reloc), GFP_KERNEL); p->relocs = kzalloc(sizeof(struct radeon_bo_list), GFP_KERNEL);
if (p->relocs == NULL) { if (p->relocs == NULL) {
return -ENOMEM; return -ENOMEM;
} }
...@@ -2435,7 +2435,7 @@ void r600_cs_legacy_init(void) ...@@ -2435,7 +2435,7 @@ void r600_cs_legacy_init(void)
* GPU offset using the provided start. * GPU offset using the provided start.
**/ **/
int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, int r600_dma_cs_next_reloc(struct radeon_cs_parser *p,
struct radeon_cs_reloc **cs_reloc) struct radeon_bo_list **cs_reloc)
{ {
struct radeon_cs_chunk *relocs_chunk; struct radeon_cs_chunk *relocs_chunk;
unsigned idx; unsigned idx;
...@@ -2473,7 +2473,7 @@ int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, ...@@ -2473,7 +2473,7 @@ int r600_dma_cs_next_reloc(struct radeon_cs_parser *p,
int r600_dma_cs_parse(struct radeon_cs_parser *p) int r600_dma_cs_parse(struct radeon_cs_parser *p)
{ {
struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx]; struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx];
struct radeon_cs_reloc *src_reloc, *dst_reloc; struct radeon_bo_list *src_reloc, *dst_reloc;
u32 header, cmd, count, tiled; u32 header, cmd, count, tiled;
volatile u32 *ib = p->ib.ptr; volatile u32 *ib = p->ib.ptr;
u32 idx, idx_value; u32 idx, idx_value;
......
...@@ -450,6 +450,15 @@ struct radeon_mman { ...@@ -450,6 +450,15 @@ struct radeon_mman {
#endif #endif
}; };
struct radeon_bo_list {
struct radeon_bo *robj;
struct ttm_validate_buffer tv;
uint64_t gpu_offset;
unsigned prefered_domains;
unsigned allowed_domains;
uint32_t tiling_flags;
};
/* bo virtual address in a specific vm */ /* bo virtual address in a specific vm */
struct radeon_bo_va { struct radeon_bo_va {
/* protected by bo being reserved */ /* protected by bo being reserved */
...@@ -1044,15 +1053,6 @@ void cayman_dma_fini(struct radeon_device *rdev); ...@@ -1044,15 +1053,6 @@ void cayman_dma_fini(struct radeon_device *rdev);
/* /*
* CS. * CS.
*/ */
struct radeon_cs_reloc {
struct radeon_bo *robj;
struct ttm_validate_buffer tv;
uint64_t gpu_offset;
unsigned prefered_domains;
unsigned allowed_domains;
uint32_t tiling_flags;
};
struct radeon_cs_chunk { struct radeon_cs_chunk {
uint32_t chunk_id; uint32_t chunk_id;
uint32_t length_dw; uint32_t length_dw;
...@@ -1072,9 +1072,9 @@ struct radeon_cs_parser { ...@@ -1072,9 +1072,9 @@ struct radeon_cs_parser {
unsigned idx; unsigned idx;
/* relocations */ /* relocations */
unsigned nrelocs; unsigned nrelocs;
struct radeon_cs_reloc *relocs; struct radeon_bo_list *relocs;
struct radeon_cs_reloc **relocs_ptr; struct radeon_bo_list **relocs_ptr;
struct radeon_cs_reloc *vm_bos; struct radeon_bo_list *vm_bos;
struct list_head validated; struct list_head validated;
unsigned dma_reloc_idx; unsigned dma_reloc_idx;
/* indices of various chunks */ /* indices of various chunks */
...@@ -2973,7 +2973,7 @@ int radeon_vm_manager_init(struct radeon_device *rdev); ...@@ -2973,7 +2973,7 @@ int radeon_vm_manager_init(struct radeon_device *rdev);
void radeon_vm_manager_fini(struct radeon_device *rdev); void radeon_vm_manager_fini(struct radeon_device *rdev);
int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm); int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm);
void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm); void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm);
struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev, struct radeon_bo_list *radeon_vm_get_bos(struct radeon_device *rdev,
struct radeon_vm *vm, struct radeon_vm *vm,
struct list_head *head); struct list_head *head);
struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev, struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev,
...@@ -3087,7 +3087,7 @@ bool radeon_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p); ...@@ -3087,7 +3087,7 @@ bool radeon_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p);
void radeon_cs_dump_packet(struct radeon_cs_parser *p, void radeon_cs_dump_packet(struct radeon_cs_parser *p,
struct radeon_cs_packet *pkt); struct radeon_cs_packet *pkt);
int radeon_cs_packet_next_reloc(struct radeon_cs_parser *p, int radeon_cs_packet_next_reloc(struct radeon_cs_parser *p,
struct radeon_cs_reloc **cs_reloc, struct radeon_bo_list **cs_reloc,
int nomm); int nomm);
int r600_cs_common_vline_parse(struct radeon_cs_parser *p, int r600_cs_common_vline_parse(struct radeon_cs_parser *p,
uint32_t *vline_start_end, uint32_t *vline_start_end,
......
...@@ -92,7 +92,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) ...@@ -92,7 +92,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
if (p->relocs_ptr == NULL) { if (p->relocs_ptr == NULL) {
return -ENOMEM; return -ENOMEM;
} }
p->relocs = kcalloc(p->nrelocs, sizeof(struct radeon_cs_reloc), GFP_KERNEL); p->relocs = kcalloc(p->nrelocs, sizeof(struct radeon_bo_list), GFP_KERNEL);
if (p->relocs == NULL) { if (p->relocs == NULL) {
return -ENOMEM; return -ENOMEM;
} }
...@@ -251,7 +251,7 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority ...@@ -251,7 +251,7 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
static int radeon_cs_sync_rings(struct radeon_cs_parser *p) static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
{ {
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
int r; int r;
list_for_each_entry(reloc, &p->validated, tv.head) { list_for_each_entry(reloc, &p->validated, tv.head) {
...@@ -397,8 +397,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) ...@@ -397,8 +397,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
static int cmp_size_smaller_first(void *priv, struct list_head *a, static int cmp_size_smaller_first(void *priv, struct list_head *a,
struct list_head *b) struct list_head *b)
{ {
struct radeon_cs_reloc *la = list_entry(a, struct radeon_cs_reloc, tv.head); struct radeon_bo_list *la = list_entry(a, struct radeon_bo_list, tv.head);
struct radeon_cs_reloc *lb = list_entry(b, struct radeon_cs_reloc, tv.head); struct radeon_bo_list *lb = list_entry(b, struct radeon_bo_list, tv.head);
/* Sort A before B if A is smaller. */ /* Sort A before B if A is smaller. */
return (int)la->robj->tbo.num_pages - (int)lb->robj->tbo.num_pages; return (int)la->robj->tbo.num_pages - (int)lb->robj->tbo.num_pages;
...@@ -832,7 +832,7 @@ void radeon_cs_dump_packet(struct radeon_cs_parser *p, ...@@ -832,7 +832,7 @@ void radeon_cs_dump_packet(struct radeon_cs_parser *p,
* GPU offset using the provided start. * GPU offset using the provided start.
**/ **/
int radeon_cs_packet_next_reloc(struct radeon_cs_parser *p, int radeon_cs_packet_next_reloc(struct radeon_cs_parser *p,
struct radeon_cs_reloc **cs_reloc, struct radeon_bo_list **cs_reloc,
int nomm) int nomm)
{ {
struct radeon_cs_chunk *relocs_chunk; struct radeon_cs_chunk *relocs_chunk;
......
...@@ -548,7 +548,7 @@ static void radeon_gem_va_update_vm(struct radeon_device *rdev, ...@@ -548,7 +548,7 @@ static void radeon_gem_va_update_vm(struct radeon_device *rdev,
struct radeon_bo_va *bo_va) struct radeon_bo_va *bo_va)
{ {
struct ttm_validate_buffer tv, *entry; struct ttm_validate_buffer tv, *entry;
struct radeon_cs_reloc *vm_bos; struct radeon_bo_list *vm_bos;
struct ww_acquire_ctx ticket; struct ww_acquire_ctx ticket;
struct list_head list; struct list_head list;
unsigned domain; unsigned domain;
......
...@@ -502,7 +502,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev, ...@@ -502,7 +502,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
struct ww_acquire_ctx *ticket, struct ww_acquire_ctx *ticket,
struct list_head *head, int ring) struct list_head *head, int ring)
{ {
struct radeon_cs_reloc *lobj; struct radeon_bo_list *lobj;
struct radeon_bo *bo; struct radeon_bo *bo;
int r; int r;
u64 bytes_moved = 0, initial_bytes_moved; u64 bytes_moved = 0, initial_bytes_moved;
......
...@@ -488,7 +488,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p, ...@@ -488,7 +488,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
unsigned buf_sizes[], bool *has_msg_cmd) unsigned buf_sizes[], bool *has_msg_cmd)
{ {
struct radeon_cs_chunk *relocs_chunk; struct radeon_cs_chunk *relocs_chunk;
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
unsigned idx, cmd, offset; unsigned idx, cmd, offset;
uint64_t start, end; uint64_t start, end;
int r; int r;
......
...@@ -453,7 +453,7 @@ int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi, ...@@ -453,7 +453,7 @@ int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi,
unsigned size) unsigned size)
{ {
struct radeon_cs_chunk *relocs_chunk; struct radeon_cs_chunk *relocs_chunk;
struct radeon_cs_reloc *reloc; struct radeon_bo_list *reloc;
uint64_t start, end, offset; uint64_t start, end, offset;
unsigned idx; unsigned idx;
......
...@@ -125,15 +125,15 @@ void radeon_vm_manager_fini(struct radeon_device *rdev) ...@@ -125,15 +125,15 @@ void radeon_vm_manager_fini(struct radeon_device *rdev)
* Add the page directory to the list of BOs to * Add the page directory to the list of BOs to
* validate for command submission (cayman+). * validate for command submission (cayman+).
*/ */
struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev, struct radeon_bo_list *radeon_vm_get_bos(struct radeon_device *rdev,
struct radeon_vm *vm, struct radeon_vm *vm,
struct list_head *head) struct list_head *head)
{ {
struct radeon_cs_reloc *list; struct radeon_bo_list *list;
unsigned i, idx; unsigned i, idx;
list = drm_malloc_ab(vm->max_pde_used + 2, list = drm_malloc_ab(vm->max_pde_used + 2,
sizeof(struct radeon_cs_reloc)); sizeof(struct radeon_bo_list));
if (!list) if (!list)
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment