On Tue, 11 Oct 2022, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Read out the ELD from the hardware buffer so that we can > hook up the state checker to validate it. > > Cc: Chaitanya Kumar Borah <[email protected]> > Cc: Kai Vehmanen <[email protected]> > Cc: Takashi Iwai <[email protected]> > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > 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, ®s); > + > + 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, -- Jani Nikula, Intel Open Source Graphics Center
