]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: hdmi: Fix HDMI connect state
authorXia Yang <xiay@nvidia.com>
Tue, 1 Jul 2014 21:04:46 +0000 (14:04 -0700)
committerJon Mayo <jmayo@nvidia.com>
Fri, 7 Nov 2014 16:57:02 +0000 (08:57 -0800)
Revert 006fffc2 partially to fix HDMI connect state tracking.

Bug 1459374

Change-Id: Icc1b0eee3ae6f4202b4a46f858d447ad5656aebc
Signed-off-by: Xia Yang <xiay@nvidia.com>
Reviewed-on: http://git-master/r/433313
(cherry picked from commit cdc5a6db139f85d7048669c278822f3832394bcc)
Reviewed-on: http://git-master/r/438984
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
drivers/video/tegra/dc/hdmi_state_machine.c

index 7fa0c046ebe7ad06d5322226f38e7d5077b125cd..43a54c66e80b2db9075c17ec7fccca6f3db2619f 100644 (file)
@@ -182,7 +182,7 @@ static void hdmi_disable_l(struct tegra_dc_hdmi_data *hdmi)
        pr_info("%s: hpd_switch 0\n", __func__);
 #endif
        tegra_nvhdcp_set_plug(hdmi->nvhdcp, 0);
-       if (hdmi->dc->enabled) {
+       if (hdmi->dc->connected) {
                pr_info("HDMI from connected to disconnected\n");
                tegra_dc_disable(hdmi->dc);
                tegra_dc_ext_process_hotplug(hdmi->dc->ndev->id);