| From ced60c747ad2e5997adfbf2ce9a763b0ef36004c Mon Sep 17 00:00:00 2001 |
| From: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Date: Fri, 9 Aug 2013 09:34:35 -0700 |
| Subject: drm/i915: expose HDMI connectors on port C on BYT |
| |
| Ryan noticed that on his board, HDMI was wired up to port C but not |
| exposed by the kernel, which had only expected DP on that port. Fix |
| that up by enumerating both ports if possible. |
| |
| Tested-by: "Matsumura, Ryan" <ryan.matsumura@intel.com> |
| Acked-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> |
| [danvet: Fix up the whitespace fail. Tsk.] |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| |
| (cherry picked from commit 6f6005a52b79c2b2e3d58d8ab63791c378ebf82c) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 77f8ff1a4284..ee85aeab5667 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -9341,8 +9341,13 @@ static void intel_setup_outputs(struct drm_device *dev) |
| intel_dp_init(dev, PCH_DP_D, PORT_D); |
| } else if (IS_VALLEYVIEW(dev)) { |
| /* Check for built-in panel first. Shares lanes with HDMI on SDVOC */ |
| - if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED) |
| - intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C); |
| + if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED) { |
| + intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC, |
| + PORT_C); |
| + if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED) |
| + intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, |
| + PORT_C); |
| + } |
| |
| if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED) { |
| intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB, |
| -- |
| 1.8.5.rc3 |
| |
