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

Commit 7abeb64d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/drm_audio_component' into for-next 



Pull the generic drm_audio_component support, which will be used later
for AMD/ATI and other HD-audio HDMI codec drivers.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 58cabe87 a57942bf

drivers/gpu/drm/i915/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config DRM_I915 
	select SYNC_FILE

	select IOSF_MBI

	select CRC32

	select SND_HDA_I915 if SND_HDA_CORE

	help

	  Choose this option if you have a system that has "Intel Graphics

	  Media Accelerator" or "HD Graphics" integrated graphics,

drivers/gpu/drm/i915/intel_audio.c

+12 −10
Original line number Diff line number Diff line
@@ -639,11 +639,12 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, 
	dev_priv->av_enc_map[pipe] = encoder;

	mutex_unlock(&dev_priv->av_mutex);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {

	if (acomp && acomp->base.audio_ops &&

	    acomp->base.audio_ops->pin_eld_notify) {

		/* audio drivers expect pipe = -1 to indicate Non-MST cases */

		if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST))

			pipe = -1;

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

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

						 (int) port, (int) pipe);

	}
@@ -681,11 +682,12 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, 
	dev_priv->av_enc_map[pipe] = NULL;

	mutex_unlock(&dev_priv->av_mutex);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {

	if (acomp && acomp->base.audio_ops &&

	    acomp->base.audio_ops->pin_eld_notify) {

		/* audio drivers expect pipe = -1 to indicate Non-MST cases */

		if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST))

			pipe = -1;

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

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

						 (int) port, (int) pipe);

	}
@@ -880,7 +882,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port, 
	return ret;

}



static const struct i915_audio_component_ops i915_audio_component_ops = {

static const struct drm_audio_component_ops i915_audio_component_ops = {

	.owner		= THIS_MODULE,

	.get_power	= i915_audio_component_get_power,

	.put_power	= i915_audio_component_put_power,
@@ -897,12 +899,12 @@ static int i915_audio_component_bind(struct device *i915_kdev, 
	struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);

	int i;



	if (WARN_ON(acomp->ops || acomp->dev))

	if (WARN_ON(acomp->base.ops || acomp->base.dev))

		return -EEXIST;



	drm_modeset_lock_all(&dev_priv->drm);

	acomp->ops = &i915_audio_component_ops;

	acomp->dev = i915_kdev;

	acomp->base.ops = &i915_audio_component_ops;

	acomp->base.dev = i915_kdev;

	BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS);

	for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++)

		acomp->aud_sample_rate[i] = 0;
@@ -919,8 +921,8 @@ static void i915_audio_component_unbind(struct device *i915_kdev, 
	struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);



	drm_modeset_lock_all(&dev_priv->drm);

	acomp->ops = NULL;

	acomp->dev = NULL;

	acomp->base.ops = NULL;

	acomp->base.dev = NULL;

	dev_priv->audio_component = NULL;

	drm_modeset_unlock_all(&dev_priv->drm);

}

include/drm/drm_audio_component.h

0 → 100644
+118 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

// Copyright © 2014 Intel Corporation



#ifndef _DRM_AUDIO_COMPONENT_H_

#define _DRM_AUDIO_COMPONENT_H_



struct drm_audio_component;



/**

 * struct drm_audio_component_ops - Ops implemented by DRM driver, called by hda driver

 */

struct drm_audio_component_ops {

	/**

	 * @owner: drm module to pin down

	 */

	struct module *owner;

	/**

	 * @get_power: get the POWER_DOMAIN_AUDIO power well

	 *

	 * Request the power well to be turned on.

	 */

	void (*get_power)(struct device *);

	/**

	 * @put_power: put the POWER_DOMAIN_AUDIO power well

	 *

	 * Allow the power well to be turned off.

	 */

	void (*put_power)(struct device *);

	/**

	 * @codec_wake_override: Enable/disable codec wake signal

	 */

	void (*codec_wake_override)(struct device *, bool enable);

	/**

	 * @get_cdclk_freq: Get the Core Display Clock in kHz

	 */

	int (*get_cdclk_freq)(struct device *);

