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

Commit 398efc46 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/adreno: move scratch register dumping to per-gen code 



Scratch registers move, annoyingly enough, in a5xx.  Move to
per-generation aNxx_recover() fxn.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent d0651fe8

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

+7 −0
Original line number Diff line number Diff line
@@ -301,8 +301,15 @@ static int a3xx_hw_init(struct msm_gpu *gpu) 


static void a3xx_recover(struct msm_gpu *gpu)

{

	int i;



	adreno_dump_info(gpu);



	for (i = 0; i < 8; i++) {

		printk("CP_SCRATCH_REG%d: %u\n", i,

			gpu_read(gpu, REG_AXXX_CP_SCRATCH_REG0 + i));

	}



	/* dump registers before resetting gpu, if enabled: */

	if (hang_debug)

		a3xx_dump(gpu);

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

+7 −0
Original line number Diff line number Diff line
@@ -299,8 +299,15 @@ static int a4xx_hw_init(struct msm_gpu *gpu) 


static void a4xx_recover(struct msm_gpu *gpu)

{

	int i;



	adreno_dump_info(gpu);



	for (i = 0; i < 8; i++) {

		printk("CP_SCRATCH_REG%d: %u\n", i,

			gpu_read(gpu, REG_AXXX_CP_SCRATCH_REG0 + i));

	}



	/* dump registers before resetting gpu, if enabled: */

	if (hang_debug)

		a4xx_dump(gpu);

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

+0 −6
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ void adreno_show(struct msm_gpu *gpu, struct seq_file *m) 
void adreno_dump_info(struct msm_gpu *gpu)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	int i;



	printk("revision: %d (%d.%d.%d.%d)\n",

			adreno_gpu->info->revn, adreno_gpu->rev.core,
@@ -290,11 +289,6 @@ void adreno_dump_info(struct msm_gpu *gpu) 
	printk("rptr:     %d\n", get_rptr(adreno_gpu));

	printk("wptr:     %d\n", adreno_gpu->memptrs->wptr);

	printk("rb wptr:  %d\n", get_wptr(gpu->rb));



	for (i = 0; i < 8; i++) {

		printk("CP_SCRATCH_REG%d: %u\n", i,

			gpu_read(gpu, REG_AXXX_CP_SCRATCH_REG0 + i));

	}

}



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