Skip to content

Commit

Permalink
Revert "drm: tegra: protect DC register access with mutex"
Browse files Browse the repository at this point in the history
This reverts commit 83c0bcb.

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>
  • Loading branch information
Dave Airlie committed Dec 30, 2012
1 parent 500df2e commit d5757db
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
13 changes: 0 additions & 13 deletions drivers/gpu/drm/tegra/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}

Expand All @@ -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);
Expand Down Expand Up @@ -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)
Expand All @@ -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);
Expand All @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/tegra/drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ struct tegra_dc {

struct clk *clk;

struct mutex regs_mutex;
void __iomem *regs;
int irq;

Expand Down

0 comments on commit d5757db

Please sign in to comment.