	/**

	 * @sync_audio_rate: set n/cts based on the sample rate

	 *

	 * Called from audio driver. After audio driver sets the

	 * sample rate, it will call this function to set n/cts

	 */

	int (*sync_audio_rate)(struct device *, int port, int pipe, int rate);

	/**

	 * @get_eld: fill the audio state and ELD bytes for the given port

	 *

	 * Called from audio driver to get the HDMI/DP audio state of the given

	 * digital port, and also fetch ELD bytes to the given pointer.

	 *

	 * It returns the byte size of the original ELD (not the actually

	 * copied size), zero for an invalid ELD, or a negative error code.

	 *

	 * Note that the returned size may be over @max_bytes.  Then it

	 * implies that only a part of ELD has been copied to the buffer.

	 */

	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,

		       unsigned char *buf, int max_bytes);

};



/**

 * struct drm_audio_component_audio_ops - Ops implemented by hda driver, called by DRM driver

 */

struct drm_audio_component_audio_ops {

	/**

	 * @audio_ptr: Pointer to be used in call to pin_eld_notify

	 */

	void *audio_ptr;

	/**

	 * @pin_eld_notify: Notify the HDA driver that pin sense and/or ELD information has changed

	 *

	 * Called when the DRM driver has set up audio pipeline or has just

	 * begun to tear it down. This allows the HDA driver to update its

	 * status accordingly (even when the HDA controller is in power save

	 * mode).

	 */

	void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);

	/**

	 * @pin2port: Check and convert from pin node to port number

	 *

	 * Called by HDA driver to check and convert from the pin widget node

	 * number to a port number in the graphics side.

	 */

	int (*pin2port)(void *audio_ptr, int pin);

	/**

	 * @master_bind: (Optional) component master bind callback

	 *

	 * Called at binding master component, for HDA codec-specific

	 * handling of dynamic binding.

	 */

	int (*master_bind)(struct device *dev, struct drm_audio_component *);

	/**

	 * @master_unbind: (Optional) component master unbind callback

	 *

	 * Called at unbinding master component, for HDA codec-specific

	 * handling of dynamic unbinding.

	 */

	void (*master_unbind)(struct device *dev, struct drm_audio_component *);

};



/**

 * struct drm_audio_component - Used for direct communication between DRM and hda drivers

 */

struct drm_audio_component {

	/**

	 * @dev: DRM device, used as parameter for ops

	 */

	struct device *dev;

	/**

	 * @ops: Ops implemented by DRM driver, called by hda driver

	 */

	const struct drm_audio_component_ops *ops;

	/**

	 * @audio_ops: Ops implemented by hda driver, called by DRM driver

	 */

	const struct drm_audio_component_audio_ops *audio_ops;

};



#endif /* _DRM_AUDIO_COMPONENT_H_ */

include/drm/i915_component.h

+5 −80
Original line number Diff line number Diff line
@@ -24,101 +24,26 @@ 
#ifndef _I915_COMPONENT_H_

#define _I915_COMPONENT_H_



#include "drm_audio_component.h"



/* MAX_PORT is the number of port

 * It must be sync with I915_MAX_PORTS defined i915_drv.h

 */

#define MAX_PORTS 6



/**

 * struct i915_audio_component_ops - Ops implemented by i915 driver, called by hda driver

 */

struct i915_audio_component_ops {

	/**

	 * @owner: i915 module

	 */

	struct module *owner;

	/**

	 * @get_power: get the POWER_DOMAIN_AUDIO power well

	 *

	 * Request the power well to be turned on.

	 */

	void (*get_power)(struct device *);

	/**

	 * @put_power: put the POWER_DOMAIN_AUDIO power well

	 *

	 * Allow the power well to be turned off.

	 */

	void (*put_power)(struct device *);

	/**

	 * @codec_wake_override: Enable/disable codec wake signal

	 */

	void (*codec_wake_override)(struct device *, bool enable);

	/**

	 * @get_cdclk_freq: Get the Core Display Clock in kHz

	 */

	int (*get_cdclk_freq)(struct device *);

	/**

	 * @sync_audio_rate: set n/cts based on the sample rate

	 *

	 * Called from audio driver. After audio driver sets the

	 * sample rate, it will call this function to set n/cts

	 */

