Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: "José Roberto de Souza" <jose.souza@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/dp: Do not switch aux to TBT mode for non-TC ports
Date: Tue, 29 Oct 2019 12:03:26 +0200	[thread overview]
Message-ID: <20191029100326.GA12142@ideak-desk.fi.intel.com> (raw)
In-Reply-To: <20191029011014.286885-1-jose.souza@intel.com>

On Mon, Oct 28, 2019 at 06:10:14PM -0700, José Roberto de Souza wrote:
> Non-TC ports always have tc_mode == TC_PORT_TBT_ALT so it was
> switching aux to TC mode for all combo-phy ports, happily this did
> not caused any issue but is better follow BSpec.
> Also this is reserved bit before ICL.
> 
> Fixes: 6f211ed43438 ("drm/i915/icl: Set TBT IO in Aux transaction")

This actually
Fixes: e9b7e1422d40 ("drm/i915: Sanitize the terminology used for TypeC port modes")

thanks for spotting it.

> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 86989ec25bc6..379623397301 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -1291,6 +1291,9 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
>  				u32 unused)
>  {
>  	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> +	struct drm_i915_private *i915 =
> +			to_i915(intel_dig_port->base.base.dev);
> +	enum phy phy = intel_port_to_phy(i915, intel_dig_port->base.port);
>  	u32 ret;
>  
>  	ret = DP_AUX_CH_CTL_SEND_BUSY |
> @@ -1303,7 +1306,8 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
>  	      DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
>  	      DP_AUX_CH_CTL_SYNC_PULSE_SKL(32);
>  
> -	if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
> +	if (intel_phy_is_tc(i915, phy) &&
> +	    intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
>  		ret |= DP_AUX_CH_CTL_TBT_IO;
>  
>  	return ret;
> -- 
> 2.23.0
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Imre Deak <imre.deak@intel.com>
To: "José Roberto de Souza" <jose.souza@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/dp: Do not switch aux to TBT mode for non-TC ports
Date: Tue, 29 Oct 2019 12:03:26 +0200	[thread overview]
Message-ID: <20191029100326.GA12142@ideak-desk.fi.intel.com> (raw)
Message-ID: <20191029100326.zBnKGtoEW9zxb9QQD2cFxl4MBcExi8pGpgUlJnS_-5Y@z> (raw)
In-Reply-To: <20191029011014.286885-1-jose.souza@intel.com>

On Mon, Oct 28, 2019 at 06:10:14PM -0700, José Roberto de Souza wrote:
> Non-TC ports always have tc_mode == TC_PORT_TBT_ALT so it was
> switching aux to TC mode for all combo-phy ports, happily this did
> not caused any issue but is better follow BSpec.
> Also this is reserved bit before ICL.
> 
> Fixes: 6f211ed43438 ("drm/i915/icl: Set TBT IO in Aux transaction")

This actually
Fixes: e9b7e1422d40 ("drm/i915: Sanitize the terminology used for TypeC port modes")

thanks for spotting it.

> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 86989ec25bc6..379623397301 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -1291,6 +1291,9 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
>  				u32 unused)
>  {
>  	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> +	struct drm_i915_private *i915 =
> +			to_i915(intel_dig_port->base.base.dev);
> +	enum phy phy = intel_port_to_phy(i915, intel_dig_port->base.port);
>  	u32 ret;
>  
>  	ret = DP_AUX_CH_CTL_SEND_BUSY |
> @@ -1303,7 +1306,8 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
>  	      DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
>  	      DP_AUX_CH_CTL_SYNC_PULSE_SKL(32);
>  
> -	if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
> +	if (intel_phy_is_tc(i915, phy) &&
> +	    intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
>  		ret |= DP_AUX_CH_CTL_TBT_IO;
>  
>  	return ret;
> -- 
> 2.23.0
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-10-29 10:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29  1:10 [PATCH] drm/i915/dp: Do not switch aux to TBT mode for non-TC ports José Roberto de Souza
2019-10-29  1:10 ` [Intel-gfx] " José Roberto de Souza
2019-10-29  2:23 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-10-29  2:23   ` [Intel-gfx] " Patchwork
2019-10-29 10:03 ` Imre Deak [this message]
2019-10-29 10:03   ` [Intel-gfx] [PATCH] " Imre Deak
2019-10-30  2:30 ` ✓ Fi.CI.BAT: success for drm/i915/dp: Do not switch aux to TBT mode for non-TC ports (rev2) Patchwork
2019-10-30  2:30   ` [Intel-gfx] " Patchwork
2019-10-31  5:38 ` ✓ Fi.CI.IGT: " Patchwork
2019-10-31  5:38   ` [Intel-gfx] " Patchwork
2019-10-31 17:26   ` Souza, Jose
2019-10-31 17:26     ` [Intel-gfx] " Souza, Jose

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=20191029100326.GA12142@ideak-desk.fi.intel.com \
    --to=imre.deak@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jose.souza@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