Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / tegra / dc.c

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index b256574409e7f6be31b9b91f53cc1bc606d6b974..656b2e3334a621109426806043032ae3422d9631 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -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);
 
@@ -223,8 +221,7 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc,
        win.stride = crtc->fb->pitches[0];
 
        /* program window registers */
-       value = tegra_dc_readl(dc, DC_CMD_DISPLAY_WINDOW_HEADER);
-       value |= WINDOW_A_SELECT;
+       value = WINDOW_A_SELECT;
        tegra_dc_writel(dc, value, DC_CMD_DISPLAY_WINDOW_HEADER);
 
        tegra_dc_writel(dc, win.fmt, DC_WIN_COLOR_DEPTH);
@@ -271,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;
 }
 
@@ -291,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);
@@ -326,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)
@@ -338,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);
@@ -351,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)
@@ -759,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);