	int (*sync_audio_rate)(struct device *, int port, int pipe, int rate);

	/**

	 * @get_eld: fill the audio state and ELD bytes for the given port

	 *

	 * Called from audio driver to get the HDMI/DP audio state of the given

	 * digital port, and also fetch ELD bytes to the given pointer.

	 *

	 * It returns the byte size of the original ELD (not the actually

	 * copied size), zero for an invalid ELD, or a negative error code.

	 *

	 * Note that the returned size may be over @max_bytes.  Then it

	 * implies that only a part of ELD has been copied to the buffer.

	 */

	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,

		       unsigned char *buf, int max_bytes);

};



/**

 * struct i915_audio_component_audio_ops - Ops implemented by hda driver, called by i915 driver

 */

struct i915_audio_component_audio_ops {

	/**

	 * @audio_ptr: Pointer to be used in call to pin_eld_notify

	 */

	void *audio_ptr;

	/**

	 * @pin_eld_notify: Notify the HDA driver that pin sense and/or ELD information has changed

	 *

	 * Called when the i915 driver has set up audio pipeline or has just

	 * begun to tear it down. This allows the HDA driver to update its

	 * status accordingly (even when the HDA controller is in power save

	 * mode).

	 */

	void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);

};



/**

 * struct i915_audio_component - Used for direct communication between i915 and hda drivers

 */

struct i915_audio_component {

	/**

	 * @dev: i915 device, used as parameter for ops

	 * @base: the drm_audio_component base class

	 */

	struct device *dev;

	struct drm_audio_component	base;



	/**

	 * @aud_sample_rate: the array of audio sample rate per port

	 */

	int aud_sample_rate[MAX_PORTS];

	/**

	 * @ops: Ops implemented by i915 driver, called by hda driver

	 */

	const struct i915_audio_component_ops *ops;

	/**

	 * @audio_ops: Ops implemented by hda driver, called by i915 driver

	 */

	const struct i915_audio_component_audio_ops *audio_ops;

};



#endif /* _I915_COMPONENT_H_ */

include/sound/hda_component.h

0 → 100644
+61 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// HD-Audio helpers to sync with DRM driver



#ifndef __SOUND_HDA_COMPONENT_H

#define __SOUND_HDA_COMPONENT_H



#include <drm/drm_audio_component.h>



#ifdef CONFIG_SND_HDA_COMPONENT

int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);

int snd_hdac_display_power(struct hdac_bus *bus, bool enable);

int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid,

			     int dev_id, int rate);

int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, int dev_id,

			   bool *audio_enabled, char *buffer, int max_bytes);

int snd_hdac_acomp_init(struct hdac_bus *bus,

			const struct drm_audio_component_audio_ops *aops,

			int (*match_master)(struct device *, void *),

			size_t extra_size);

int snd_hdac_acomp_exit(struct hdac_bus *bus);

int snd_hdac_acomp_register_notifier(struct hdac_bus *bus,

				    const struct drm_audio_component_audio_ops *ops);

#else

static inline int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable)

{

	return 0;

}

static inline int snd_hdac_display_power(struct hdac_bus *bus, bool enable)

{

	return 0;

}

static inline int snd_hdac_sync_audio_rate(struct hdac_device *codec,

					   hda_nid_t nid, int dev_id, int rate)

{

	return 0;

}

static inline int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid,

					 int dev_id, bool *audio_enabled,

					 char *buffer, int max_bytes)

{

	return -ENODEV;

}

static inline int snd_hdac_acomp_init(struct hdac_bus *bus,

				      const struct drm_audio_component_audio_ops *aops,

				      int (*match_master)(struct device *, void *),

				      size_t extra_size)

{

	return -ENODEV;

}

static inline int snd_hdac_acomp_exit(struct hdac_bus *bus)

{

	return 0;

}

static inline int snd_hdac_acomp_register_notifier(struct hdac_bus *bus,

						  const struct drm_audio_component_audio_ops *ops)

{

	return -ENODEV;

}

#endif



#endif /* __SOUND_HDA_COMPONENT_H */