Commit c3c3ab19 authored by Rob Clark's avatar Rob Clark

drm/msm/gpu: move suspend/resume into debugfs->show

Each of the per-generation callbacks was doing this.  Lets just simplify
and move it into toplevel show() fxn.
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 01687781
...@@ -412,10 +412,8 @@ static const unsigned int a3xx_registers[] = { ...@@ -412,10 +412,8 @@ static const unsigned int a3xx_registers[] = {
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m) static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
{ {
gpu->funcs->pm_resume(gpu);
seq_printf(m, "status: %08x\n", seq_printf(m, "status: %08x\n",
gpu_read(gpu, REG_A3XX_RBBM_STATUS)); gpu_read(gpu, REG_A3XX_RBBM_STATUS));
gpu->funcs->pm_suspend(gpu);
adreno_show(gpu, m); adreno_show(gpu, m);
} }
#endif #endif
......
...@@ -456,12 +456,8 @@ static const unsigned int a4xx_registers[] = { ...@@ -456,12 +456,8 @@ static const unsigned int a4xx_registers[] = {
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static void a4xx_show(struct msm_gpu *gpu, struct seq_file *m) static void a4xx_show(struct msm_gpu *gpu, struct seq_file *m)
{ {
gpu->funcs->pm_resume(gpu);
seq_printf(m, "status: %08x\n", seq_printf(m, "status: %08x\n",
gpu_read(gpu, REG_A4XX_RBBM_STATUS)); gpu_read(gpu, REG_A4XX_RBBM_STATUS));
gpu->funcs->pm_suspend(gpu);
adreno_show(gpu, m); adreno_show(gpu, m);
} }
......
...@@ -837,12 +837,8 @@ static int a5xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) ...@@ -837,12 +837,8 @@ static int a5xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value)
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static void a5xx_show(struct msm_gpu *gpu, struct seq_file *m) static void a5xx_show(struct msm_gpu *gpu, struct seq_file *m)
{ {
gpu->funcs->pm_resume(gpu);
seq_printf(m, "status: %08x\n", seq_printf(m, "status: %08x\n",
gpu_read(gpu, REG_A5XX_RBBM_STATUS)); gpu_read(gpu, REG_A5XX_RBBM_STATUS));
gpu->funcs->pm_suspend(gpu);
adreno_show(gpu, m); adreno_show(gpu, m);
} }
#endif #endif
......
...@@ -259,8 +259,6 @@ void adreno_show(struct msm_gpu *gpu, struct seq_file *m) ...@@ -259,8 +259,6 @@ void adreno_show(struct msm_gpu *gpu, struct seq_file *m)
seq_printf(m, "wptr: %d\n", adreno_gpu->memptrs->wptr); seq_printf(m, "wptr: %d\n", adreno_gpu->memptrs->wptr);
seq_printf(m, "rb wptr: %d\n", get_wptr(gpu->rb)); seq_printf(m, "rb wptr: %d\n", get_wptr(gpu->rb));
gpu->funcs->pm_resume(gpu);
/* dump these out in a form that can be parsed by demsm: */ /* dump these out in a form that can be parsed by demsm: */
seq_printf(m, "IO:region %s 00000000 00020000\n", gpu->name); seq_printf(m, "IO:region %s 00000000 00020000\n", gpu->name);
for (i = 0; adreno_gpu->registers[i] != ~0; i += 2) { for (i = 0; adreno_gpu->registers[i] != ~0; i += 2) {
...@@ -273,8 +271,6 @@ void adreno_show(struct msm_gpu *gpu, struct seq_file *m) ...@@ -273,8 +271,6 @@ void adreno_show(struct msm_gpu *gpu, struct seq_file *m)
seq_printf(m, "IO:R %08x %08x\n", addr<<2, val); seq_printf(m, "IO:R %08x %08x\n", addr<<2, val);
} }
} }
gpu->funcs->pm_suspend(gpu);
} }
#endif #endif
......
...@@ -28,7 +28,9 @@ static int msm_gpu_show(struct drm_device *dev, struct seq_file *m) ...@@ -28,7 +28,9 @@ static int msm_gpu_show(struct drm_device *dev, struct seq_file *m)
if (gpu) { if (gpu) {
seq_printf(m, "%s Status:\n", gpu->name); seq_printf(m, "%s Status:\n", gpu->name);
gpu->funcs->pm_resume(gpu);
gpu->funcs->show(gpu, m); gpu->funcs->show(gpu, m);
gpu->funcs->pm_suspend(gpu);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment