Commit 75800e2e authored by Imre Deak's avatar Imre Deak Committed by Jani Nikula
Browse files

drm/i915: Fix audio component initialization 

After registering the audio component in i915_audio_component_init()
the audio driver may call i915_audio_component_get_power() via the
component ops. This could program AUD_FREQ_CNTRL with an uninitialized
value if the latter function is called before display.audio.freq_cntrl
gets initialized. The get_power() function also does a modeset which in
the above case happens too early before the initialization step and
triggers the

"Reject display access from task"

error message added by the Fixes: commit below.

Fix the above issue by registering the audio component only after the
initialization step.

Fixes: 87c16945 ("drm/i915: save AUD_FREQ_CNTRL state at audio domain suspend")
Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10291


Cc: stable@vger.kernel.org # v5.5+
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240521143022.3784539-1-imre.deak@intel.com


(cherry picked from commit fdd0b801)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 43e2b37e

drivers/gpu/drm/i915/display/intel_audio.c

+21 −11
Original line number Diff line number Diff line
@@ -1252,17 +1252,6 @@ static const struct component_ops i915_audio_component_bind_ops = { 
static void i915_audio_component_init(struct drm_i915_private *i915)

{

	u32 aud_freq, aud_freq_init;

	int ret;



	ret = component_add_typed(i915->drm.dev,

				  &i915_audio_component_bind_ops,

				  I915_COMPONENT_AUDIO);

	if (ret < 0) {

		drm_err(&i915->drm,

			"failed to add audio component (%d)\n", ret);

		/* continue with reduced functionality */

		return;

	}



	if (DISPLAY_VER(i915) >= 9) {

		aud_freq_init = intel_de_read(i915, AUD_FREQ_CNTRL);
@@ -1285,6 +1274,21 @@ static void i915_audio_component_init(struct drm_i915_private *i915) 


	/* init with current cdclk */

	intel_audio_cdclk_change_post(i915);

}



static void i915_audio_component_register(struct drm_i915_private *i915)

{

	int ret;



	ret = component_add_typed(i915->drm.dev,

				  &i915_audio_component_bind_ops,

				  I915_COMPONENT_AUDIO);

	if (ret < 0) {

		drm_err(&i915->drm,

			"failed to add audio component (%d)\n", ret);

		/* continue with reduced functionality */

		return;

	}



	i915->display.audio.component_registered = true;

}
@@ -1317,6 +1321,12 @@ void intel_audio_init(struct drm_i915_private *i915) 
		i915_audio_component_init(i915);

}



void intel_audio_register(struct drm_i915_private *i915)

{

	if (!i915->display.audio.lpe.platdev)

		i915_audio_component_register(i915);

}



/**

 * intel_audio_deinit() - deinitialize the audio driver

 * @i915: the i915 drm device private data

drivers/gpu/drm/i915/display/intel_audio.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ void intel_audio_codec_get_config(struct intel_encoder *encoder, 
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);

void intel_audio_register(struct drm_i915_private *i915);

void intel_audio_deinit(struct drm_i915_private *dev_priv);

void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state);

drivers/gpu/drm/i915/display/intel_display_driver.c

+2 −0
Original line number Diff line number Diff line
@@ -540,6 +540,8 @@ void intel_display_driver_register(struct drm_i915_private *i915) 


	intel_display_driver_enable_user_access(i915);



	intel_audio_register(i915);



	intel_display_debugfs_register(i915);



	/*