From a8efc87a47cc20ac0a86545ece5bd7b79f06745f Mon Sep 17 00:00:00 2001 From: Li Peng Date: Thu, 26 Jul 2012 14:04:04 +0800 Subject: [PATCH] gfx: remove mutex protection in __dpi_panel_power_off we already called mutex lock at higher level function, so no need to do it again at __dpi_panel_power_off, otherwise it will cause mutex lock twice at suspend path Signed-off-by: Li Peng --- drivers/staging/mrst.mcg/drv/mdfld_dsi_dpi.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/staging/mrst.mcg/drv/mdfld_dsi_dpi.c b/drivers/staging/mrst.mcg/drv/mdfld_dsi_dpi.c index 1655b71..186958f 100644 --- a/drivers/staging/mrst.mcg/drv/mdfld_dsi_dpi.c +++ b/drivers/staging/mrst.mcg/drv/mdfld_dsi_dpi.c @@ -1781,13 +1781,6 @@ static int __dpi_panel_power_off(struct mdfld_dsi_config *dsi_config, for (i = 0; i < 256; i++) ctx->palette[i] = REG_READ(regs->palette_reg + (i<<2)); - /* - * Couldn't disable the pipe until DRM_WAIT_ON signaled by last - * vblank event when playing video, otherwise the last vblank event - * will lost when pipe disabled before vblank interrupt coming sometimes. - */ - mutex_lock(&dev->mode_config.mutex); - /*Disable panel*/ val = ctx->dspcntr; val &= ~(PIPEACONF_COLOR_MATRIX_ENABLE | PIPEACONF_GAMMA); @@ -1800,8 +1793,6 @@ static int __dpi_panel_power_off(struct mdfld_dsi_config *dsi_config, ctx->pipeconf = val; REG_WRITE(regs->pipeconf_reg, (val & ~BIT31)); - mutex_unlock(&dev->mode_config.mutex); - /*wait for pipe disabling, pipe synchronization plus , only avaiable when timer generator is working*/ -- 2.7.4