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

Commit 6d2d13dd authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: use pointers instead of indexes for CS chunks 



Nobody is interested at which index the chunk is. What's needed is
a pointer to the chunk. Remove unused chunk_id field as well.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 466be338

drivers/gpu/drm/radeon/evergreen_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -2661,7 +2661,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) 
			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,7 +2684,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_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;
@@ -3100,7 +3100,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p) 
			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]);

drivers/gpu/drm/radeon/r100.c

+1 −1
Original line number Diff line number Diff line
@@ -2061,7 +2061,7 @@ int r100_cs_parse(struct radeon_cs_parser *p) 
		}

		if (r)

			return r;

	} while (p->idx < p->chunks[p->chunk_ib_idx].length_dw);

	} while (p->idx < p->chunk_ib->length_dw);

	return 0;

}

drivers/gpu/drm/radeon/r300.c

+1 −1
Original line number Diff line number Diff line
@@ -1283,7 +1283,7 @@ int r300_cs_parse(struct radeon_cs_parser *p) 
		if (r) {

			return r;

		}

	} while (p->idx < p->chunks[p->chunk_ib_idx].length_dw);

	} while (p->idx < p->chunk_ib->length_dw);

	return 0;

}

drivers/gpu/drm/radeon/r600_cs.c

+7 −7
Original line number Diff line number Diff line
@@ -2316,7 +2316,7 @@ int r600_cs_parse(struct radeon_cs_parser *p) 
			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]);
@@ -2351,7 +2351,7 @@ static void r600_cs_parser_fini(struct radeon_cs_parser *parser, int error) 


static int r600_cs_parser_relocs_legacy(struct radeon_cs_parser *p)

{

	if (p->chunk_relocs_idx == -1) {

	if (p->chunk_relocs == NULL) {

		return 0;

	}

	p->relocs = kzalloc(sizeof(struct radeon_bo_list), GFP_KERNEL);
@@ -2398,7 +2398,7 @@ int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp, 
	/* Copy the packet into the IB, the parser will read from the

	 * input memory (cached) and write to the IB (which can be

	 * uncached). */

	ib_chunk = &parser.chunks[parser.chunk_ib_idx];

	ib_chunk = parser.chunk_ib;

	parser.ib.length_dw = ib_chunk->length_dw;

	*l = parser.ib.length_dw;

	if (copy_from_user(ib, ib_chunk->user_ptr, ib_chunk->length_dw * 4)) {
@@ -2441,11 +2441,11 @@ int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, 
	unsigned idx;



	*cs_reloc = NULL;

	if (p->chunk_relocs_idx == -1) {

	if (p->chunk_relocs == NULL) {

		DRM_ERROR("No relocation chunk !\n");

		return -EINVAL;

	}

	relocs_chunk = &p->chunks[p->chunk_relocs_idx];

	relocs_chunk = p->chunk_relocs;

	idx = p->dma_reloc_idx;

	if (idx >= p->nrelocs) {

		DRM_ERROR("Relocs at %d after relocations chunk end %d !\n",
@@ -2472,7 +2472,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_chunk *ib_chunk = p->chunk_ib;

	struct radeon_bo_list *src_reloc, *dst_reloc;

	u32 header, cmd, count, tiled;

	volatile u32 *ib = p->ib.ptr;
@@ -2619,7 +2619,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p) 
			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]);

drivers/gpu/drm/radeon/radeon.h

+5 −6
Original line number Diff line number Diff line
@@ -1057,7 +1057,6 @@ void cayman_dma_fini(struct radeon_device *rdev); 
 * CS.

 */

struct radeon_cs_chunk {

	uint32_t		chunk_id;

	uint32_t		length_dw;

	uint32_t		*kdata;

	void __user		*user_ptr;
@@ -1080,10 +1079,10 @@ struct radeon_cs_parser { 
	struct list_head	validated;

	unsigned		dma_reloc_idx;

	/* indices of various chunks */

	int			chunk_ib_idx;

	int			chunk_relocs_idx;

	int			chunk_flags_idx;

	int			chunk_const_ib_idx;

	struct radeon_cs_chunk  *chunk_ib;

	struct radeon_cs_chunk  *chunk_relocs;

	struct radeon_cs_chunk  *chunk_flags;

	struct radeon_cs_chunk  *chunk_const_ib;

	struct radeon_ib	ib;

	struct radeon_ib	const_ib;

	void			*track;
@@ -1097,7 +1096,7 @@ struct radeon_cs_parser { 


static inline u32 radeon_get_ib_value(struct radeon_cs_parser *p, int idx)

{

	struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx];

	struct radeon_cs_chunk *ibc = p->chunk_ib;



	if (ibc->kdata)

		return ibc->kdata[idx];