diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-06-28 11:11:34 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-08-04 11:55:27 -0400 |
| commit | b544021f18931258e4e1ef8d88d43dedb73a7ecf (patch) | |
| tree | ed09084aef2dab7786aee1013bd79dd0f17a06a5 /drivers/gpu/drm/msm | |
| parent | c759606c96dc052373d4c36ea383595da46b04e9 (diff) | |
| download | op-kernel-dev-b544021f18931258e4e1ef8d88d43dedb73a7ecf.zip op-kernel-dev-b544021f18931258e4e1ef8d88d43dedb73a7ecf.tar.gz | |
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')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 5 |
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 942e09d..a2cee06 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[] = { #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 |
