diff options
| author | Xin Xie <xxie@nvidia.com> | 2011-10-14 12:37:36 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:59 -0800 |
| commit | 9ec2c8bf7bf3a4f5989d0e944db62f3d571ad956 (patch) | |
| tree | 0a57162ebc05d25cab056f69cd5ca215634d30db /drivers/video/tegra/dc/dsi.c | |
| parent | a331838aabfd95eacaaeecce7d5d4db50bb085e5 (diff) | |
video: tegra: dsi: use mask to control interrupts
This patch is based on "video: tegra: dc: use mask to control
interrupts", so we do not use DC_CMD_INT_ENABLE to disable IRQ.
Bug 888207
Bug 870801
Reviewed-on: http://git-master/r/58176
(cherry picked from commit 6feaad5a74a934f604f5d25220afff478c43736d)
Change-Id: I2d7f8575c7d88fa89eb18c88e09cef62228353e8
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
[jmayo@nvidia.com: fixed conflicts]
Reviewed-on: http://git-master/r/63371
Rebase-Id: R31808eb1648f8634cc183f0d92c763999909d10d
Diffstat (limited to 'drivers/video/tegra/dc/dsi.c')
| -rw-r--r-- | drivers/video/tegra/dc/dsi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c index 2c2cb78d3488..01bf1c79f736 100644 --- a/drivers/video/tegra/dc/dsi.c +++ b/drivers/video/tegra/dc/dsi.c @@ -848,10 +848,6 @@ void tegra_dsi_stop_dc_stream_at_frame_end(struct tegra_dc *dc, tegra_dsi_stop_dc_stream(dc, dsi); /* enable frame end interrupt */ - val = tegra_dc_readl(dc, DC_CMD_INT_ENABLE); - val |= FRAME_END_INT; - tegra_dc_writel(dc, val, DC_CMD_INT_ENABLE); - val = tegra_dc_readl(dc, DC_CMD_INT_MASK); val |= FRAME_END_INT; tegra_dc_writel(dc, val, DC_CMD_INT_MASK); @@ -862,9 +858,9 @@ void tegra_dsi_stop_dc_stream_at_frame_end(struct tegra_dc *dc, msecs_to_jiffies(frame_period)); /* disable frame end interrupt */ - val = tegra_dc_readl(dc, DC_CMD_INT_ENABLE); + val = tegra_dc_readl(dc, DC_CMD_INT_MASK); val &= ~FRAME_END_INT; - tegra_dc_writel(dc, val, DC_CMD_INT_ENABLE); + tegra_dc_writel(dc, val, DC_CMD_INT_MASK); if (timeout == 0) printk(KERN_WARNING "DC doesn't stop at end of frame.\n"); |