From: Erik Gilling <konkers@android.com>
Date: Mon, 7 Feb 2011 23:18:22 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~42
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e51ab3740df4c2880507045f999c4bde3563c6a2;p=firefly-linux-kernel-4.4.55.git

Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: I6fcdbcd0eb7103ac580deb94faf79959a5818ba1
---

e51ab3740df4c2880507045f999c4bde3563c6a2
diff --cc drivers/video/tegra/dc/hdmi.c
index dd2a51195880,cebcdc35d889..3e274ecb73de
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -456,14 -455,12 +458,17 @@@ static bool tegra_dc_hdmi_detect(struc
  	dc->out->h_size = specs.max_x * 1000;
  	dc->out->v_size = specs.max_y * 1000;
  
+ 
+ 	hdmi->dvi = !(specs.misc & FB_MISC_HDMI);
+ 
  	tegra_fb_update_monspecs(dc->fb, &specs, tegra_dc_hdmi_mode_filter);
 +	switch_set_state(&hdmi->hpd_switch, 1);
  	dev_info(&dc->ndev->dev, "display detected\n");
  	return true;
 +
 +fail:
 +	switch_set_state(&hdmi->hpd_switch, 0);
 +	return false;
  }