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

Commit 2f9225db authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: move cmdbuf into submit object 



Less dynamic allocations and slims down the cmdbuf object to only the
required information, as everything else is already available in the
submit object.

This also simplifies buffer and mappings lifetime management, as they
are now exlusively attached to the submit object and not additionally
to the cmdbuf.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 7a9c0fe2

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+5 −5
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static u32 etnaviv_buffer_reserve(struct etnaviv_gpu *gpu, 


u16 etnaviv_buffer_init(struct etnaviv_gpu *gpu)

{

	struct etnaviv_cmdbuf *buffer = gpu->buffer;

	struct etnaviv_cmdbuf *buffer = &gpu->buffer;



	lockdep_assert_held(&gpu->lock);
@@ -182,7 +182,7 @@ u16 etnaviv_buffer_init(struct etnaviv_gpu *gpu) 


u16 etnaviv_buffer_config_mmuv2(struct etnaviv_gpu *gpu, u32 mtlb_addr, u32 safe_addr)

{

	struct etnaviv_cmdbuf *buffer = gpu->buffer;

	struct etnaviv_cmdbuf *buffer = &gpu->buffer;



	lockdep_assert_held(&gpu->lock);
@@ -217,7 +217,7 @@ u16 etnaviv_buffer_config_mmuv2(struct etnaviv_gpu *gpu, u32 mtlb_addr, u32 safe 


void etnaviv_buffer_end(struct etnaviv_gpu *gpu)

{

	struct etnaviv_cmdbuf *buffer = gpu->buffer;

	struct etnaviv_cmdbuf *buffer = &gpu->buffer;

	unsigned int waitlink_offset = buffer->user_size - 16;

	u32 link_target, flush = 0;
@@ -261,7 +261,7 @@ void etnaviv_buffer_end(struct etnaviv_gpu *gpu) 
/* Append a 'sync point' to the ring buffer. */

void etnaviv_sync_point_queue(struct etnaviv_gpu *gpu, unsigned int event)

{

	struct etnaviv_cmdbuf *buffer = gpu->buffer;

	struct etnaviv_cmdbuf *buffer = &gpu->buffer;

	unsigned int waitlink_offset = buffer->user_size - 16;

	u32 dwords, target;
@@ -300,7 +300,7 @@ void etnaviv_sync_point_queue(struct etnaviv_gpu *gpu, unsigned int event) 
void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,

	unsigned int event, struct etnaviv_cmdbuf *cmdbuf)

{

	struct etnaviv_cmdbuf *buffer = gpu->buffer;

	struct etnaviv_cmdbuf *buffer = &gpu->buffer;

	unsigned int waitlink_offset = buffer->user_size - 16;

	u32 return_target, return_dwords;

	u32 link_target, link_dwords;

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c

+4 −13
Original line number Diff line number Diff line
@@ -86,19 +86,11 @@ void etnaviv_cmdbuf_suballoc_destroy(struct etnaviv_cmdbuf_suballoc *suballoc) 
	kfree(suballoc);

}



struct etnaviv_cmdbuf *

etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc *suballoc, u32 size,

		   size_t nr_bos)

int etnaviv_cmdbuf_init(struct etnaviv_cmdbuf_suballoc *suballoc,

			struct etnaviv_cmdbuf *cmdbuf, u32 size)

{

	struct etnaviv_cmdbuf *cmdbuf;

	size_t sz = size_vstruct(nr_bos, sizeof(cmdbuf->bo_map[0]),

				 sizeof(*cmdbuf));

	int granule_offs, order, ret;



	cmdbuf = kzalloc(sz, GFP_KERNEL);

	if (!cmdbuf)

		return NULL;



	cmdbuf->suballoc = suballoc;

	cmdbuf->size = size;
@@ -116,7 +108,7 @@ etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc *suballoc, u32 size, 
		if (!ret) {

			dev_err(suballoc->gpu->dev,

				"Timeout waiting for cmdbuf space\n");

			return NULL;

			return -ETIMEDOUT;

		}

		goto retry;

	}
@@ -124,7 +116,7 @@ etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc *suballoc, u32 size, 
	cmdbuf->suballoc_offset = granule_offs * SUBALLOC_GRANULE;

	cmdbuf->vaddr = suballoc->vaddr + cmdbuf->suballoc_offset;



	return cmdbuf;

	return 0;

}



void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf)
@@ -140,7 +132,6 @@ void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf) 
	suballoc->free_space = 1;

	mutex_unlock(&suballoc->lock);

	wake_up_all(&suballoc->free_event);

	kfree(cmdbuf);

}



