aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-06-28 11:11:34 -0400
committerRob Clark <robdclark@gmail.com>2014-08-04 11:55:27 -0400
commitb544021f18931258e4e1ef8d88d43dedb73a7ecf (patch)
treeed09084aef2dab7786aee1013bd79dd0f17a06a5 /drivers/gpu/drm/msm/adreno/a3xx_gpu.c
parentc759606c96dc052373d4c36ea383595da46b04e9 (diff)
drm/msm: fix double struct_mutex acquire
Mutex is already grabbed in show_locked().. somehow this slipped through. Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/a3xx_gpu.c')
-rw-r--r--drivers/gpu/drm/msm/adreno/a3xx_gpu.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 942e09d898a8..a2cee0645336 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -392,13 +392,10 @@ static const unsigned int a3xx_registers[] = {
392#ifdef CONFIG_DEBUG_FS 392#ifdef CONFIG_DEBUG_FS
393static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m) 393static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
394{ 394{
395 struct drm_device *dev = gpu->dev;
396 int i; 395 int i;
397 396
398 adreno_show(gpu, m); 397 adreno_show(gpu, m);
399 398
400 mutex_lock(&dev->struct_mutex);
401
402 gpu->funcs->pm_resume(gpu); 399 gpu->funcs->pm_resume(gpu);
403 400
404 seq_printf(m, "status: %08x\n", 401 seq_printf(m, "status: %08x\n",
@@ -418,8 +415,6 @@ static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
418 } 415 }
419 416
420 gpu->funcs->pm_suspend(gpu); 417 gpu->funcs->pm_suspend(gpu);
421
422 mutex_unlock(&dev->struct_mutex);
423} 418}
424#endif 419#endif
425 420