drm/msm/adreno: Make adreno_gpu_state_get() return void
Subsystems (4)
PATCH v2 1/2 drm/msm/adreno: Make adreno_gpu_state_get() return void
We are not really checking the state of the adreno_gpu_state_get() function at the callers and in addition the state capture is mostly a best effort service, so make the function return void.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1 -3
@@ -380,7 +380,7 @@ bool adreno_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring)return false; } -int adreno_gpu_state_get (struct msm_gpu *gpu,struct msm_gpu_state *state) +void adreno_gpu_state_get (struct msm_gpu *gpu,struct msm_gpu_state *state) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);int i, count =0 ;
@@ -437,8 +437,6 @@ int adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state) state->nr_registers = count; } - -return 0 ; }void adreno_gpu_state_destroy (struct msm_gpu_state *state)
drivers/gpu/drm/msm/adreno/adreno_gpu.h +1 -1
@@ -235,7 +235,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,void adreno_gpu_state_destroy (struct msm_gpu_state *state); -int adreno_gpu_state_get (struct msm_gpu *gpu,struct msm_gpu_state *state); +void adreno_gpu_state_get (struct msm_gpu *gpu,struct msm_gpu_state *state);int adreno_gpu_state_put (struct msm_gpu_state *state);/* ringbuffer helpers (the parts that are adreno specific) */
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1544523765-12786-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v2 2/2 drm/msm/a6xx: Fix NULL dereference during crashstate capture
The gpu crashstate's base objects registers pointer can be NULL if the target implementation decides to capture the register dump on its own. This patch simply checks for NULL before dereferencing.
---
Changes from v1:
Addressed comments from Jordan Crouse
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +6 -2
@@ -415,6 +415,9 @@ void adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state) } } +if (!adreno_gpu->registers) +return ; +/* Count the number of registers */ for (i =0 ; adreno_gpu->registers[i] != ~0 ; i +=2 ) count += adreno_gpu->registers[i + 1] -
@@ -550,9 +553,10 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, } } -drm_puts (p,"registers:\n" ); -for (i =0 ; i < state->nr_registers; i++) { +if (i ==0 ) +drm_puts (p,"registers:\n" ); +drm_printf (p," - { offset: 0x%04x, value: 0x%08x }\n" , state->registers[i *2 ] <<2 , state->registers[(i *2 ) +1 ]);
--
1.9.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno