Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76d8d3e5 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915/audio: add audio codec disable on g4x 



This not based on any documentation...

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c1dec79a

drivers/gpu/drm/i915/intel_audio.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,25 @@ static bool intel_eld_uptodate(struct drm_connector *connector, 
	return true;

	return true;

}

}





static void g4x_audio_codec_disable(struct intel_encoder *encoder)

{

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;

	uint32_t eldv, tmp;



	DRM_DEBUG_KMS("Disable audio codec\n");



	tmp = I915_READ(G4X_AUD_VID_DID);

	if (tmp == INTEL_AUDIO_DEVBLC || tmp == INTEL_AUDIO_DEVCL)

		eldv = G4X_ELDV_DEVCL_DEVBLC;

	else

		eldv = G4X_ELDV_DEVCTG;



	/* Invalidate ELD */

	tmp = I915_READ(G4X_AUD_CNTL_ST);

	tmp &= ~eldv;

	I915_WRITE(G4X_AUD_CNTL_ST, tmp);

}



static void g4x_audio_codec_enable(struct drm_connector *connector,

static void g4x_audio_codec_enable(struct drm_connector *connector,

				   struct intel_encoder *encoder,

				   struct intel_encoder *encoder,

				   struct drm_display_mode *mode)

				   struct drm_display_mode *mode)
@@ -408,6 +427,7 @@ void intel_init_audio(struct drm_device *dev) 




	if (IS_G4X(dev)) {

	if (IS_G4X(dev)) {

		dev_priv->display.audio_codec_enable = g4x_audio_codec_enable;

		dev_priv->display.audio_codec_enable = g4x_audio_codec_enable;

		dev_priv->display.audio_codec_disable = g4x_audio_codec_disable;

	} else if (IS_VALLEYVIEW(dev)) {

	} else if (IS_VALLEYVIEW(dev)) {

		dev_priv->display.audio_codec_enable = ilk_audio_codec_enable;

		dev_priv->display.audio_codec_enable = ilk_audio_codec_enable;

		dev_priv->display.audio_codec_disable = ilk_audio_codec_disable;

		dev_priv->display.audio_codec_disable = ilk_audio_codec_disable;