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

Commit 46d196ec authored by Jerome Anand's avatar Jerome Anand Committed by Takashi Iwai
Browse files

drm/i915: Add support for audio driver notifications 



Notifiations like mode change, hot plug and edid to
the audio driver are added. This is inturn used by the
audio driver for its functionality.

A new interface file capturing the notifications needed by the
audio driver is added

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarJerome Anand <jerome.anand@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent eef57324

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -3400,6 +3400,8 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv); 
int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);

void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);

void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);

void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,

			void *eld, int port, int tmds_clk_speed);



/* intel_i2c.c */

extern int intel_setup_gmbus(struct drm_device *dev);

drivers/gpu/drm/i915/intel_audio.c

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/kernel.h>

#include <linux/component.h>

#include <drm/i915_component.h>

#include <drm/intel_lpe_audio.h>

#include "intel_drv.h"



#include <drm/drmP.h>
@@ -630,6 +631,9 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder, 
	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,

						 (int) port, (int) pipe);



	intel_lpe_audio_notify(dev_priv, connector->eld, port,

			crtc_state->port_clock);

}



/**
@@ -663,6 +667,8 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) 
	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,

						 (int) port, (int) pipe);



	intel_lpe_audio_notify(dev_priv, NULL, port, 0);

}



/**

drivers/gpu/drm/i915/intel_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <drm/drm_edid.h>

#include "intel_drv.h"

#include <drm/i915_drm.h>

#include <drm/intel_lpe_audio.h>

#include "i915_drv.h"



static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)

drivers/gpu/drm/i915/intel_lpe_audio.c

+49 −0
Original line number Diff line number Diff line
@@ -319,3 +319,52 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) 


	irq_free_desc(dev_priv->lpe_audio.irq);

}





/**

 * intel_lpe_audio_notify() - notify lpe audio event

 * audio driver and i915

 * @dev_priv: the i915 drm device private data

 * @eld : ELD data

 * @port: port id

 * @tmds_clk_speed: tmds clock frequency in Hz

 *

 * Notify lpe audio driver of eld change.

 */

void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,

			void *eld, int port, int tmds_clk_speed)

{

	unsigned long irq_flags;

	struct intel_hdmi_lpe_audio_pdata *pdata = NULL;



	if (!HAS_LPE_AUDIO(dev_priv))

		return;



	pdata = dev_get_platdata(

		&(dev_priv->lpe_audio.platdev->dev));



	spin_lock_irqsave(&pdata->lpe_audio_slock, irq_flags);



	if (eld != NULL) {

		memcpy(pdata->eld.eld_data, eld,

			HDMI_MAX_ELD_BYTES);

		pdata->eld.port_id = port;

		pdata->hdmi_connected = true;



		if (tmds_clk_speed)

			pdata->tmds_clock_speed = tmds_clk_speed;

	} else {

		memset(pdata->eld.eld_data, 0,

			HDMI_MAX_ELD_BYTES);

		pdata->hdmi_connected = false;

	}



	if (pdata->notify_audio_lpe)

		pdata->notify_audio_lpe(

			(eld != NULL) ? &pdata->eld : NULL);

	else

		pdata->notify_pending = true;



	spin_unlock_irqrestore(&pdata->lpe_audio_slock,

			irq_flags);

}