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

Commit 797b0159 authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: move exec_state to submit object 



We'll need this in some places where only the submit is available. Also
this is a first step at slimming down the cmdbuf object.

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

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+5 −5
Original line number Diff line number Diff line
@@ -297,14 +297,14 @@ void etnaviv_sync_point_queue(struct etnaviv_gpu *gpu, unsigned int event) 
}



/* Append a command buffer to the ring buffer. */

void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, unsigned int event,

	struct etnaviv_cmdbuf *cmdbuf)

void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,

	unsigned int event, struct etnaviv_cmdbuf *cmdbuf)

{

	struct etnaviv_cmdbuf *buffer = gpu->buffer;

	unsigned int waitlink_offset = buffer->user_size - 16;

	u32 return_target, return_dwords;

	u32 link_target, link_dwords;

	bool switch_context = gpu->exec_state != cmdbuf->exec_state;

	bool switch_context = gpu->exec_state != exec_state;



	lockdep_assert_held(&gpu->lock);
@@ -363,8 +363,8 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, unsigned int event, 
		}



		if (switch_context) {

			etnaviv_cmd_select_pipe(gpu, buffer, cmdbuf->exec_state);

			gpu->exec_state = cmdbuf->exec_state;

			etnaviv_cmd_select_pipe(gpu, buffer, exec_state);

			gpu->exec_state = exec_state;

		}



		/* And the link to the submitted buffer */

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ struct etnaviv_cmdbuf { 
	u32 user_size;

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

	struct dma_fence *fence;

	/* target exec state */

	u32 exec_state;

	/* per GPU in-flight list */

	struct list_head node;

	/* BOs attached to this command buffer */

drivers/gpu/drm/etnaviv/etnaviv_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ u16 etnaviv_buffer_init(struct etnaviv_gpu *gpu); 
u16 etnaviv_buffer_config_mmuv2(struct etnaviv_gpu *gpu, u32 mtlb_addr, u32 safe_addr);

void etnaviv_buffer_end(struct etnaviv_gpu *gpu);

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

void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, unsigned int event,

	struct etnaviv_cmdbuf *cmdbuf);

void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,

	unsigned int event, struct etnaviv_cmdbuf *cmdbuf);

void etnaviv_validate_init(void);

bool etnaviv_cmd_validate_one(struct etnaviv_gpu *gpu,

	u32 *stream, unsigned int size,

drivers/gpu/drm/etnaviv/etnaviv_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct etnaviv_gem_submit { 
	struct kref refcount;

	struct etnaviv_gpu *gpu;

	struct dma_fence *out_fence, *in_fence;

	u32 exec_state;

	u32 flags;

	unsigned int nr_pmrs;

	struct etnaviv_perfmon_request *pmrs;

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, 
		goto err_submit_cmds;

	}



	cmdbuf->exec_state = args->exec_state;

	cmdbuf->ctx = file->driver_priv;



	ret = copy_from_user(bos, u64_to_user_ptr(args->bos),
@@ -487,6 +486,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, 
		goto err_submit_ww_acquire;

	}



	submit->exec_state = args->exec_state;

	submit->flags = args->flags;



	ret = submit_lookup_objects(submit, file, bos, args->nr_bos);