[Bug 88331] [IVB HDMI] PCH HDMI (0x000e1160) enabled on transcoder A, should be disabled - hdmi detect failure?

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=88331

--- Comment #18 from Chris Wilson <chris at chris-wilson.co.uk> ---
Ah, no eDP and so dpd_is_edp lies. Try

diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index ede580407450..bac218fe9347 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14152,17 +14152,19 @@ static void intel_setup_outputs(struct drm_device
*dev)
                                intel_dp_init(dev, PCH_DP_B, PORT_B);
                }

+               if (I915_READ(PCH_DP_C) & DP_DETECTED)
+                       intel_dp_init(dev, PCH_DP_C, PORT_C);
+
+               if (I915_READ(PCH_DP_D) & DP_DETECTED) {
+                       if (!intel_dp_init(dev, PCH_DP_D, PORT_D))
+                               dpd_is_edp = false;
+               }
+
                if (I915_READ(PCH_HDMIC) & SDVO_DETECTED)
                        intel_hdmi_init(dev, PCH_HDMIC, PORT_C);

                if (!dpd_is_edp && I915_READ(PCH_HDMID) & SDVO_DETECTED)
                        intel_hdmi_init(dev, PCH_HDMID, PORT_D);
-
-               if (I915_READ(PCH_DP_C) & DP_DETECTED)
-                       intel_dp_init(dev, PCH_DP_C, PORT_C);
-
-               if (I915_READ(PCH_DP_D) & DP_DETECTED)
-                       intel_dp_init(dev, PCH_DP_D, PORT_D);
        } else if (IS_VALLEYVIEW(dev)) {
                /*
                 * The DP_DETECTED bit is the latched state of the DDC

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20150717/1f9c5339/attachment.html>