From: Jani Nikula <jani.nikula@linux.intel.com>
To: Damien Lespiau <damien.lespiau@gmail.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 5/6] drm/i915: Implement ibx_digital_port_connected() for IBX
Date: Fri, 14 Dec 2012 11:43:09 +0200 [thread overview]
Message-ID: <87ip852clu.fsf@intel.com> (raw)
In-Reply-To: <1355414944-1494-5-git-send-email-damien.lespiau@gmail.com>
On Thu, 13 Dec 2012, Damien Lespiau <damien.lespiau@gmail.com> wrote:
> From: Damien Lespiau <damien.lespiau@intel.com>
>
> CPT+ PCHs have different bit definition to read the HPD live status. I
> don't have an ILK with digital ports handy, which is why this patch is
> separate from the CPT+ implementation. If the docs don't lie, it should
> all be fine though.
As said, could be squashed into 2/6, but I understand your reason to
keep it separate.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 44 +++++++++++++++++++++++-------------
> 1 file changed, 28 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 21fedf7..10759ea 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1006,22 +1006,34 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
> {
> u32 bit;
>
> - /* XXX: IBX has different SDEISR bits */
> - if (HAS_PCH_IBX(dev_priv->dev))
> - return true;
> -
> - switch(port->port) {
> - case PORT_B:
> - bit = SDE_PORTB_HOTPLUG_CPT;
> - break;
> - case PORT_C:
> - bit = SDE_PORTC_HOTPLUG_CPT;
> - break;
> - case PORT_D:
> - bit = SDE_PORTD_HOTPLUG_CPT;
> - break;
> - default:
> - return true;
> + if (HAS_PCH_IBX(dev_priv->dev)) {
> + switch(port->port) {
> + case PORT_B:
> + bit = SDE_PORTB_HOTPLUG;
> + break;
> + case PORT_C:
> + bit = SDE_PORTC_HOTPLUG;
> + break;
> + case PORT_D:
> + bit = SDE_PORTD_HOTPLUG;
> + break;
> + default:
> + return true;
> + }
> + } else {
> + switch(port->port) {
> + case PORT_B:
> + bit = SDE_PORTB_HOTPLUG_CPT;
> + break;
> + case PORT_C:
> + bit = SDE_PORTC_HOTPLUG_CPT;
> + break;
> + case PORT_D:
> + bit = SDE_PORTD_HOTPLUG_CPT;
> + break;
> + default:
> + return true;
> + }
> }
>
> return I915_READ(SDEISR) & bit;
> --
> 1.7.11.7
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2012-12-14 9:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 16:08 [PATCH 1/6] drm/i915: Cleanup SHOTPLUG_CTL status bits definitions Damien Lespiau
2012-12-13 16:09 ` [PATCH 2/6] drm/i915/hdmi: Read the HPD status before trying to read the EDID Damien Lespiau
2012-12-14 9:34 ` Jani Nikula
2012-12-13 16:09 ` [PATCH 3/6] drm/i915/dp: Read the HPD status before trying to read the DPCD Damien Lespiau
2012-12-14 10:17 ` Daniel Vetter
2012-12-13 16:09 ` [PATCH 4/6] drm/i915/dp: Log the DPCD only if we have successfully retrieved one Damien Lespiau
2012-12-14 9:40 ` Jani Nikula
2012-12-13 16:09 ` [PATCH 5/6] drm/i915: Implement ibx_digital_port_connected() for IBX Damien Lespiau
2012-12-14 9:43 ` Jani Nikula [this message]
2012-12-13 16:09 ` [PATCH 6/6] drm/i915: Remove stale comment about intel_dp_detect() Damien Lespiau
2012-12-14 9:46 ` Jani Nikula
2012-12-14 10:20 ` Daniel Vetter
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=87ip852clu.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=damien.lespiau@gmail.com \
--cc=intel-gfx@lists.freedesktop.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