[16/22] drm/i915/audio: Hardware ELD readout

Message ID	20221011170011.17198-17-ville.syrjala@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: Ville Syrjala <ville.syrjala@linux.intel.com> To: intel-gfx@lists.freedesktop.org Date: Tue, 11 Oct 2022 20:00:05 +0300 Message-Id: <20221011170011.17198-17-ville.syrjala@linux.intel.com> In-Reply-To: <20221011170011.17198-1-ville.syrjala@linux.intel.com> References: <20221011170011.17198-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH 16/22] drm/i915/audio: Hardware ELD readout Precedence: list Cc: Takashi Iwai <tiwai@suse.de> Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	drm/i915: ELD precompute and readout \| expand [00/22] drm/i915: ELD precompute and readout [01/22] drm/i915/audio: s/dev_priv/i915/ [02/22] drm/i915/audio: Nuke leftover ROUNDING_FACTOR [03/22] drm/i915/audio: Remove CL/BLC audio stuff [04/22] drm/i915/audio: Exract struct ilk_audio_regs [05/22] drm/i915/audio: Use REG_BIT() & co. [06/22] drm/i915/audio: Unify register bit naming [07/22] drm/i915/audio: Protect singleton register with a lock [08/22] drm/i915/audio: Nuke intel_eld_uptodate() [09/22] drm/i915/audio: Read ELD buffer size from hardware [10/22] drm/i915/audio: Make sure we write the whole ELD buffer [11/22] drm/i915/audio: Use u32* for ELD [12/22] drm/i915/audio: Use intel_de_rmw() for most audio registers [13/22] drm/i915/audio: Split "ELD valid" vs. audio PD on hsw+ [14/22] drm/i915/audio: Do the vblank waits [15/22] drm/i915/audio: Precompute the ELD [16/22] drm/i915/audio: Hardware ELD readout [17/22] drm/i915/sdvo: Extract intel_sdvo_has_audio() [18/22] drm/i915/sdvo: Precompute the ELD [19/22] drm/i915/sdvo: Do ELD hardware readout [20/22] drm/i915/audio: Hook up ELD into the state checker [21/22] drm/i915/audio: Include ELD in the state dump [22/22] hax: drm/i915/audio: Make HSW hardware ELD buffer sort of work

Message ID

20221011170011.17198-17-ville.syrjala@linux.intel.com (mailing list archive)

State

New, archived

Headers

From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Date: Tue, 11 Oct 2022 20:00:05 +0300
Message-Id: <20221011170011.17198-17-ville.syrjala@linux.intel.com>
In-Reply-To: <20221011170011.17198-1-ville.syrjala@linux.intel.com>
References: <20221011170011.17198-1-ville.syrjala@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Intel-gfx] [PATCH 16/22] drm/i915/audio: Hardware ELD readout
Precedence: list
Cc: Takashi Iwai <tiwai@suse.de>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>

Series

drm/i915: ELD precompute and readout | expand

Commit Message

Ville Syrjälä Oct. 11, 2022, 5 p.m. UTC

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Read out the ELD from the hardware buffer so that we can
hook up the state checker to validate it.

Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/g4x_dp.c      |  2 +
 drivers/gpu/drm/i915/display/g4x_hdmi.c    |  2 +
 drivers/gpu/drm/i915/display/intel_audio.c | 88 ++++++++++++++++++++++
 drivers/gpu/drm/i915/display/intel_audio.h |  2 +
 drivers/gpu/drm/i915/display/intel_ddi.c   |  2 +
 5 files changed, 96 insertions(+)

Comments

Jani Nikula Oct. 12, 2022, 3:19 p.m. UTC | #1

On Tue, 11 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Read out the ELD from the hardware buffer so that we can
> hook up the state checker to validate it.
>
> Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
> Cc: Takashi Iwai <tiwai@suse.de>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/g4x_dp.c      |  2 +
>  drivers/gpu/drm/i915/display/g4x_hdmi.c    |  2 +
>  drivers/gpu/drm/i915/display/intel_audio.c | 88 ++++++++++++++++++++++
>  drivers/gpu/drm/i915/display/intel_audio.h |  2 +
>  drivers/gpu/drm/i915/display/intel_ddi.c   |  2 +
>  5 files changed, 96 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
> index e3e3d27ffb53..4fc7153ad35a 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -397,6 +397,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
>  
>  	if (intel_dp_is_edp(intel_dp))
>  		intel_edp_fixup_vbt_bpp(encoder, pipe_config->pipe_bpp);
> +
> +	intel_audio_codec_get_config(encoder, pipe_config);
>  }
>  
>  static void
> diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> index 8aadf96fa5e9..478878abada6 100644
> --- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> @@ -142,6 +142,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
>  	intel_read_infoframe(encoder, pipe_config,
>  			     HDMI_INFOFRAME_TYPE_VENDOR,
>  			     &pipe_config->infoframes.hdmi);
> +
> +	intel_audio_codec_get_config(encoder, pipe_config);
>  }
>  
>  static void g4x_enable_hdmi(struct intel_atomic_state *state,
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
> index 39291e870635..328c47719fd8 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.c
> +++ b/drivers/gpu/drm/i915/display/intel_audio.c
> @@ -71,6 +71,8 @@ struct intel_audio_funcs {
>  	void (*audio_codec_disable)(struct intel_encoder *encoder,
>  				    const struct intel_crtc_state *old_crtc_state,
>  				    const struct drm_connector_state *old_conn_state);
> +	void (*audio_codec_get_config)(struct intel_encoder *encoder,
> +				       struct intel_crtc_state *crtc_state);
>  };
>  
>  /* DP N/M table */
> @@ -313,6 +315,27 @@ static int g4x_eld_buffer_size(struct drm_i915_private *i915)
>  	return REG_FIELD_GET(G4X_ELD_BUFFER_SIZE_MASK, tmp);
>  }
>  
> +static void g4x_audio_codec_get_config(struct intel_encoder *encoder,
> +				       struct intel_crtc_state *crtc_state)
> +{
> +	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> +	u32 *eld = (u32 *)crtc_state->eld;
> +	int eld_buffer_size, len, i;
> +	u32 tmp;
> +
> +	tmp = intel_de_read(i915, G4X_AUD_CNTL_ST);
> +	if ((tmp & G4X_ELD_VALID) == 0)
> +		return;
> +
> +	intel_de_rmw(i915, G4X_AUD_CNTL_ST, G4X_ELD_ADDRESS_MASK, 0);
> +
> +	eld_buffer_size = g4x_eld_buffer_size(i915);
> +	len = min_t(int, sizeof(crtc_state->eld) / 4, eld_buffer_size);
> +
> +	for (i = 0; i < len; i++)
> +		eld[i] = intel_de_read(i915, G4X_HDMIW_HDMIEDID);
> +}
> +
>  static void g4x_audio_codec_disable(struct intel_encoder *encoder,
>  				    const struct intel_crtc_state *old_crtc_state,
>  				    const struct drm_connector_state *old_conn_state)
> @@ -467,6 +490,29 @@ static int hsw_eld_buffer_size(struct drm_i915_private *i915,
>  	return REG_FIELD_GET(IBX_ELD_BUFFER_SIZE_MASK, tmp);
>  }
>  
> +static void hsw_audio_codec_get_config(struct intel_encoder *encoder,
> +				       struct intel_crtc_state *crtc_state)
> +{
> +	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> +	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
> +	u32 *eld = (u32 *)crtc_state->eld;
> +	int eld_buffer_size, len, i;
> +	u32 tmp;
> +
> +	tmp = intel_de_read(i915, HSW_AUD_PIN_ELD_CP_VLD);
> +	if ((tmp & AUDIO_ELD_VALID(cpu_transcoder)) == 0)
> +		return;
> +
> +	intel_de_rmw(i915, HSW_AUD_DIP_ELD_CTRL(cpu_transcoder),
> +		     IBX_ELD_ADDRESS_MASK, 0);
> +
> +	eld_buffer_size = hsw_eld_buffer_size(i915, cpu_transcoder);
> +	len = min_t(int, sizeof(crtc_state->eld) / 4, eld_buffer_size);
> +
> +	for (i = 0; i < len; i++)
> +		eld[i] = intel_de_read(i915, HSW_AUD_EDID_DATA(cpu_transcoder));
> +}
> +
>  static void hsw_audio_codec_disable(struct intel_encoder *encoder,
>  				    const struct intel_crtc_state *old_crtc_state,
>  				    const struct drm_connector_state *old_conn_state)
> @@ -700,6 +746,33 @@ static int ilk_eld_buffer_size(struct drm_i915_private *i915,
>  	return REG_FIELD_GET(IBX_ELD_BUFFER_SIZE_MASK, tmp);
>  }
>  
> +static void ilk_audio_codec_get_config(struct intel_encoder *encoder,
> +				       struct intel_crtc_state *crtc_state)
> +{
> +	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> +	struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> +	u32 *eld = (u32 *)crtc_state->eld;
> +	enum port port = encoder->port;
> +	enum pipe pipe = crtc->pipe;
> +	int eld_buffer_size, len, i;
> +	struct ilk_audio_regs regs;
> +	u32 tmp;
> +
> +	ilk_audio_regs_init(i915, pipe, &regs);
> +
> +	tmp = intel_de_read(i915, regs.aud_cntrl_st2);
> +	if ((tmp & IBX_ELD_VALID(port)) == 0)
> +		return;
> +
> +	intel_de_rmw(i915, regs.aud_cntl_st, IBX_ELD_ADDRESS_MASK, 0);
> +
> +	eld_buffer_size = ilk_eld_buffer_size(i915, pipe);
> +	len = min_t(int, sizeof(crtc_state->eld) / 4, eld_buffer_size);
> +
> +	for (i = 0; i < len; i++)
> +		eld[i] = intel_de_read(i915, regs.hdmiw_hdmiedid);
> +}
> +
>  static void ilk_audio_codec_disable(struct intel_encoder *encoder,
>  				    const struct intel_crtc_state *old_crtc_state,
>  				    const struct drm_connector_state *old_conn_state)
> @@ -919,19 +992,34 @@ void intel_audio_codec_disable(struct intel_encoder *encoder,
>  	intel_lpe_audio_notify(i915, pipe, port, NULL, 0, false);
>  }
>  
> +void intel_audio_codec_get_config(struct intel_encoder *encoder,
> +				  struct intel_crtc_state *crtc_state)
> +{
> +	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> +
> +	if (!crtc_state->has_audio)
> +		return;
> +
> +	if (i915->display.funcs.audio)
> +		i915->display.funcs.audio->audio_codec_get_config(encoder, crtc_state);
> +}
> +
>  static const struct intel_audio_funcs g4x_audio_funcs = {
>  	.audio_codec_enable = g4x_audio_codec_enable,
>  	.audio_codec_disable = g4x_audio_codec_disable,
> +	.audio_codec_get_config = g4x_audio_codec_get_config,
>  };
>  
>  static const struct intel_audio_funcs ilk_audio_funcs = {
>  	.audio_codec_enable = ilk_audio_codec_enable,
>  	.audio_codec_disable = ilk_audio_codec_disable,
> +	.audio_codec_get_config = ilk_audio_codec_get_config,
>  };
>  
>  static const struct intel_audio_funcs hsw_audio_funcs = {
>  	.audio_codec_enable = hsw_audio_codec_enable,
>  	.audio_codec_disable = hsw_audio_codec_disable,
> +	.audio_codec_get_config = hsw_audio_codec_get_config,
>  };
>  
>  /**
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h
> index b9070f336bcf..e35108b7dbc0 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.h
> +++ b/drivers/gpu/drm/i915/display/intel_audio.h
> @@ -23,6 +23,8 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
>  void intel_audio_codec_disable(struct intel_encoder *encoder,
>  			       const struct intel_crtc_state *old_crtc_state,
>  			       const struct drm_connector_state *old_conn_state);
> +void intel_audio_codec_get_config(struct intel_encoder *encoder,
> +				  struct intel_crtc_state *crtc_state);
>  void intel_audio_cdclk_change_pre(struct drm_i915_private *dev_priv);
>  void intel_audio_cdclk_change_post(struct drm_i915_private *dev_priv);
>  void intel_audio_init(struct drm_i915_private *dev_priv);
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 971356237eca..d7f1bc75cf26 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3463,6 +3463,8 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
>  	intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC);
>  
>  	intel_psr_get_config(encoder, pipe_config);
> +
> +	intel_audio_codec_get_config(encoder, pipe_config);
>  }
>  
>  void intel_ddi_get_clock(struct intel_encoder *encoder,

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index e3e3d27ffb53..4fc7153ad35a 100644
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -397,6 +397,8 @@  static void intel_dp_get_config(struct intel_encoder *encoder,
 
 	if (intel_dp_is_edp(intel_dp))
 		intel_edp_fixup_vbt_bpp(encoder, pipe_config->pipe_bpp);
+
+	intel_audio_codec_get_config(encoder, pipe_config);
 }
 
 static void
diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
index 8aadf96fa5e9..478878abada6 100644
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
@@ -142,6 +142,8 @@  static void intel_hdmi_get_config(struct intel_encoder *encoder,
 	intel_read_infoframe(encoder, pipe_config,
 			     HDMI_INFOFRAME_TYPE_VENDOR,
 			     &pipe_config->infoframes.hdmi);
+
+	intel_audio_codec_get_config(encoder, pipe_config);
 }
 
 static void g4x_enable_hdmi(struct intel_atomic_state *state,
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 39291e870635..328c47719fd8 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -71,6 +71,8 @@  struct intel_audio_funcs {
 	void (*audio_codec_disable)(struct intel_encoder *encoder,
 				    const struct intel_crtc_state *old_crtc_state,
 				    const struct drm_connector_state *old_conn_state);
+	void (*audio_codec_get_config)(struct intel_encoder *encoder,
+				       struct intel_crtc_state *crtc_state);
 };
 
 /* DP N/M table */
@@ -313,6 +315,27 @@  static int g4x_eld_buffer_size(struct drm_i915_private *i915)
 	return REG_FIELD_GET(G4X_ELD_BUFFER_SIZE_MASK, tmp);
 }
 
+static void g4x_audio_codec_get_config(struct intel_encoder *encoder,
+				       struct intel_crtc_state *crtc_state)
+{
+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+	u32 *eld = (u32 *)crtc_state->eld;
+	int eld_buffer_size, len, i;
+	u32 tmp;
+
+	tmp = intel_de_read(i915, G4X_AUD_CNTL_ST);
+	if ((tmp & G4X_ELD_VALID) == 0)
+		return;
+
+	intel_de_rmw(i915, G4X_AUD_CNTL_ST, G4X_ELD_ADDRESS_MASK, 0);
+
+	eld_buffer_size = g4x_eld_buffer_size(i915);
+	len = min_t(int, sizeof(crtc_state->eld) / 4, eld_buffer_size);
+
+	for (i = 0; i < len; i++)
+		eld[i] = intel_de_read(i915, G4X_HDMIW_HDMIEDID);
+}
+
 static void g4x_audio_codec_disable(struct intel_encoder *encoder,
 				    const struct intel_crtc_state *old_crtc_state,
 				    const struct drm_connector_state *old_conn_state)
