Revert "ARM: tegra: dc: program active mux for cursor"
Min-wuk Lee [Tue, 13 Aug 2013 01:07:45 +0000 (10:07 +0900)]
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
(cherry picked from commit 80a8b1e4ebafa5167d2cfed8e3a35904f393aa76)
Reviewed-on: http://git-master/r/299451
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>

drivers/video/tegra/dc/ext/cursor.c

index 6aeacab..35a86d4 100644 (file)
@@ -165,9 +165,6 @@ int tegra_dc_ext_set_cursor_image(struct tegra_dc_ext_user *user,
        mutex_lock(&dc->lock);
        tegra_dc_get(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);
@@ -219,9 +216,6 @@ int tegra_dc_ext_set_cursor(struct tegra_dc_ext_user *user,
        mutex_lock(&dc->lock);
        tegra_dc_get(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;
@@ -275,9 +269,6 @@ int tegra_dc_ext_cursor_clip(struct tegra_dc_ext_user *user,
        mutex_lock(&dc->lock);
        tegra_dc_get(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),