summaryrefslogtreecommitdiff
path: root/src/soc/nvidia
diff options
context:
space:
mode:
authorJimmy Zhang <jimmzhang@nvidia.com>2014-04-11 15:39:02 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-12-16 23:22:21 +0100
commitf682ad0ebba39454b408f1b022e152f4b59a5e79 (patch)
tree3a3b7691b850806cf80b74c7d2f33f375f77cdd6 /src/soc/nvidia
parent3af0d310c1c074398a64dec0b4f4d500005767cc (diff)
nyan*: Apply sor fix from kernel dc driver
Correct SOR attaching sequence. https://chromium-review.googlesource.com/190300 BRANCH=none BUG=chrome-os-partner:27413 TEST=build nyan and nyan_big. nyan display works fine. nyan_big display still doesn't work until all related patches are built in. (CL:194737 and CL:194739) Original-Signed-off-by: Jimmy Zhang <jimmzhang@nvidia.com> Original-Change-Id: I8aaf65db90e5e45bd9097c9d38b231bd7d41d997 Original-Reviewed-on: https://chromium-review.googlesource.com/194403 Original-Reviewed-by: Hung-Te Lin <hungte@chromium.org> Original-Commit-Queue: Hung-Te Lin <hungte@chromium.org> Original-Tested-by: Hung-Te Lin <hungte@chromium.org> (cherry picked from commit fea9d288b98dcc6fc32dc93212fa7c4185603646) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I6646816809e29c63de65caa7e7146cd3d02902cf Reviewed-on: http://review.coreboot.org/7765 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/soc/nvidia')
-rw-r--r--src/soc/nvidia/tegra124/sor.c64
1 files changed, 33 insertions, 31 deletions
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 6151ae601f..5d463a8a81 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -633,55 +633,57 @@ void tegra_dc_sor_enable_dp(struct tegra_dc_sor_data *sor)
void tegra_dc_sor_attach(struct tegra_dc_sor_data *sor)
{
-
u32 reg_val;
struct display_controller *disp_ctrl = (void *)sor->dc->base;
tegra_dc_sor_enable_dc(sor);
tegra_dc_sor_config_panel(sor, 0);
- WRITEL(SOR_ENABLE, &disp_ctrl->disp.disp_win_opt);
+ WRITEL(0x9f00, &disp_ctrl->cmd.state_ctrl);
+ WRITEL(0x9f, &disp_ctrl->cmd.state_ctrl);
+
+ WRITEL(PW0_ENABLE | PW1_ENABLE | PW2_ENABLE |
+ PW3_ENABLE | PW4_ENABLE | PM0_ENABLE | PM1_ENABLE,
+ &disp_ctrl->cmd.disp_pow_ctrl);
reg_val = tegra_sor_readl(sor, NV_SOR_TEST);
- if (reg_val & NV_SOR_TEST_ATTACHED_TRUE) {
- printk(BIOS_INFO, "sor: Attached\n");
+ if (reg_val & NV_SOR_TEST_ATTACHED_TRUE)
return;
- }
+
+ tegra_sor_writel(sor, NV_SOR_SUPER_STATE1,
+ NV_SOR_SUPER_STATE1_ATTACHED_NO);
+
+ /*
+ * Enable display2sor clock at least 2 cycles before DC start,
+ * to clear sor internal valid signal.
+ */
+ WRITEL(SOR_ENABLE, &disp_ctrl->disp.disp_win_opt);
+ WRITEL(GENERAL_ACT_REQ, &disp_ctrl->cmd.state_ctrl);
+ WRITEL(0, &disp_ctrl->disp.disp_win_opt);
+ WRITEL(GENERAL_ACT_REQ, &disp_ctrl->cmd.state_ctrl);
/* Attach head */
tegra_dc_sor_update(sor);
- reg_val = NV_SOR_SUPER_STATE1_ASY_HEAD_OP_AWAKE |
- NV_SOR_SUPER_STATE1_ASY_ORMODE_NORMAL |
- NV_SOR_SUPER_STATE1_ATTACHED_NO;
- tegra_sor_writel(sor, NV_SOR_SUPER_STATE1, reg_val);
- tegra_dc_sor_super_update(sor);
-
- reg_val |= NV_SOR_SUPER_STATE1_ATTACHED_YES;
- tegra_sor_writel(sor, NV_SOR_SUPER_STATE1, reg_val);
+ tegra_sor_writel(sor, NV_SOR_SUPER_STATE1,
+ NV_SOR_SUPER_STATE1_ATTACHED_YES);
+ tegra_sor_writel(sor, NV_SOR_SUPER_STATE1,
+ NV_SOR_SUPER_STATE1_ATTACHED_YES |
+ NV_SOR_SUPER_STATE1_ASY_HEAD_OP_AWAKE |
+ NV_SOR_SUPER_STATE1_ASY_ORMODE_NORMAL);
tegra_dc_sor_super_update(sor);
- if (tegra_dc_sor_poll_register(sor, NV_SOR_TEST,
- NV_SOR_TEST_ATTACHED_DEFAULT_MASK,
- NV_SOR_TEST_ATTACHED_TRUE,
- 100, TEGRA_SOR_ATTACH_TIMEOUT_MS * 1000)) {
- printk(BIOS_ERR,
- "dc timeout waiting for ATTACHED = TRUE\n");
- }
-
- /* Enable dc after attaching head */
- WRITEL(0x9f00, &disp_ctrl->cmd.state_ctrl);
- WRITEL(0x9f, &disp_ctrl->cmd.state_ctrl);
- WRITEL(PW0_ENABLE | PW1_ENABLE | PW2_ENABLE |
- PW3_ENABLE | PW4_ENABLE | PM0_ENABLE | PM1_ENABLE,
- &disp_ctrl->cmd.disp_pow_ctrl);
+ /* Enable dc */
+ WRITEL(DISP_CTRL_MODE_C_DISPLAY, &disp_ctrl->cmd.disp_cmd);
+ WRITEL(SOR_ENABLE, &disp_ctrl->disp.disp_win_opt);
+ WRITEL(GENERAL_ACT_REQ, &disp_ctrl->cmd.state_ctrl);
if (tegra_dc_sor_poll_register(sor, NV_SOR_TEST,
NV_SOR_TEST_ACT_HEAD_OPMODE_DEFAULT_MASK,
NV_SOR_TEST_ACT_HEAD_OPMODE_AWAKE,
- 100, TEGRA_SOR_ATTACH_TIMEOUT_MS * 1000)) {
- printk(BIOS_ERR,
- "dc timeout waiting for OPMOD = AWAKE\n");
- }
+ 100, TEGRA_SOR_ATTACH_TIMEOUT_MS * 1000))
+ printk(BIOS_ERR, "dc timeout waiting for OPMOD = AWAKE\n");
+ else
+ printk(BIOS_INFO, "%s: sor is attached\n", __func__);
}
void tegra_dc_sor_set_lane_parm(struct tegra_dc_sor_data *sor,