ASoC: qdsp6v2: Remove Eagle code (dce0f818) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/misc/qcom/qdsp6v2/audio_hwacc_effects.c

+5 −61

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@
	#include "q6audio_common.h"		#include "q6audio_common.h"
	#include "audio_utils_aio.h"		#include "audio_utils_aio.h"
	#include <sound/msm-audio-effects-q6-v2.h>		#include <sound/msm-audio-effects-q6-v2.h>
	#include <sound/msm-dts-eagle.h>

	#define MAX_CHANNELS_SUPPORTED 8		#define MAX_CHANNELS_SUPPORTED 8
	#define WAIT_TIMEDOUT_DURATION_SECS 1		#define WAIT_TIMEDOUT_DURATION_SECS 1
	@@ -53,31 +52,11 @@ static void audio_effects_init_pp(struct audio_client *ac)
	pr_err("%s: audio client null to init pp\n", __func__);		pr_err("%s: audio client null to init pp\n", __func__);
	return;		return;
	}		}
	switch (ac->topology) {
	case ASM_STREAM_POSTPROC_TOPO_ID_HPX_MASTER:

	ret = q6asm_set_softvolume_v2(ac, &softvol,
	SOFT_VOLUME_INSTANCE_1);
	if (ret < 0)
	pr_err("%s: Send SoftVolume1 Param failed ret=%d\n",
	__func__, ret);
	ret = q6asm_set_softvolume_v2(ac, &softvol,
	SOFT_VOLUME_INSTANCE_2);
	if (ret < 0)
	pr_err("%s: Send SoftVolume2 Param failed ret=%d\n",
	__func__, ret);

	msm_dts_eagle_init_master_module(ac);

	break;
	default:
	ret = q6asm_set_softvolume_v2(ac, &softvol,		ret = q6asm_set_softvolume_v2(ac, &softvol,
	SOFT_VOLUME_INSTANCE_1);		SOFT_VOLUME_INSTANCE_1);
	if (ret < 0)		if (ret < 0)
	pr_err("%s: Send SoftVolume Param failed ret=%d\n",		pr_err("%s: Send SoftVolume Param failed ret=%d\n",
	__func__, ret);		__func__, ret);
	break;
	}
	}		}

	static void audio_effects_deinit_pp(struct audio_client *ac)		static void audio_effects_deinit_pp(struct audio_client *ac)
	@@ -86,13 +65,6 @@ static void audio_effects_deinit_pp(struct audio_client *ac)
	pr_err("%s: audio client null to deinit pp\n", __func__);		pr_err("%s: audio client null to deinit pp\n", __func__);
	return;		return;
	}		}
	switch (ac->topology) {
	case ASM_STREAM_POSTPROC_TOPO_ID_HPX_MASTER:
	msm_dts_eagle_deinit_master_module(ac);
	break;
	default:
	break;
	}
	}		}

	static void audio_effects_event_handler(uint32_t opcode, uint32_t token,		static void audio_effects_event_handler(uint32_t opcode, uint32_t token,
	@@ -430,34 +402,6 @@ static long audio_effects_set_pp_param(struct q6audio_effects *effects,
	&(effects->audio_effects.topo_switch_vol),		&(effects->audio_effects.topo_switch_vol),
	(long *)&values[1], SOFT_VOLUME_INSTANCE_2);		(long *)&values[1], SOFT_VOLUME_INSTANCE_2);
	break;		break;
	case DTS_EAGLE_MODULE_ENABLE:
	pr_debug("%s: DTS_EAGLE_MODULE_ENABLE\n", __func__);
	if (msm_audio_effects_is_effmodule_supp_in_top(
	effects_module, effects->ac->topology)) {
	/*
	* HPX->OFF: first disable HPX and then
	* enable SA+
	* HPX->ON: first disable SA+ and then
	* enable HPX
	*/
	bool hpx_state = (bool)values[1];

	if (hpx_state)
	msm_audio_effects_enable_extn(effects->ac,
	&(effects->audio_effects),
	false);
	msm_dts_eagle_enable_asm(effects->ac,
	hpx_state,
	AUDPROC_MODULE_ID_DTS_HPX_PREMIX);
	msm_dts_eagle_enable_asm(effects->ac,
	hpx_state,
	AUDPROC_MODULE_ID_DTS_HPX_POSTMIX);
	if (!hpx_state)
	msm_audio_effects_enable_extn(effects->ac,
	&(effects->audio_effects),
	true);
	}
	break;
	default:		default:
	pr_err("%s: Invalid effects config module\n", __func__);		pr_err("%s: Invalid effects config module\n", __func__);
	rc = -EINVAL;		rc = -EINVAL;

include/sound/msm-dts-eagle.h

deleted100644 → 0

+0 −148

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
	*
	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and
	* only version 2 as published by the Free Software Foundation.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*/

	#ifndef __MSM_DTS_EAGLE_H__
	#define __MSM_DTS_EAGLE_H__

	#include <linux/compat.h>
	#include <sound/soc.h>
	#include <sound/devdep_params.h>
	#include <sound/q6asm-v2.h>

	#ifdef CONFIG_COMPAT
	enum {
	DTS_EAGLE_IOCTL_GET_CACHE_SIZE32 = _IOR(0xF2, 0, __s32),
	DTS_EAGLE_IOCTL_SET_CACHE_SIZE32 = _IOW(0xF2, 1, __s32),
	DTS_EAGLE_IOCTL_GET_PARAM32 = _IOR(0xF2, 2, compat_uptr_t),
	DTS_EAGLE_IOCTL_SET_PARAM32 = _IOW(0xF2, 3, compat_uptr_t),
	DTS_EAGLE_IOCTL_SET_CACHE_BLOCK32 =
	_IOW(0xF2, 4, compat_uptr_t),
	DTS_EAGLE_IOCTL_SET_ACTIVE_DEVICE32 =
	_IOW(0xF2, 5, compat_uptr_t),
	DTS_EAGLE_IOCTL_GET_LICENSE32 =
	_IOR(0xF2, 6, compat_uptr_t),
	DTS_EAGLE_IOCTL_SET_LICENSE32 =
	_IOW(0xF2, 7, compat_uptr_t),
	DTS_EAGLE_IOCTL_SEND_LICENSE32 = _IOW(0xF2, 8, __s32),
	DTS_EAGLE_IOCTL_SET_VOLUME_COMMANDS32 = _IOW(0xF2, 9,
	compat_uptr_t),
	};
	#endif

	#ifdef CONFIG_DTS_EAGLE
	void msm_dts_ion_memmap(struct param_outband *po_);
	int msm_dts_eagle_enable_asm(struct audio_client *ac, u32 enable, int module);
	int msm_dts_eagle_enable_adm(int port_id, int copp_idx, u32 enable);
	void msm_dts_eagle_add_controls(struct snd_soc_platform *platform);
	int msm_dts_eagle_set_stream_gain(struct audio_client *ac,
	int lgain, int rgain);
	int msm_dts_eagle_handle_asm(struct dts_eagle_param_desc depd, char buf,
	bool for_pre, bool get, struct audio_client *ac,
	struct param_outband *po);
	int msm_dts_eagle_handle_adm(struct dts_eagle_param_desc depd, char buf,
	bool for_pre, bool get);
	int msm_dts_eagle_ioctl(unsigned int cmd, unsigned long arg);
	int msm_dts_eagle_is_hpx_on(void);
	int msm_dts_eagle_init_pre(struct audio_client *ac);
	int msm_dts_eagle_deinit_pre(struct audio_client *ac);
	int msm_dts_eagle_init_post(int port_id, int copp_id);
	int msm_dts_eagle_deinit_post(int port_id, int topology);
	int msm_dts_eagle_init_master_module(struct audio_client *ac);
	int msm_dts_eagle_deinit_master_module(struct audio_client *ac);
	int msm_dts_eagle_pcm_new(struct snd_soc_pcm_runtime *runtime);
	void msm_dts_eagle_pcm_free(struct snd_pcm *pcm);
	int msm_dts_eagle_compat_ioctl(unsigned int cmd, unsigned long arg);
	#else
	static inline void msm_dts_ion_memmap(struct param_outband *po_)
	{
	pr_debug("%s\n", __func__);
	}
	static inline int msm_dts_eagle_enable_asm(struct audio_client *ac,
	u32 enable, int module)
	{
	return 0;
	}
	static inline int msm_dts_eagle_enable_adm(int port_id, int copp_idx,
	u32 enable)
	{
	return 0;
	}
	static inline void msm_dts_eagle_add_controls(struct snd_soc_platform *platform)
	{
	}
	static inline int msm_dts_eagle_set_stream_gain(struct audio_client *ac,
	int lgain, int rgain)
	{
	pr_debug("%s\n", __func__);
	return 0;
	}
	static inline int msm_dts_eagle_handle_asm(struct dts_eagle_param_desc *depd,
	char *buf, bool for_pre, bool get,
	struct audio_client *ac,
	struct param_outband *po)
	{
	return 0;
	}
	static inline int msm_dts_eagle_handle_adm(struct dts_eagle_param_desc *depd,
	char *buf, bool for_pre, bool get)
	{
	return 0;
	}
	static inline int msm_dts_eagle_ioctl(unsigned int cmd, unsigned long arg)
	{
	return -EPERM;
	}
	static inline int msm_dts_eagle_is_hpx_on(void)
	{
	return 0;
	}
	static inline int msm_dts_eagle_init_pre(struct audio_client *ac)
	{
	return 0;
	}
	static inline int msm_dts_eagle_deinit_pre(struct audio_client *ac)
	{
	return 0;
	}
	static inline int msm_dts_eagle_init_post(int port_id, int coppid)
	{
	return 0;
	}
	static inline int msm_dts_eagle_deinit_post(int port_id, int topology)
	{
	return 0;
	}
	static inline int msm_dts_eagle_init_master_module(struct audio_client *ac)
	{
	return 0;
	}
	static inline int msm_dts_eagle_deinit_master_module(struct audio_client *ac)
	{
	return 0;
	}
	static inline int msm_dts_eagle_pcm_new(struct snd_soc_pcm_runtime *runtime)
	{
	pr_debug("%s\n", __func__);
	return 0;
	}
	static inline void msm_dts_eagle_pcm_free(struct snd_pcm *pcm)
	{
	pr_debug("%s\n", __func__);
	}
	static inline int msm_dts_eagle_compat_ioctl(unsigned int cmd,
	unsigned long arg)
	{
	return 0;
	}
	#endif

	#endif

include/sound/q6adm-v2.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@ enum {
	ADM_AUDVOL_CAL,		ADM_AUDVOL_CAL,
	ADM_RTAC_INFO_CAL,		ADM_RTAC_INFO_CAL,
	ADM_RTAC_APR_CAL,		ADM_RTAC_APR_CAL,
	ADM_DTS_EAGLE,
	ADM_SRS_TRUMEDIA,		ADM_SRS_TRUMEDIA,
	ADM_RTAC_AUDVOL_CAL,		ADM_RTAC_AUDVOL_CAL,
	ADM_MAX_CAL_TYPES		ADM_MAX_CAL_TYPES

sound/soc/msm/qdsp6v2/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ snd-soc-qdsp6v2-objs += msm-dai-q6-v2.o msm-pcm-q6-v2.o \
	obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \		obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \
	msm-dai-stub-v2.o		msm-dai-stub-v2.o
	obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o		obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o
	obj-$(CONFIG_DTS_EAGLE) += msm-dts-eagle.o		obj-$(CONFIG_DOLBY_DAP) += msm-dolby-dap-config.o
	obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o		obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o
	obj-$(CONFIG_DOLBY_LICENSE) += msm-ds2-dap-config.o		obj-$(CONFIG_DOLBY_LICENSE) += msm-ds2-dap-config.o
	obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o		obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -158,9 +158,6 @@ size_t get_cal_info_size(int32_t cal_type)
	case ULP_LSM_CAL_TYPE:		case ULP_LSM_CAL_TYPE:
	size = sizeof(struct audio_cal_info_lsm);		size = sizeof(struct audio_cal_info_lsm);
	break;		break;
	case DTS_EAGLE_CAL_TYPE:
	size = 0;
	break;
	case AUDIO_CORE_METAINFO_CAL_TYPE:		case AUDIO_CORE_METAINFO_CAL_TYPE:
	size = sizeof(struct audio_cal_info_metainfo);		size = sizeof(struct audio_cal_info_metainfo);
	break;		break;
	@@ -307,9 +304,6 @@ size_t get_user_cal_type_size(int32_t cal_type)
	case ULP_LSM_CAL_TYPE:		case ULP_LSM_CAL_TYPE:
	size = sizeof(struct audio_cal_type_lsm);		size = sizeof(struct audio_cal_type_lsm);
	break;		break;
	case DTS_EAGLE_CAL_TYPE:
	size = 0;
	break;
	case AUDIO_CORE_METAINFO_CAL_TYPE:		case AUDIO_CORE_METAINFO_CAL_TYPE:
	size = sizeof(struct audio_cal_type_metainfo);		size = sizeof(struct audio_cal_type_metainfo);
	break;		break;