]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Revert "drm: tegra: protect DC register access with mutex"
authorDave Airlie <airlied@redhat.com>
Sun, 30 Dec 2012 11:58:20 +0000 (21:58 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 30 Dec 2012 11:58:20 +0000 (21:58 +1000)
This reverts commit 83c0bcb694be31dcd6c04bdd935b96a95a0af548.

Lucas pointed out this was a mistake, and I missed the discussion,
so just revert it out to save a rebase.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/tegra/dc.c
drivers/gpu/drm/tegra/drm.h

index 3475bd9f9719a3385e22133cb3bd6e2867d3592e..656b2e3334a621109426806043032ae3422d9631 100644 (file)
@@ -171,8 +171,6 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc,
                return err;
        }
 
-       mutex_lock(&dc->regs_mutex);
-
        /* program display mode */
        tegra_dc_set_timings(dc, mode);
 
@@ -270,8 +268,6 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc,
        tegra_dc_writel(dc, 0xff00, DC_WIN_BLEND_NOKEY);
        tegra_dc_writel(dc, 0xff00, DC_WIN_BLEND_1WIN);
 
-       mutex_unlock(&dc->regs_mutex);
-
        return 0;
 }
 
@@ -290,8 +286,6 @@ static void tegra_crtc_prepare(struct drm_crtc *crtc)
        else
                syncpt = SYNCPT_VBLANK0;
 
-       mutex_lock(&dc->regs_mutex);
-
        /* initialize display controller */
        tegra_dc_writel(dc, 0x00000100, DC_CMD_GENERAL_INCR_SYNCPT_CNTRL);
        tegra_dc_writel(dc, 0x100 | syncpt, DC_CMD_CONT_SYNCPT_VSYNC);
@@ -325,8 +319,6 @@ static void tegra_crtc_prepare(struct drm_crtc *crtc)
 
        value = VBLANK_INT | WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT;
        tegra_dc_writel(dc, value, DC_CMD_INT_ENABLE);
-
-       mutex_unlock(&dc->regs_mutex);
 }
 
 static void tegra_crtc_commit(struct drm_crtc *crtc)
@@ -337,8 +329,6 @@ static void tegra_crtc_commit(struct drm_crtc *crtc)
 
        update_mask = GENERAL_ACT_REQ | WIN_A_ACT_REQ;
 
-       mutex_lock(&dc->regs_mutex);
-
        tegra_dc_writel(dc, update_mask << 8, DC_CMD_STATE_CONTROL);
 
        value = tegra_dc_readl(dc, DC_CMD_INT_ENABLE);
@@ -350,8 +340,6 @@ static void tegra_crtc_commit(struct drm_crtc *crtc)
        tegra_dc_writel(dc, value, DC_CMD_INT_MASK);
 
        tegra_dc_writel(dc, update_mask, DC_CMD_STATE_CONTROL);
-
-       mutex_unlock(&dc->regs_mutex);
 }
 
 static void tegra_crtc_load_lut(struct drm_crtc *crtc)
@@ -758,7 +746,6 @@ static int tegra_dc_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        INIT_LIST_HEAD(&dc->list);
-       mutex_init(&dc->regs_mutex);
        dc->dev = &pdev->dev;
 
        dc->clk = devm_clk_get(&pdev->dev, NULL);
index 71e61f2b07417f4d0e04bfb7c94ecc06bf0ca9a8..741b5dc2742cc7498fb3f763c273da81885222ba 100644 (file)
@@ -84,7 +84,6 @@ struct tegra_dc {
 
        struct clk *clk;
 
-       struct mutex regs_mutex;
        void __iomem *regs;
        int irq;