Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/radeon/evergreen_cs.c

+4 −4
Original line number Diff line number Diff line
@@ -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_parse_packet0(struct radeon_cs_parser *p, 
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 bool evergreen_is_safe_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) 
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;
@@ -2685,7 +2685,7 @@ int evergreen_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_reloc *src_reloc, *dst_reloc, *dst2_reloc;

	struct radeon_bo_list *src_reloc, *dst_reloc, *dst2_reloc;

	u32 header, cmd, count, sub_cmd;

	volatile u32 *ib = p->ib.ptr;

	u32 idx;

drivers/gpu/drm/radeon/r100.c

+4 −4
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ int r100_reloc_pitch_offset(struct radeon_cs_parser *p, 
	int r;

	u32 tile_flags = 0;

	u32 tmp;

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	u32 value;



	r = radeon_cs_packet_next_reloc(p, &reloc, 0);
@@ -1293,7 +1293,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, 
			     int idx)

{

	unsigned c, i;

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r100_cs_track *track;

	int r = 0;

	volatile uint32_t *ib;
@@ -1542,7 +1542,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
			      struct radeon_cs_packet *pkt,

			      unsigned idx, unsigned reg)

{

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r100_cs_track *track;

	volatile uint32_t *ib;

	uint32_t tmp;
@@ -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,

			      struct radeon_cs_packet *pkt)

{

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r100_cs_track *track;

	unsigned idx;

	volatile uint32_t *ib;

drivers/gpu/drm/radeon/r200.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
		       struct radeon_cs_packet *pkt,

		       unsigned idx, unsigned reg)

{

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r100_cs_track *track;

	volatile uint32_t *ib;

	uint32_t tmp;

drivers/gpu/drm/radeon/r300.c

+2 −2
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		struct radeon_cs_packet *pkt,

		unsigned idx, unsigned reg)

{

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r100_cs_track *track;

	volatile uint32_t *ib;

	uint32_t tmp, tile_flags = 0;
@@ -1142,7 +1142,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
static int r300_packet3_check(struct radeon_cs_parser *p,

			      struct radeon_cs_packet *pkt)

{

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r100_cs_track *track;

	volatile uint32_t *ib;

	unsigned idx;

drivers/gpu/drm/radeon/r600_cs.c

+5 −5
Original line number Diff line number Diff line
@@ -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)

{

	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;

	int r;
@@ -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,

				struct radeon_cs_packet *pkt)

{

	struct radeon_cs_reloc *reloc;

	struct radeon_bo_list *reloc;

	struct r600_cs_track *track;

	volatile u32 *ib;

	unsigned idx;
@@ -2354,7 +2354,7 @@ static int r600_cs_parser_relocs_legacy(struct radeon_cs_parser *p) 
	if (p->chunk_relocs_idx == -1) {

		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) {

		return -ENOMEM;

	}
@@ -2435,7 +2435,7 @@ void r600_cs_legacy_init(void) 
 * GPU offset using the provided start.

 **/

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;

	unsigned idx;
@@ -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)

{

	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;

	volatile u32 *ib = p->ib.ptr;

	u32 idx, idx_value;