From mboxrd@z Thu Jan 1 00:00:00 1970 From: Todd Previte Subject: Re: [PATCH v3] drm/i915: VLV2 - Fix hotplug detect bits Date: Thu, 23 Jan 2014 00:16:43 -0700 Message-ID: <52E0C1DB.6040604@gmail.com> References: <1390322330-6486-1-git-send-email-tprevite@gmail.com> <1390450952-3039-1-git-send-email-tprevite@gmail.com> <1390450952-3039-2-git-send-email-tprevite@gmail.com> <87iotbnqsy.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 7457FFBD7F for ; Wed, 22 Jan 2014 23:16:46 -0800 (PST) Received: by mail-pb0-f50.google.com with SMTP id rq2so1479237pbb.23 for ; Wed, 22 Jan 2014 23:16:46 -0800 (PST) In-Reply-To: <87iotbnqsy.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Jani Nikula , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On 01/22/2014 11:41 PM, Jani Nikula wrote: > On Thu, 23 Jan 2014, Todd Previte wrote: >> Add new definitions for hotplug live status bits for VLV2 since they're >> in reverse order from the gen4x ones. >> >> Changelog: >> - Restored gen4 bit definitions >> - Added new definitions for VLV2 >> - Added platform check for IS_VALLEYVIEW() in dp_detect to use the correct >> bit defintions >> > Btw this might be a relevant bug report: > https://bugs.freedesktop.org/show_bug.cgi?id=73951 Yeah looks like it. I think this patch (well V4 below) should address the problem. I'll update the bug momentarily. -T >> Signed-off-by: Todd Previte >> --- >> drivers/gpu/drm/i915/i915_reg.h | 11 ++++++++--- >> drivers/gpu/drm/i915/intel_dp.c | 39 +++++++++++++++++++++++++++------------ >> 2 files changed, 35 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h >> index 2d77b51..0e65717 100644 >> --- a/drivers/gpu/drm/i915/i915_reg.h >> +++ b/drivers/gpu/drm/i915/i915_reg.h >> @@ -2083,9 +2083,14 @@ >> * Please check the detailed lore in the commit message for for experimental >> * evidence. >> */ >> -#define PORTD_HOTPLUG_LIVE_STATUS (1 << 29) >> -#define PORTC_HOTPLUG_LIVE_STATUS (1 << 28) >> -#define PORTB_HOTPLUG_LIVE_STATUS (1 << 27) >> +/* VLV hot plug bits are different */ >> +#define VLV_PORTD_HOTPLUG_LIVE_STATUS (1 << 27) >> +#define VLV_PORTC_HOTPLUG_LIVE_STATUS (1 << 28) >> +#define VLV_PORTB_HOTPLUG_LIVE_STATUS (1 << 29) >> + >> +#define PORTD_HOTPLUG_LIVE_STATUS (1 << 29) >> +#define PORTC_HOTPLUG_LIVE_STATUS (1 << 28) >> +#define PORTB_HOTPLUG_LIVE_STATUS (1 << 27) >> #define PORTD_HOTPLUG_INT_STATUS (3 << 21) >> #define PORTC_HOTPLUG_INT_STATUS (3 << 19) >> #define PORTB_HOTPLUG_INT_STATUS (3 << 17) >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index 1386efb..1f080b2 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -2946,18 +2946,33 @@ g4x_dp_detect(struct intel_dp *intel_dp) >> return status; >> } >> >> - switch (intel_dig_port->port) { >> - case PORT_B: >> - bit = PORTB_HOTPLUG_LIVE_STATUS; >> - break; >> - case PORT_C: >> - bit = PORTC_HOTPLUG_LIVE_STATUS; >> - break; >> - case PORT_D: >> - bit = PORTD_HOTPLUG_LIVE_STATUS; >> - break; >> - default: >> - return connector_status_unknown; >> + if (IS_VALLEYVIEW(dev)) { >> + switch (intel_dig_port->port) { >> + case PORT_B: >> + bit = VLV_PORTB_HOTPLUG_LIVE_STATUS; >> + break; >> + case PORT_C: >> + bit = VLV_PORTC_HOTPLUG_LIVE_STATUS; >> + break; >> + case PORT_D: >> + bit = VLV_PORTD_HOTPLUG_LIVE_STATUS; >> + break; >> + default: >> + return connector_status_unknown; >> + } else { >> + switch (intel_dig_port->port) { >> + case PORT_B: >> + bit = PORTB_HOTPLUG_LIVE_STATUS; >> + break; >> + case PORT_C: >> + bit = PORTC_HOTPLUG_LIVE_STATUS; >> + break; >> + case PORT_D: >> + bit = PORTD_HOTPLUG_LIVE_STATUS; >> + break; >> + default: >> + return connector_status_unknown; >> + } >> } >> >> if ((I915_READ(PORT_HOTPLUG_STAT) & bit) == 0) >> -- >> 1.8.3.2 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx