diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 5a6138c62fe9..3647d03f21ce 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -793,28 +793,6 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder, | |||
793 | return true; | 793 | return true; |
794 | } | 794 | } |
795 | 795 | ||
796 | static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi) | ||
797 | { | ||
798 | struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi); | ||
799 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
800 | struct intel_digital_port *intel_dig_port = hdmi_to_dig_port(intel_hdmi); | ||
801 | uint32_t bit; | ||
802 | |||
803 | switch (intel_dig_port->port) { | ||
804 | case PORT_B: | ||
805 | bit = PORTB_HOTPLUG_LIVE_STATUS; | ||
806 | break; | ||
807 | case PORT_C: | ||
808 | bit = PORTC_HOTPLUG_LIVE_STATUS; | ||
809 | break; | ||
810 | default: | ||
811 | bit = 0; | ||
812 | break; | ||
813 | } | ||
814 | |||
815 | return I915_READ(PORT_HOTPLUG_STAT) & bit; | ||
816 | } | ||
817 | |||
818 | static enum drm_connector_status | 796 | static enum drm_connector_status |
819 | intel_hdmi_detect(struct drm_connector *connector, bool force) | 797 | intel_hdmi_detect(struct drm_connector *connector, bool force) |
820 | { | 798 | { |
@@ -827,13 +805,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) | |||
827 | struct edid *edid; | 805 | struct edid *edid; |
828 | enum drm_connector_status status = connector_status_disconnected; | 806 | enum drm_connector_status status = connector_status_disconnected; |
829 | 807 | ||
830 | |||
831 | if (IS_G4X(dev) && !g4x_hdmi_connected(intel_hdmi)) | ||
832 | return status; | ||
833 | else if (HAS_PCH_SPLIT(dev) && | ||
834 | !ibx_digital_port_connected(dev_priv, intel_dig_port)) | ||
835 | return status; | ||
836 | |||
837 | intel_hdmi->has_hdmi_sink = false; | 808 | intel_hdmi->has_hdmi_sink = false; |
838 | intel_hdmi->has_audio = false; | 809 | intel_hdmi->has_audio = false; |
839 | intel_hdmi->rgb_quant_range_selectable = false; | 810 | intel_hdmi->rgb_quant_range_selectable = false; |