Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+
Date: Fri, 22 Nov 2019 16:01:51 +0200	[thread overview]
Message-ID: <20191122140151.GM1208@intel.com> (raw)
In-Reply-To: <20191122134603.11496-1-kai.vehmanen@linux.intel.com>

On Fri, Nov 22, 2019 at 03:46:02PM +0200, Kai Vehmanen wrote:
> Starting with gen12, PORT_A can be connected to a transcoder
> with audio support. Modify the existing logic that disabled
> audio on PORT_A unconditionally.
> 
> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 0a023f3e633b..c50cf809b44c 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2341,7 +2341,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>  		return ret;
>  
>  	pipe_config->has_drrs = false;
> -	if (IS_G4X(dev_priv) || port == PORT_A)
> +	if (IS_G4X(dev_priv) || (INTEL_GEN(dev_priv) < 12 && port == PORT_A))

Getting a bit messy.

Hoovering that into something like
static bool intel_dp_port_has_audio(struct intel_encoder *encoder);
or
static bool intel_dp_port_has_audio(struct drm_i915_private *dev_priv, enum port port);
might be nice.


>  		pipe_config->has_audio = false;
>  	else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
>  		pipe_config->has_audio = intel_dp->has_audio;
> -- 
> 2.17.1

-- 
Ville Syrjälä
Intel
_______________________________________________
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: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+
Date: Fri, 22 Nov 2019 16:01:51 +0200	[thread overview]
Message-ID: <20191122140151.GM1208@intel.com> (raw)
Message-ID: <20191122140151.2ElGxtNrCop3TnBXmqn7kthiOgctu21j77A5Ez-KwzM@z> (raw)
In-Reply-To: <20191122134603.11496-1-kai.vehmanen@linux.intel.com>

On Fri, Nov 22, 2019 at 03:46:02PM +0200, Kai Vehmanen wrote:
> Starting with gen12, PORT_A can be connected to a transcoder
> with audio support. Modify the existing logic that disabled
> audio on PORT_A unconditionally.
> 
> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 0a023f3e633b..c50cf809b44c 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2341,7 +2341,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>  		return ret;
>  
>  	pipe_config->has_drrs = false;
> -	if (IS_G4X(dev_priv) || port == PORT_A)
> +	if (IS_G4X(dev_priv) || (INTEL_GEN(dev_priv) < 12 && port == PORT_A))

Getting a bit messy.

Hoovering that into something like
static bool intel_dp_port_has_audio(struct intel_encoder *encoder);
or
static bool intel_dp_port_has_audio(struct drm_i915_private *dev_priv, enum port port);
might be nice.


>  		pipe_config->has_audio = false;
>  	else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
>  		pipe_config->has_audio = intel_dp->has_audio;
> -- 
> 2.17.1

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-11-22 14:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-22 13:46 [PATCH 1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+ Kai Vehmanen
2019-11-22 13:46 ` [Intel-gfx] " Kai Vehmanen
2019-11-22 13:46 ` [PATCH 2/2] drm/i915/dp: fix DP infoframe init " Kai Vehmanen
2019-11-22 13:46   ` [Intel-gfx] " Kai Vehmanen
2019-11-22 14:01 ` Ville Syrjälä [this message]
2019-11-22 14:01   ` [Intel-gfx] [PATCH 1/2] drm/i915/dp: fix DP audio " Ville Syrjälä
2019-11-25 12:54   ` Kai Vehmanen
2019-11-25 12:54     ` [Intel-gfx] " Kai Vehmanen
2019-11-22 14:51 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2019-11-22 14:51   ` [Intel-gfx] " Patchwork
2019-11-23 22:12 ` ✓ Fi.CI.IGT: " Patchwork
2019-11-23 22:12   ` [Intel-gfx] " Patchwork

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=20191122140151.GM1208@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kai.vehmanen@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