From: Daniel Vetter <daniel@ffwll.ch>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: expose HDMI connectors on port C on BYT
Date: Fri, 9 Aug 2013 19:03:05 +0200 [thread overview]
Message-ID: <20130809170305.GD31670@phenom.ffwll.local> (raw)
In-Reply-To: <1376066075-12906-1-git-send-email-jbarnes@virtuousgeek.org>
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
prev parent reply other threads:[~2013-08-09 17:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-09 16:34 [PATCH] drm/i915: expose HDMI connectors on port C on BYT Jesse Barnes
2013-08-09 17:03 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130809170305.GD31670@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox