intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Todd Previte <tprevite@gmail.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v3] drm/i915: VLV2 - Fix hotplug detect bits
Date: Thu, 23 Jan 2014 00:16:43 -0700	[thread overview]
Message-ID: <52E0C1DB.6040604@gmail.com> (raw)
In-Reply-To: <87iotbnqsy.fsf@intel.com>


On 01/22/2014 11:41 PM, Jani Nikula wrote:
> On Thu, 23 Jan 2014, Todd Previte <tprevite@gmail.com> 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 <tprevite@gmail.com>
>> ---
>>   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

  reply	other threads:[~2014-01-23  7:16 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-21 16:38 [PATCH] drm/i915: (VLV2) Fix the hotplug detection bits Todd Previte
2014-01-21 17:14 ` Jani Nikula
2014-01-21 17:22 ` [PATCH V2] " Todd Previte
2014-01-21 17:45   ` Daniel Vetter
2014-01-21 18:12     ` Ville Syrjälä
2014-01-21 17:49   ` Jani Nikula
2014-01-23  4:22 ` (no subject) Todd Previte
2014-01-23  4:22   ` [PATCH v3] drm/i915: VLV2 - Fix hotplug detect bits Todd Previte
2014-01-23  6:39     ` Jani Nikula
2014-01-23  6:41     ` Jani Nikula
2014-01-23  7:16       ` Todd Previte [this message]
2014-01-23  7:13 ` [PATCH V4] " Todd Previte
2014-01-23  7:13   ` [PATCH V4] drm/i915: " Todd Previte
2014-01-23 10:50     ` Daniel Vetter
2014-01-23 10:52       ` 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=52E0C1DB.6040604@gmail.com \
    --to=tprevite@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    /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;
as well as URLs for NNTP newsgroup(s).