drm/msm: fix double struct_mutex acquire
authorRob Clark <robdclark@gmail.com>
Sat, 28 Jun 2014 15:11:34 +0000 (11:11 -0400)
committerRob Clark <robdclark@gmail.com>
Mon, 4 Aug 2014 15:55:27 +0000 (11:55 -0400)
Mutex is already grabbed in show_locked().. somehow this slipped
through.

Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/adreno/a3xx_gpu.c

index 942e09d898a871b9b533a7dff07db703f29d5c58..a2cee0645336dacda616d6d6f31c6b22be19d10a 100644 (file)
@@ -392,13 +392,10 @@ static const unsigned int a3xx_registers[] = {
 #ifdef CONFIG_DEBUG_FS
 static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
 {
-       struct drm_device *dev = gpu->dev;
        int i;
 
        adreno_show(gpu, m);
 
-       mutex_lock(&dev->struct_mutex);
-
        gpu->funcs->pm_resume(gpu);
 
        seq_printf(m, "status:   %08x\n",
@@ -418,8 +415,6 @@ static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
        }
 
        gpu->funcs->pm_suspend(gpu);
-
-       mutex_unlock(&dev->struct_mutex);
 }
 #endif