summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/dc.c
diff options
context:
space:
mode:
authorKevin Huang <kevinh@nvidia.com>2012-01-31 23:32:28 -0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-02-13 22:18:47 -0800
commit14cfecda97b635253c94aaee942437003ae5a3c6 (patch)
treeb6dfe8d64c92b92b1698264d7cac5e2c9bc72d6c /drivers/video/tegra/dc/dc.c
parent1e63e0263edfa2208449fea65d2dd96151f211fb (diff)
video: tegra: dc: Activate dc registers properly for one-shot mode.
Enable GENERAL_ACT_REQ and HOST_TRIG_ENABLE at the same time. Bug 930840 Signed-off-by: Kevin Huang <kevinh@nvidia.com> Reviewed-on: http://git-master/r/78638 (cherry picked from commit 2f78c8e3c243b4c866ad54a550167abd94c200c1) Change-Id: If0ef97c4a2b1a0621152c02728edbbed064a5e34 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/82715 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
-rw-r--r--drivers/video/tegra/dc/dc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index c833b40..348637e 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -1258,10 +1258,10 @@ int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n)
tegra_dc_writel(dc, val, DC_CMD_INT_MASK);
}
- tegra_dc_writel(dc, update_mask, DC_CMD_STATE_CONTROL);
-
if (dc->out->flags & TEGRA_DC_OUT_ONE_SHOT_MODE)
- tegra_dc_writel(dc, NC_HOST_TRIG, DC_CMD_STATE_CONTROL);
+ update_mask |= NC_HOST_TRIG;
+
+ tegra_dc_writel(dc, update_mask, DC_CMD_STATE_CONTROL);
/* update EMC clock if calculated bandwidth has changed */
tegra_dc_program_bandwidth(dc);