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

Commit 4f776f45 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/gpu: Convert the GPU show function to use the GPU state 



Convert the existing GPU show function to use the GPU state to
dump the information rather than reading it directly from the hardware.
This will require an additional step to capture the state before
dumping it for the existing nodes but it will greatly facilitate reusing
the same code for dumping a previously captured state from a GPU hang.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent e00e473d

drivers/gpu/drm/msm/adreno/a3xx_gpu.c

+1 −10
Original line number Diff line number Diff line
@@ -411,15 +411,6 @@ static const unsigned int a3xx_registers[] = { 
	~0   /* sentinel */

};



#ifdef CONFIG_DEBUG_FS

static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)

{

	seq_printf(m, "status:   %08x\n",

			gpu_read(gpu, REG_A3XX_RBBM_STATUS));

	adreno_show(gpu, m);

}

#endif



/* would be nice to not have to duplicate the _show() stuff with printk(): */

static void a3xx_dump(struct msm_gpu *gpu)

{
@@ -464,7 +455,7 @@ static const struct adreno_gpu_funcs funcs = { 
		.irq = a3xx_irq,

		.destroy = a3xx_destroy,

#ifdef CONFIG_DEBUG_FS

		.show = a3xx_show,

		.show = adreno_show,

#endif

		.gpu_state_get = a3xx_gpu_state_get,

		.gpu_state_put = adreno_gpu_state_put,

drivers/gpu/drm/msm/adreno/a4xx_gpu.c

+1 −11
Original line number Diff line number Diff line
@@ -455,16 +455,6 @@ static const unsigned int a4xx_registers[] = { 
	~0 /* sentinel */

};



#ifdef CONFIG_DEBUG_FS

static void a4xx_show(struct msm_gpu *gpu, struct seq_file *m)

{

	seq_printf(m, "status:   %08x\n",

			gpu_read(gpu, REG_A4XX_RBBM_STATUS));

	adreno_show(gpu, m);



}

#endif



static struct msm_gpu_state *a4xx_gpu_state_get(struct msm_gpu *gpu)

{

	struct msm_gpu_state *state = adreno_gpu_state_get(gpu);
@@ -551,7 +541,7 @@ static const struct adreno_gpu_funcs funcs = { 
		.irq = a4xx_irq,

		.destroy = a4xx_destroy,

#ifdef CONFIG_DEBUG_FS

		.show = a4xx_show,

		.show = adreno_show,

#endif

		.gpu_state_get = a4xx_gpu_state_get,

		.gpu_state_put = adreno_gpu_state_put,

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+1 −17
Original line number Diff line number Diff line
@@ -1215,22 +1215,6 @@ static struct msm_gpu_state *a5xx_gpu_state_get(struct msm_gpu *gpu) 
	return state;

}



#ifdef CONFIG_DEBUG_FS

static void a5xx_show(struct msm_gpu *gpu, struct seq_file *m)

{

	seq_printf(m, "status:   %08x\n",

			gpu_read(gpu, REG_A5XX_RBBM_STATUS));



	/*

	 * Temporarily disable hardware clock gating before going into

	 * adreno_show to avoid issues while reading the registers

	 */

	a5xx_set_hwcg(gpu, false);

	adreno_show(gpu, m);

	a5xx_set_hwcg(gpu, true);

}

#endif



static struct msm_ringbuffer *a5xx_active_ring(struct msm_gpu *gpu)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
@@ -1260,7 +1244,7 @@ static const struct adreno_gpu_funcs funcs = { 
		.irq = a5xx_irq,

		.destroy = a5xx_destroy,

#ifdef CONFIG_DEBUG_FS

		.show = a5xx_show,

		.show = adreno_show,

		.debugfs_init = a5xx_debugfs_init,

#endif

		.gpu_busy = a5xx_gpu_busy,

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+13 −17
Original line number Diff line number Diff line
@@ -424,38 +424,34 @@ void adreno_gpu_state_put(struct msm_gpu_state *state) 
}



#ifdef CONFIG_DEBUG_FS

void adreno_show(struct msm_gpu *gpu, struct seq_file *m)

void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state,

		struct seq_file *m)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	int i;



	if (IS_ERR_OR_NULL(state))

		return;



	seq_printf(m, "status:   %08x\n", state->rbbm_status);

	seq_printf(m, "revision: %d (%d.%d.%d.%d)\n",

			adreno_gpu->info->revn, adreno_gpu->rev.core,

			adreno_gpu->rev.major, adreno_gpu->rev.minor,

			adreno_gpu->rev.patchid);



	for (i = 0; i < gpu->nr_rings; i++) {

		struct msm_ringbuffer *ring = gpu->rb[i];



		seq_printf(m, "rb %d: fence:    %d/%d\n", i,

			ring->memptrs->fence, ring->seqno);

			state->ring[i].fence, state->ring[i].seqno);



		seq_printf(m, "      rptr:     %d\n",

			get_rptr(adreno_gpu, ring));

		seq_printf(m, "rb wptr:  %d\n", get_wptr(ring));

		seq_printf(m, "      rptr:     %d\n", state->ring[i].rptr);

		seq_printf(m, "rb wptr:  %d\n", state->ring[i].wptr);

	}



	/* dump these out in a form that can be parsed by demsm: */

	seq_printf(m, "IO:region %s 00000000 00020000\n", gpu->name);

	for (i = 0; adreno_gpu->registers[i] != ~0; i += 2) {

		uint32_t start = adreno_gpu->registers[i];

		uint32_t end   = adreno_gpu->registers[i+1];

		uint32_t addr;



		for (addr = start; addr <= end; addr++) {

			uint32_t val = gpu_read(gpu, addr);

			seq_printf(m, "IO:R %08x %08x\n", addr<<2, val);

		}

	for (i = 0; i < state->nr_registers; i++) {

		seq_printf(m, "IO:R %08x %08x\n",

			state->registers[i * 2] << 2,

			state->registers[(i * 2) + 1]);

	}

}

#endif

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
void adreno_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring);

bool adreno_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring);

#ifdef CONFIG_DEBUG_FS

void adreno_show(struct msm_gpu *gpu, struct seq_file *m);

void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state,

		struct seq_file *m);

#endif

void adreno_dump_info(struct msm_gpu *gpu);

void adreno_dump(struct msm_gpu *gpu);