[PATCH] drm/i915: expose HDMI connectors on port C on BYT

[PATCH] drm/i915: expose HDMI connectors on port C on BYT

[Jesse Barnes]

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>
---
 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 a0914db..fe37908 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9343,8 +9343,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.7.9.5

Re: [PATCH] drm/i915: expose HDMI connectors on port C on BYT

[Daniel Vetter]

On Fri, Aug 09, 2013 at 09:34:35AM -0700, Jesse Barnes wrote:
> 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>
> ---
>  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 a0914db..fe37908 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9343,8 +9343,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);
> +		}

Spaces instead of tabs in the above hunk. Tsk, tsk ...

Fixed while applying.
-Daniel
>  
>  		if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED) {
>  			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch