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

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

drm/msm/adreno: Don't capture register values if target doesn't define them 



If the GPU target doesn't define a list of registers then gracefully skip
capturing and/or printing them. This is used by more complex targets like
6xx that have other means of capturing register values.

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

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

+14 −5
Original line number Diff line number Diff line
@@ -414,6 +414,10 @@ int adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state) 
		}

	}



	/* Some targets prefer to collect their own registers */

	if (!adreno_gpu->registers)

		return 0;



	/* Count the number of registers */

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

		count += adreno_gpu->registers[i + 1] -
@@ -551,6 +555,7 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, 
		}

	}



	if (state->nr_registers) {

		drm_puts(p, "registers:\n");



		for (i = 0; i < state->nr_registers; i++) {
@@ -559,6 +564,7 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, 
				state->registers[(i * 2) + 1]);

		}

	}

}

#endif



/* Dump common gpu status and scratch registers on any hang, to make
@@ -595,6 +601,9 @@ void adreno_dump(struct msm_gpu *gpu) 
	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	int i;



	if (!adreno_gpu->registers)

		return;



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

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

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