u32 etnaviv_cmdbuf_get_va(struct etnaviv_cmdbuf *buf)

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

+3 −10
Original line number Diff line number Diff line
@@ -33,22 +33,15 @@ struct etnaviv_cmdbuf { 
	void *vaddr;

	u32 size;

	u32 user_size;

	/* fence after which this buffer is to be disposed */

	struct dma_fence *fence;

	/* per GPU in-flight list */

	struct list_head node;

	/* BOs attached to this command buffer */

	unsigned int nr_bos;

	struct etnaviv_vram_mapping *bo_map[0];

};



struct etnaviv_cmdbuf_suballoc *

etnaviv_cmdbuf_suballoc_new(struct etnaviv_gpu * gpu);

void etnaviv_cmdbuf_suballoc_destroy(struct etnaviv_cmdbuf_suballoc *suballoc);



struct etnaviv_cmdbuf *

etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc *suballoc, u32 size,

		   size_t nr_bos);



int etnaviv_cmdbuf_init(struct etnaviv_cmdbuf_suballoc *suballoc,

		struct etnaviv_cmdbuf *cmdbuf, u32 size);

void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf);



u32 etnaviv_cmdbuf_get_va(struct etnaviv_cmdbuf *buf);

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int etnaviv_mmu_show(struct etnaviv_gpu *gpu, struct seq_file *m) 


static void etnaviv_buffer_dump(struct etnaviv_gpu *gpu, struct seq_file *m)

{

	struct etnaviv_cmdbuf *buf = gpu->buffer;

	struct etnaviv_cmdbuf *buf = &gpu->buffer;

	u32 size = buf->size;

	u32 *ptr = buf->vaddr;

	u32 i;

drivers/gpu/drm/etnaviv/etnaviv_dump.c

+12 −11
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) 
	struct core_dump_iterator iter;

	struct etnaviv_vram_mapping *vram;

	struct etnaviv_gem_object *obj;

	struct etnaviv_cmdbuf *cmd;

	struct etnaviv_gem_submit *submit;

	unsigned int n_obj, n_bomap_pages;

	size_t file_size, mmu_size;

	__le64 *bomap, *bomap_start;
@@ -132,11 +132,11 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) 
	n_bomap_pages = 0;

	file_size = ARRAY_SIZE(etnaviv_dump_registers) *

			sizeof(struct etnaviv_dump_registers) +

		    mmu_size + gpu->buffer->size;

		    mmu_size + gpu->buffer.size;



	/* Add in the active command buffers */

	list_for_each_entry(cmd, &gpu->active_cmd_list, node) {

		file_size += cmd->size;

	list_for_each_entry(submit, &gpu->active_submit_list, node) {

		file_size += submit->cmdbuf.size;

		n_obj++;

	}
@@ -176,13 +176,14 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) 


	etnaviv_core_dump_registers(&iter, gpu);

	etnaviv_core_dump_mmu(&iter, gpu, mmu_size);

	etnaviv_core_dump_mem(&iter, ETDUMP_BUF_RING, gpu->buffer->vaddr,

			      gpu->buffer->size,

			      etnaviv_cmdbuf_get_va(gpu->buffer));



	list_for_each_entry(cmd, &gpu->active_cmd_list, node)

		etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD, cmd->vaddr,

				      cmd->size, etnaviv_cmdbuf_get_va(cmd));

	etnaviv_core_dump_mem(&iter, ETDUMP_BUF_RING, gpu->buffer.vaddr,

			      gpu->buffer.size,

			      etnaviv_cmdbuf_get_va(&gpu->buffer));



	list_for_each_entry(submit, &gpu->active_submit_list, node)

		etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD,

				      submit->cmdbuf.vaddr, submit->cmdbuf.size,

				      etnaviv_cmdbuf_get_va(&submit->cmdbuf));



	/* Reserve space for the bomap */

	if (n_bomap_pages) {