From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 5/6] drm/i915: Implement ibx_digital_port_connected() for IBX Date: Fri, 14 Dec 2012 11:43:09 +0200 Message-ID: <87ip852clu.fsf@intel.com> References: <1355414944-1494-1-git-send-email-damien.lespiau@gmail.com> <1355414944-1494-5-git-send-email-damien.lespiau@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id BF5F2E5C77 for ; Fri, 14 Dec 2012 01:42:07 -0800 (PST) In-Reply-To: <1355414944-1494-5-git-send-email-damien.lespiau@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Damien Lespiau , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, 13 Dec 2012, Damien Lespiau wrote: > From: Damien Lespiau > > 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 > > Signed-off-by: Damien Lespiau > --- > 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