mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
drm/i915/audio: Precompute the ELD
Stash the ELD into the crtc_state and precompute it. This gets rid of the ugly ELD mutation during intel_audio_codec_enable(), and opens the door for the state checker. v2: Make another copy for the acomp hooks (Chaitanya) Split out the bogus ELD handling change (Jani) Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> Cc: Takashi Iwai <tiwai@suse.de> Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230124144628.4649-5-ville.syrjala@linux.intel.com
This commit is contained in:
parent
c7104c382b
commit
5d986635e2
6 changed files with 45 additions and 22 deletions
|
@ -335,8 +335,7 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder,
|
|||
{
|
||||
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
||||
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
||||
struct drm_connector *connector = conn_state->connector;
|
||||
const u32 *eld = (const u32 *)connector->eld;
|
||||
const u32 *eld = (const u32 *)crtc_state->eld;
|
||||
int eld_buffer_size, len, i;
|
||||
|
||||
intel_crtc_wait_for_next_vblank(crtc);
|
||||
|
@ -345,7 +344,7 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder,
|
|||
G4X_ELD_VALID | G4X_ELD_ADDRESS_MASK, 0);
|
||||
|
||||
eld_buffer_size = g4x_eld_buffer_size(i915);
|
||||
len = min(drm_eld_size(connector->eld) / 4, eld_buffer_size);
|
||||
len = min(drm_eld_size(crtc_state->eld) / 4, eld_buffer_size);
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
intel_de_write(i915, G4X_HDMIW_HDMIEDID, eld[i]);
|
||||
|
@ -749,6 +748,28 @@ void intel_audio_sdp_split_update(struct intel_encoder *encoder,
|
|||
crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0);
|
||||
}
|
||||
|
||||
bool intel_audio_compute_config(struct intel_encoder *encoder,
|
||||
struct intel_crtc_state *crtc_state,
|
||||
struct drm_connector_state *conn_state)
|
||||
{
|
||||
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
||||
struct drm_connector *connector = conn_state->connector;
|
||||
const struct drm_display_mode *adjusted_mode =
|
||||
&crtc_state->hw.adjusted_mode;
|
||||
|
||||
if (!connector->eld[0])
|
||||
drm_dbg_kms(&i915->drm,
|
||||
"Bogus ELD on [CONNECTOR:%d:%s]\n",
|
||||
connector->base.id, connector->name);
|
||||
|
||||
BUILD_BUG_ON(sizeof(crtc_state->eld) != sizeof(connector->eld));
|
||||
memcpy(crtc_state->eld, connector->eld, sizeof(crtc_state->eld));
|
||||
|
||||
crtc_state->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* intel_audio_codec_enable - Enable the audio codec for HD audio
|
||||
* @encoder: encoder on which to enable audio
|
||||
|
@ -766,8 +787,6 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
|
|||
struct i915_audio_component *acomp = i915->display.audio.component;
|
||||
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
||||
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
||||
const struct drm_display_mode *adjusted_mode =
|
||||
&crtc_state->hw.adjusted_mode;
|
||||
struct intel_audio_state *audio_state;
|
||||
enum port port = encoder->port;
|
||||
enum pipe pipe = crtc->pipe;
|
||||
|
@ -779,15 +798,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
|
|||
connector->base.base.id, connector->base.name,
|
||||
encoder->base.base.id, encoder->base.name,
|
||||
crtc->base.base.id, crtc->base.name,
|
||||
drm_eld_size(connector->base.eld));
|
||||
|
||||
/* FIXME precompute the ELD in .compute_config() */
|
||||
if (!connector->base.eld[0])
|
||||
drm_dbg_kms(&i915->drm,
|
||||
"Bogus ELD on [CONNECTOR:%d:%s]\n",
|
||||
connector->base.base.id, connector->base.name);
|
||||
|
||||
connector->base.eld[6] = drm_av_sync_delay(&connector->base, adjusted_mode) / 2;
|
||||
drm_eld_size(crtc_state->eld));
|
||||
|
||||
if (i915->display.funcs.audio)
|
||||
i915->display.funcs.audio->audio_codec_enable(encoder,
|
||||
|
@ -799,7 +810,8 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
|
|||
audio_state = &i915->display.audio.state[pipe];
|
||||
|
||||
audio_state->encoder = encoder;
|
||||
audio_state->connector = connector;
|
||||
BUILD_BUG_ON(sizeof(audio_state->eld) != sizeof(crtc_state->eld));
|
||||
memcpy(audio_state->eld, crtc_state->eld, sizeof(audio_state->eld));
|
||||
|
||||
mutex_unlock(&i915->display.audio.mutex);
|
||||
|
||||
|
@ -812,7 +824,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
|
|||
(int)port, (int)pipe);
|
||||
}
|
||||
|
||||
intel_lpe_audio_notify(i915, pipe, port, connector->base.eld,
|
||||
intel_lpe_audio_notify(i915, pipe, port, crtc_state->eld,
|
||||
crtc_state->port_clock,
|
||||
intel_crtc_has_dp_encoder(crtc_state));
|
||||
}
|
||||
|
@ -856,7 +868,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder,
|
|||
audio_state = &i915->display.audio.state[pipe];
|
||||
|
||||
audio_state->encoder = NULL;
|
||||
audio_state->connector = NULL;
|
||||
memset(audio_state->eld, 0, sizeof(audio_state->eld));
|
||||
|
||||
mutex_unlock(&i915->display.audio.mutex);
|
||||
|
||||
|
@ -1183,9 +1195,9 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
*enabled = audio_state->connector != NULL;
|
||||
*enabled = audio_state->encoder != NULL;
|
||||
if (*enabled) {
|
||||
const u8 *eld = audio_state->connector->base.eld;
|
||||
const u8 *eld = audio_state->eld;
|
||||
|
||||
ret = drm_eld_size(eld);
|
||||
memcpy(buf, eld, min(max_bytes, ret));
|
||||
|
|
|
@ -6,12 +6,17 @@
|
|||
#ifndef __INTEL_AUDIO_H__
|
||||
#define __INTEL_AUDIO_H__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
struct drm_connector_state;
|
||||
struct drm_i915_private;
|
||||
struct intel_crtc_state;
|
||||
struct intel_encoder;
|
||||
|
||||
void intel_audio_hooks_init(struct drm_i915_private *dev_priv);
|
||||
bool intel_audio_compute_config(struct intel_encoder *encoder,
|
||||
struct intel_crtc_state *crtc_state,
|
||||
struct drm_connector_state *conn_state);
|
||||
void intel_audio_codec_enable(struct intel_encoder *encoder,
|
||||
const struct intel_crtc_state *crtc_state,
|
||||
const struct drm_connector_state *conn_state);
|
||||
|
|
|
@ -89,7 +89,7 @@ struct intel_wm_funcs {
|
|||
|
||||
struct intel_audio_state {
|
||||
struct intel_encoder *encoder;
|
||||
struct intel_connector *connector;
|
||||
u8 eld[MAX_ELD_BYTES];
|
||||
};
|
||||
|
||||
struct intel_audio {
|
||||
|
|
|
@ -1259,6 +1259,8 @@ struct intel_crtc_state {
|
|||
struct drm_dp_vsc_sdp vsc;
|
||||
} infoframes;
|
||||
|
||||
u8 eld[MAX_ELD_BYTES];
|
||||
|
||||
/* HDMI scrambling status */
|
||||
bool hdmi_scrambling;
|
||||
|
||||
|
|
|
@ -2080,7 +2080,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,
|
|||
if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv) && encoder->port != PORT_A)
|
||||
pipe_config->has_pch_encoder = true;
|
||||
|
||||
pipe_config->has_audio = intel_dp_has_audio(encoder, pipe_config, conn_state);
|
||||
pipe_config->has_audio =
|
||||
intel_dp_has_audio(encoder, pipe_config, conn_state) &&
|
||||
intel_audio_compute_config(encoder, pipe_config, conn_state);
|
||||
|
||||
fixed_mode = intel_panel_fixed_mode(connector, adjusted_mode);
|
||||
if (intel_dp_is_edp(intel_dp) && fixed_mode) {
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
#include "i915_drv.h"
|
||||
#include "i915_reg.h"
|
||||
#include "intel_atomic.h"
|
||||
#include "intel_audio.h"
|
||||
#include "intel_connector.h"
|
||||
#include "intel_ddi.h"
|
||||
#include "intel_de.h"
|
||||
|
@ -2271,7 +2272,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
|
|||
pipe_config->pixel_multiplier = 2;
|
||||
|
||||
pipe_config->has_audio =
|
||||
intel_hdmi_has_audio(encoder, pipe_config, conn_state);
|
||||
intel_hdmi_has_audio(encoder, pipe_config, conn_state) &&
|
||||
intel_audio_compute_config(encoder, pipe_config, conn_state);
|
||||
|
||||
/*
|
||||
* Try to respect downstream TMDS clock limits first, if
|
||||
|
|
Loading…
Reference in a new issue