@@ -467,6 +490,29 @@  static int hsw_eld_buffer_size(struct drm_i915_private *i915,
 	return REG_FIELD_GET(IBX_ELD_BUFFER_SIZE_MASK, tmp);
 }
 
+static void hsw_audio_codec_get_config(struct intel_encoder *encoder,
+				       struct intel_crtc_state *crtc_state)
+{
+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
+	u32 *eld = (u32 *)crtc_state->eld;
+	int eld_buffer_size, len, i;
+	u32 tmp;
+
+	tmp = intel_de_read(i915, HSW_AUD_PIN_ELD_CP_VLD);
+	if ((tmp & AUDIO_ELD_VALID(cpu_transcoder)) == 0)
+		return;
+
+	intel_de_rmw(i915, HSW_AUD_DIP_ELD_CTRL(cpu_transcoder),
+		     IBX_ELD_ADDRESS_MASK, 0);
+
+	eld_buffer_size = hsw_eld_buffer_size(i915, cpu_transcoder);
+	len = min_t(int, sizeof(crtc_state->eld) / 4, eld_buffer_size);
+
+	for (i = 0; i < len; i++)
+		eld[i] = intel_de_read(i915, HSW_AUD_EDID_DATA(cpu_transcoder));
+}
+
 static void hsw_audio_codec_disable(struct intel_encoder *encoder,
 				    const struct intel_crtc_state *old_crtc_state,
 				    const struct drm_connector_state *old_conn_state)
