summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMin-wuk Lee <mlee@nvidia.com>2013-08-13 10:07:45 +0900
committerGabby Lee <galee@nvidia.com>2013-08-14 00:53:43 -0700
commit80a8b1e4ebafa5167d2cfed8e3a35904f393aa76 (patch)
tree40986bca696054b44be9a6bb9e1e4e361e0f412f /drivers
parentae1911fa1caddd9d1daadffafd53bdf3028a9a97 (diff)
Revert "ARM: tegra: dc: program active mux for cursor"
This reverts commit 3bb0d7f08cde9ef74c7419218187a3ca53b961c1. Cursor programming to ACTIVE copy directly is bad and not desired programming sequence, which has caused unexpected cursor window rendering across whole screen suddenly. With this change, it programs to ASSEMBLY copy and latch them into ACTIVE copy after GENERAL_ACT_REQ. Bug 1314051 Change-Id: Ic40557f93db5a4503fbe4362c4d6b27a1ef0acd7 Signed-off-by: Min-wuk Lee <mlee@nvidia.com> Reviewed-on: http://git-master/r/260852 GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo <jmayo@nvidia.com> Reviewed-by: Gabby Lee <galee@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/tegra/dc/ext/cursor.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/video/tegra/dc/ext/cursor.c b/drivers/video/tegra/dc/ext/cursor.c
index 729216c7d0da..9eaeb1fa830b 100644
--- a/drivers/video/tegra/dc/ext/cursor.c
+++ b/drivers/video/tegra/dc/ext/cursor.c
@@ -166,9 +166,6 @@ int tegra_dc_ext_set_cursor_image(struct tegra_dc_ext_user *user,
tegra_dc_io_start(dc);
tegra_dc_hold_dc_out(dc);
- tegra_dc_writel(dc, WRITE_MUX_ACTIVE | READ_MUX_ACTIVE,
- DC_CMD_STATE_ACCESS);
-
set_cursor_image_hw(dc, args, phys_addr);
tegra_dc_writel(dc, GENERAL_ACT_REQ << 8, DC_CMD_STATE_CONTROL);
@@ -222,9 +219,6 @@ int tegra_dc_ext_set_cursor(struct tegra_dc_ext_user *user,
tegra_dc_io_start(dc);
tegra_dc_hold_dc_out(dc);
- tegra_dc_writel(dc, WRITE_MUX_ACTIVE | READ_MUX_ACTIVE,
- DC_CMD_STATE_ACCESS);
-
val = tegra_dc_readl(dc, DC_DISP_DISP_WIN_OPTIONS);
if (!!(val & CURSOR_ENABLE) != enable) {
val &= ~CURSOR_ENABLE;
@@ -280,9 +274,6 @@ int tegra_dc_ext_cursor_clip(struct tegra_dc_ext_user *user,
tegra_dc_io_start(dc);
tegra_dc_hold_dc_out(dc);
- tegra_dc_writel(dc, WRITE_MUX_ACTIVE | READ_MUX_ACTIVE,
- DC_CMD_STATE_ACCESS);
-
reg_val = tegra_dc_readl(dc, DC_DISP_CURSOR_START_ADDR);
reg_val &= ~CURSOR_CLIP_SHIFT_BITS(3); /* Clear out the old value */
tegra_dc_writel(dc, reg_val | CURSOR_CLIP_SHIFT_BITS(*args),