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

Commit da864809 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: x86: Flatten two abstraction layers 



This is the final stage for a big clean-up series.  Here we flatten
the two layers into one.  Formerly, the implementation was split to
HDMI "shell" that talks with the platform device, and HDMI audio part
that communicates via caps and other event handlers.  All these would
be good if there were multiple instantiations or if there were data
protection.  But neither are true in our case.  That said, it'll be
easier to have a flat driver structure in the end.

In this patch, the former struct hdmi_lpe_audio_ctx is forged into the
existing struct snd_intelhad.  The latter has already a few members
that are basically the copy from the former.  Only a few new members
for the lowlevel I/O are added by this change.

Then, the had_get_caps() and had_set_caps() are simply replaced with
the direct calls to copy the data in the struct fields.  Also, the
had_event_handler() calls are replaced with the direct call for each
event as well.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent eeb756c5

sound/x86/Makefile

+1 −2
Original line number Diff line number Diff line 
snd-hdmi-lpe-audio-objs += \

	intel_hdmi_audio.o \

	intel_hdmi_audio_if.o \

	intel_hdmi_lpe_audio.o

	intel_hdmi_audio_if.o



obj-$(CONFIG_HDMI_LPE_AUDIO) += snd-hdmi-lpe-audio.o

sound/x86/intel_hdmi_audio.c

+315 −161

File changed.

Preview size limit exceeded, changes collapsed.

sound/x86/intel_hdmi_audio.h

+21 −16
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ struct had_stream_data { 
 * @drv_status: driver status

 * @buf_info: ring buffer info

 * @stream_info: stream information

 * @eeld: holds EELD info

 * @eld: holds ELD info

 * @curr_buf: pointer to hold current active ring buf

 * @valid_buf_cnt: ring buffer count for stream

 * @had_spinlock: driver lock
@@ -127,7 +127,7 @@ struct snd_intelhad { 
	enum had_drv_status	drv_status;

	struct		ring_buf_info buf_info[HAD_NUM_OF_RING_BUFS];

	struct		pcm_stream_info stream_info;

	union otm_hdmi_eld_t	eeld;

	union otm_hdmi_eld_t	eld;

	bool dp_output;

	enum		intel_had_aud_buf_type curr_buf;

	int		valid_buf_cnt;
@@ -142,15 +142,27 @@ struct snd_intelhad { 
	unsigned int	*audio_reg_base;

	unsigned int	audio_cfg_offset;

	int underrun_count;

	enum hdmi_connector_status state;

	int tmds_clock_speed;

	int link_rate;



	/* internal stuff */

	int irq;

	void __iomem *mmio_start;

	unsigned int had_config_offset;

	int hdmi_audio_interrupt_mask;

	struct work_struct hdmi_audio_wq;

};



int had_event_handler(enum had_event_type event_type, void *data);



int hdmi_audio_suspend(void *drv_data);

int hdmi_audio_resume(void *drv_data);

int hdmi_audio_mode_change(struct snd_pcm_substream *substream);

int hdmi_lpe_audio_suspend(struct platform_device *pdev, pm_message_t state);

int hdmi_lpe_audio_resume(struct platform_device *pdev);

extern struct snd_pcm_ops snd_intelhad_playback_ops;



int had_process_buffer_done(struct snd_intelhad *intelhaddata);

int had_process_buffer_underrun(struct snd_intelhad *intelhaddata);

int had_process_hot_plug(struct snd_intelhad *intelhaddata);

int had_process_hot_unplug(struct snd_intelhad *intelhaddata);



int snd_intelhad_init_audio_ctrl(struct snd_pcm_substream *substream,

					struct snd_intelhad *intelhaddata,

					int flag_silence);
@@ -160,15 +172,12 @@ int snd_intelhad_invd_buffer(int start, int end); 
int snd_intelhad_read_len(struct snd_intelhad *intelhaddata);

void had_build_channel_allocation_map(struct snd_intelhad *intelhaddata);



void snd_intelhad_enable_audio(struct snd_pcm_substream *substream, u8 enable);

void snd_intelhad_enable_audio_int(struct snd_intelhad *ctx, bool enable);

void snd_intelhad_enable_audio(struct snd_intelhad *ctx, bool enable);

void snd_intelhad_handle_underrun(struct snd_intelhad *intelhaddata);



/* Register access functions */

int had_get_hwstate(struct snd_intelhad *intelhaddata);

int had_get_caps(struct snd_intelhad *intelhaddata,

		 enum had_caps_list query_element, void *capabilties);

int had_set_caps(struct snd_intelhad *intelhaddata,

		 enum had_caps_list set_element, void *capabilties);

int had_read_register(struct snd_intelhad *intelhaddata,

		      u32 reg_addr, u32 *data);

int had_write_register(struct snd_intelhad *intelhaddata,
@@ -176,8 +185,4 @@ int had_write_register(struct snd_intelhad *intelhaddata, 
int had_read_modify(struct snd_intelhad *intelhaddata,

		    u32 reg_addr, u32 data, u32 mask);



int hdmi_audio_probe(struct platform_device *devptr,

		     struct snd_intelhad **had_ret);

int hdmi_audio_remove(struct snd_intelhad *intelhaddata);



#endif /* _INTEL_HDMI_AUDIO_ */

sound/x86/intel_hdmi_audio_if.c

+20 −108

File changed.

Preview size limit exceeded, changes collapsed.

sound/x86/intel_hdmi_lpe_audio.c

deleted100644 → 0
+0 −462

File deleted.

Preview size limit exceeded, changes collapsed.