@@ -700,6 +746,33 @@  static int ilk_eld_buffer_size(struct drm_i915_private *i915,
 	return REG_FIELD_GET(IBX_ELD_BUFFER_SIZE_MASK, tmp);
 }
 
+static void ilk_audio_codec_get_config(struct intel_encoder *encoder,
+				       struct intel_crtc_state *crtc_state)
+{
+	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+	struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+	u32 *eld = (u32 *)crtc_state->eld;
+	enum port port = encoder->port;
+	enum pipe pipe = crtc->pipe;
+	int eld_buffer_size, len, i;
+	struct ilk_audio_regs regs;
+	u32 tmp;
+
+	ilk_audio_regs_init(i915, pipe, &regs);
+
+	tmp = intel_de_read(i915, regs.aud_cntrl_st2);
+	if ((tmp & IBX_ELD_VALID(port)) == 0)
+		return;
+
+	intel_de_rmw(i915, regs.aud_cntl_st, IBX_ELD_ADDRESS_MASK, 0);
+
+	eld_buffer_size = ilk_eld_buffer_size(i915, pipe);
+	len = min_t(int, sizeof(crtc_state->eld) / 4, eld_buffer_size);
+
+	for (i = 0; i < len; i++)
+		eld[i] = intel_de_read(i915, regs.hdmiw_hdmiedid);
+}
+
 static void ilk_audio_codec_disable(struct intel_encoder *encoder,
 				    const struct intel_crtc_state *old_crtc_state,
 				    const struct drm_connector_state *old_conn_state)
@@ -919,19 +992,34 @@  void intel_audio_codec_disable(struct intel_encoder *encoder,
 	intel_lpe_audio_notify(i915, pipe, port, NULL, 0, false);
 }
 
+void intel_audio_codec_get_config(struct intel_encoder *encoder,
+				  struct intel_crtc_state *crtc_state)
+{
+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+	if (!crtc_state->has_audio)
+		return;
+
+	if (i915->display.funcs.audio)
+		i915->display.funcs.audio->audio_codec_get_config(encoder, crtc_state);
+}
+
 static const struct intel_audio_funcs g4x_audio_funcs = {
 	.audio_codec_enable = g4x_audio_codec_enable,
 	.audio_codec_disable = g4x_audio_codec_disable,
+	.audio_codec_get_config = g4x_audio_codec_get_config,
 };
 
 static const struct intel_audio_funcs ilk_audio_funcs = {
 	.audio_codec_enable = ilk_audio_codec_enable,
 	.audio_codec_disable = ilk_audio_codec_disable,
+	.audio_codec_get_config = ilk_audio_codec_get_config,
 };
 
 static const struct intel_audio_funcs hsw_audio_funcs = {
 	.audio_codec_enable = hsw_audio_codec_enable,
 	.audio_codec_disable = hsw_audio_codec_disable,
+	.audio_codec_get_config = hsw_audio_codec_get_config,
 };
 
 /**
diff --git a/drivers/gpu/drm/i915/display/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h
index b9070f336bcf..e35108b7dbc0 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.h
+++ b/drivers/gpu/drm/i915/display/intel_audio.h
@@ -23,6 +23,8 @@  void intel_audio_codec_enable(struct intel_encoder *encoder,
 void intel_audio_codec_disable(struct intel_encoder *encoder,
 			       const struct intel_crtc_state *old_crtc_state,
 			       const struct drm_connector_state *old_conn_state);
+void intel_audio_codec_get_config(struct intel_encoder *encoder,
+				  struct intel_crtc_state *crtc_state);
 void intel_audio_cdclk_change_pre(struct drm_i915_private *dev_priv);
 void intel_audio_cdclk_change_post(struct drm_i915_private *dev_priv);
 void intel_audio_init(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 971356237eca..d7f1bc75cf26 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3463,6 +3463,8 @@  static void intel_ddi_get_config(struct intel_encoder *encoder,
 	intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC);
 
 	intel_psr_get_config(encoder, pipe_config);
+
+	intel_audio_codec_get_config(encoder, pipe_config);
 }
 
 void intel_ddi_get_clock(struct intel_encoder *encoder,

[16/22] drm/i915/audio: Hardware ELD readout

Commit Message

Comments

Patch