From 375a86be9b23650cd96e46b07c7a0b5c10970797 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Fri, 18 Apr 2014 00:32:41 +0800 Subject: [PATCH] tegra124: Always enable DC when attaching SOR. We found that without enabling DC in tegra_dc_sor_enable_dc, kernel would have problem showing the text console before graphics interface is initialized, for example "chromeos factory install shim (text only)" or the "splash screen". BRANCH=none BUG=chrome-os-partner:28082 TEST=emerge-nyan coreboot chromeos-bootimage Boots factory install shim and see text console. Change-Id: I6fce963ceddd125dd52789d2ec843cc2ee05f1f5 Signed-off-by: Hung-Te Lin Reviewed-on: https://chromium-review.googlesource.com/195388 --- src/soc/nvidia/tegra124/sor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c index 4593c74601..cf2219943b 100644 --- a/src/soc/nvidia/tegra124/sor.c +++ b/src/soc/nvidia/tegra124/sor.c @@ -660,7 +660,8 @@ static void tegra_dc_sor_enable_dc(struct tegra_dc_sor_data *sor) WRITEL(reg_val | WRITE_MUX_ACTIVE, &disp_ctrl->cmd.state_access); WRITEL(VSYNC_H_POSITION(1), &disp_ctrl->disp.disp_timing_opt); - /* Enable DC */ + /* Enable DC now - otherwise pure text console may not show. */ + WRITEL(DISP_CTRL_MODE_C_DISPLAY, &disp_ctrl->cmd.disp_cmd); WRITEL(reg_val, &disp_ctrl->cmd.state_access); }