summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-12-30 21:58:20 +1000
committerDave Airlie <airlied@redhat.com>2012-12-30 21:58:20 +1000
commitd5757dbe79870d825d0dec30074d48683e1d7e9a (patch)
treef2edbd03bea099694bd3ce9effb6165cc104c55d
parent500df2e5d870ef5be3d37f0798f770028b69fd47 (diff)
downloadconfigs-d5757dbe79870d825d0dec30074d48683e1d7e9a.tar.gz
Revert "drm: tegra: protect DC register access with mutex"
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>
-rw-r--r--drivers/gpu/drm/tegra/dc.c13
-rw-r--r--drivers/gpu/drm/tegra/drm.h1
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 3475bd9f971..656b2e3334a 100644
--- 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);
@@ -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);
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 71e61f2b074..741b5dc2742 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -84,7 +84,6 @@ struct tegra_dc {
struct clk *clk;
- struct mutex regs_mutex;
void __iomem *regs;
int irq;