From: Jesse Barnes Date: Fri, 8 Mar 2013 18:46:03 +0000 (-0800) Subject: drm/i915: VLV doesn't have HDMI on port C X-Git-Tag: v3.10-rc1~110^2~60^2~8 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=34c61c6e0b4cb3b05895b28823eb9f1da925ad87;p=linux-2.6-block.git drm/i915: VLV doesn't have HDMI on port C Port C is for eDP. Port B is shared between HDMI and DP. Signed-off-by: Jesse Barnes Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6953f88bf04d..72dd3fd8e9c1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8405,11 +8405,6 @@ static void intel_setup_outputs(struct drm_device *dev) if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED) intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B); } - - if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED) - intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC, - PORT_C); - } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) { bool found = false;