From patchwork Wed Aug 1 10:31:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archit taneja X-Patchwork-Id: 1263731 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9EF9EDF215 for ; Wed, 1 Aug 2012 10:33:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753834Ab2HAKdM (ORCPT ); Wed, 1 Aug 2012 06:33:12 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:50138 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753625Ab2HAKdK (ORCPT ); Wed, 1 Aug 2012 06:33:10 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q71AXARL005355; Wed, 1 Aug 2012 05:33:10 -0500 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q71AXAJV002739; Wed, 1 Aug 2012 05:33:10 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Wed, 1 Aug 2012 05:33:10 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q71AX9ir016536; Wed, 1 Aug 2012 05:33:10 -0500 Received: from localhost (a0393947pc.apr.dhcp.ti.com [172.24.137.248]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id q71AX7r26807; Wed, 1 Aug 2012 05:33:08 -0500 (CDT) From: Archit Taneja To: CC: , , , , Archit Taneja Subject: [RFC 04/17] OMAPDSS: DPI: Add locking for DPI interface Date: Wed, 1 Aug 2012 16:01:15 +0530 Message-ID: <1343817088-29645-5-git-send-email-archit@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343817088-29645-1-git-send-email-archit@ti.com> References: <1343817088-29645-1-git-send-email-archit@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The DPI interface driver currently relies on the panel driver to ensure calls like omapdss_dpi_display_enable() and omapdss_dpi_display_disable() are executed sequentially. Also, currently, there is no way to protect the DPI driver data. All DPI panel drivers don't ensure this, and in general, a DPI panel driver should use it's lock to that ensure it's own driver data and omap_dss_device states are taken care of, and not worry about the DPI interface. Add mutex locking in the DPI enable/disable/set_timings ops. Signed-off-by: Archit Taneja --- drivers/video/omap2/dss/dpi.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index c20fe23..add47fe 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -39,6 +39,8 @@ static struct { struct regulator *vdds_dsi_reg; struct platform_device *dsidev; + struct mutex lock; + struct dss_lcd_mgr_config mgr_config; } dpi; @@ -184,14 +186,18 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) { int r; + mutex_lock(&dpi.lock); + if (cpu_is_omap34xx() && !dpi.vdds_dsi_reg) { DSSERR("no VDSS_DSI regulator\n"); - return -ENODEV; + r = -ENODEV; + goto err_no_reg; } if (dssdev->manager == NULL) { DSSERR("failed to enable display: no manager\n"); - return -ENODEV; + r = -ENODEV; + goto err_no_mgr; } if (dpi_use_dsi_pll(dssdev)) { @@ -238,6 +244,8 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) if (r) goto err_mgr_enable; + mutex_unlock(&dpi.lock); + return 0; err_mgr_enable: @@ -255,12 +263,17 @@ err_get_dispc: err_reg_enable: omap_dss_stop_device(dssdev); err_start_dev: +err_no_mgr: +err_no_reg: + mutex_unlock(&dpi.lock); return r; } EXPORT_SYMBOL(omapdss_dpi_display_enable); void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) { + mutex_lock(&dpi.lock); + dss_mgr_disable(dssdev->manager); if (dpi_use_dsi_pll(dssdev)) { @@ -275,6 +288,8 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) regulator_disable(dpi.vdds_dsi_reg); omap_dss_stop_device(dssdev); + + mutex_unlock(&dpi.lock); } EXPORT_SYMBOL(omapdss_dpi_display_disable); @@ -284,6 +299,9 @@ void dpi_set_timings(struct omap_dss_device *dssdev, int r; DSSDBG("dpi_set_timings\n"); + + mutex_lock(&dpi.lock); + dssdev->panel.timings = *timings; if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { r = dispc_runtime_get(); @@ -296,6 +314,8 @@ void dpi_set_timings(struct omap_dss_device *dssdev, } else { dss_mgr_set_timings(dssdev->manager, timings); } + + mutex_unlock(&dpi.lock); } EXPORT_SYMBOL(dpi_set_timings); @@ -392,6 +412,8 @@ static void __init dpi_probe_pdata(struct platform_device *pdev) static int __init omap_dpi_probe(struct platform_device *pdev) { + mutex_init(&dpi.lock); + dpi_probe_pdata(pdev); return 0;