summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/hdmi_state_machine.h
diff options
context:
space:
mode:
authorXia Yang <xiay@nvidia.com>2013-11-18 15:46:08 -0800
committerJon Mayo <jmayo@nvidia.com>2014-03-17 11:23:52 -0700
commit8fdb56c5d010c1c57c90c91a39faeda1297c0418 (patch)
tree329ab9d1d8989b788b6b609df11999d19cff9604 /drivers/video/tegra/dc/hdmi_state_machine.h
parent20cdfc6abb0e294fa7e7cd47532ea687d7582412 (diff)
video: tegra: hdmi: remove unnecessary reset in SM
Change tegra_dc_hdmi_detect() to return HPD status. Change HDMI state machine not to reset HDMI if bootloader have set it up. Bug 1401958 Bug 1425201 Change-Id: Iea5f4648083a01619888d7d805be7231e1202f2e Signed-off-by: Xia Yang <xiay@nvidia.com> Reviewed-on: http://git-master/r/355335 Reviewed-by: Automatic_Commit_Validation_User Tested-by: Jon Mayo <jmayo@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/hdmi_state_machine.h')
-rw-r--r--drivers/video/tegra/dc/hdmi_state_machine.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/hdmi_state_machine.h b/drivers/video/tegra/dc/hdmi_state_machine.h
index 5509cba3e02c..43d9fe71034b 100644
--- a/drivers/video/tegra/dc/hdmi_state_machine.h
+++ b/drivers/video/tegra/dc/hdmi_state_machine.h
@@ -4,7 +4,7 @@
* HDMI library support functions for Nvidia Tegra processors.
*
* Copyright (C) 2013 Google - http://www.google.com/
- * Copyright (C) 2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (C) 2013-2014, NVIDIA CORPORATION. All rights reserved.
* Authors: John Grossman <johngro@google.com>
* Authors: Mike J. Chen <mjchen@google.com>
*
@@ -84,6 +84,12 @@ enum {
*/
HDMI_STATE_DONE_RECHECK_EDID,
+ /* Initial state at boot that checks if HDMI is already initialized
+ * by bootloader and not go to HDMI_STATE_RESET which would disable
+ * HDMI and cause blanking of the bootloader displayed image.
+ */
+ HDMI_STATE_INIT_FROM_BOOTLOADER,
+
/* STATE_COUNT must be the final state in the enum.
* 1) Do not add states after STATE_COUNT.
* 2) Do not assign explicit values to the states.