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

Commit f6086311 authored by Russell King's avatar Russell King Committed by Lucas Stach
Browse files

drm: etnaviv: track current execution state 



Add tracking of the current execution state (iow, active GPU pipe).

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 18060f4d

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, unsigned int event, 


		if (gpu->switch_context) {

			etnaviv_cmd_select_pipe(buffer, cmdbuf->exec_state);

			gpu->exec_state = cmdbuf->exec_state;

			gpu->switch_context = false;

		}

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+3 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) 
	/* Now program the hardware */

	mutex_lock(&gpu->lock);

	etnaviv_gpu_hw_init(gpu);

	gpu->exec_state = -1;

	mutex_unlock(&gpu->lock);



	pm_runtime_mark_last_busy(gpu->dev);
@@ -877,6 +878,7 @@ static void recover_worker(struct work_struct *work) 


	etnaviv_gpu_hw_init(gpu);

	gpu->switch_context = true;

	gpu->exec_state = -1;



	mutex_unlock(&gpu->lock);

	pm_runtime_mark_last_busy(gpu->dev);
@@ -1475,6 +1477,7 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) 
	etnaviv_gpu_hw_init(gpu);



	gpu->switch_context = true;

	gpu->exec_state = -1;



	mutex_unlock(&gpu->lock);

drivers/gpu/drm/etnaviv/etnaviv_gpu.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct etnaviv_gpu { 


	/* 'ring'-buffer: */

	struct etnaviv_cmdbuf *buffer;

	int exec_state;



	/* bus base address of memory  */

	u32 memory_base;