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

Commit 1f8fc9ee authored by celtare21's avatar celtare21 Committed by Pranav Vashi
Browse files

techpack: audio: Remove pm_qos usage 



Signed-off-by: default avatarceltare21 <celtare21@gmail.com>
Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>
parent 01e0a18f

techpack/audio/4.0/asoc/sm6150.c

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

#include <linux/input.h>

#include <linux/of_device.h>

#include <linux/pm_qos.h>

#include <linux/soc/qcom/fsa4480-i2c.h>

#include <sound/core.h>

#include <sound/soc.h>
@@ -75,7 +74,6 @@ 
#define TDM_CHANNEL_MAX 8



#define ADSP_STATE_READY_TIMEOUT_MS 3000

#define MSM_LL_QOS_VALUE 300 /* time in us to ensure LPM doesn't go in C3/C4 */

#define MSM_HIFI_ON 1



#define SM6150_SOC_VERSION_1_0 0x00010000
@@ -5818,30 +5816,6 @@ static struct snd_soc_ops sm6150_tdm_be_ops = { 
	.shutdown = sm6150_tdm_snd_shutdown

};



static int msm_fe_qos_prepare(struct snd_pcm_substream *substream)

{

	cpumask_t mask;



	if (pm_qos_request_active(&substream->latency_pm_qos_req))

		pm_qos_remove_request(&substream->latency_pm_qos_req);



	cpumask_clear(&mask);

	cpumask_set_cpu(1, &mask); /* affine to core 1 */

	cpumask_set_cpu(2, &mask); /* affine to core 2 */

	cpumask_copy(&substream->latency_pm_qos_req.cpus_affine, &mask);



	substream->latency_pm_qos_req.type = PM_QOS_REQ_AFFINE_CORES;



	pm_qos_add_request(&substream->latency_pm_qos_req,

			  PM_QOS_CPU_DMA_LATENCY,

			  MSM_LL_QOS_VALUE);

	return 0;

}



static struct snd_soc_ops msm_fe_qos_ops = {

	.prepare = msm_fe_qos_prepare,

};



static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)

{

	int ret = 0;
@@ -6228,7 +6202,6 @@ static struct snd_soc_dai_link msm_common_dai_links[] = { 
		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA5,

		.ops = &msm_fe_qos_ops,

	},

	{/* hw:x,14 */

		.name = "Listen 1 Audio Service",
@@ -6295,7 +6268,6 @@ static struct snd_soc_dai_link msm_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.id = MSM_FRONTEND_DAI_MULTIMEDIA8,

		.ops = &msm_fe_qos_ops,

	},

	/* HDMI Hostless */

	{/* hw:x,18 */

techpack/audio/soc/swr-mstr-ctrl.c

+0 −9
Original line number Diff line number Diff line
@@ -1983,9 +1983,6 @@ static int swrm_probe(struct platform_device *pdev) 
	swrm->wlock_holders = 0;

	swrm->pm_state = SWRM_PM_SLEEPABLE;

	init_waitqueue_head(&swrm->pm_wq);

	pm_qos_add_request(&swrm->pm_qos_req,

			   PM_QOS_CPU_DMA_LATENCY,

			   PM_QOS_DEFAULT_VALUE);



	for (i = 0 ; i < SWR_MSTR_PORT_LEN; i++)

		INIT_LIST_HEAD(&swrm->mport_cfg[i].port_req_list);
@@ -2110,7 +2107,6 @@ static int swrm_probe(struct platform_device *pdev) 
	mutex_destroy(&swrm->iolock);

	mutex_destroy(&swrm->clklock);

	mutex_destroy(&swrm->pm_lock);

	pm_qos_remove_request(&swrm->pm_qos_req);



err_pdata_fail:

err_memory_fail:
@@ -2143,7 +2139,6 @@ static int swrm_remove(struct platform_device *pdev) 
	mutex_destroy(&swrm->clklock);

	mutex_destroy(&swrm->force_down_lock);

	mutex_destroy(&swrm->pm_lock);

	pm_qos_remove_request(&swrm->pm_qos_req);

	devm_kfree(&pdev->dev, swrm);

	return 0;

}
@@ -2567,8 +2562,6 @@ static bool swrm_lock_sleep(struct swr_mstr_ctrl *swrm) 
	mutex_lock(&swrm->pm_lock);

	if (swrm->wlock_holders++ == 0) {

		dev_dbg(swrm->dev, "%s: holding wake lock\n", __func__);

		pm_qos_update_request(&swrm->pm_qos_req,

					  msm_cpuidle_get_deep_idle_latency());

		pm_stay_awake(swrm->dev);

	}

	mutex_unlock(&swrm->pm_lock);
@@ -2603,8 +2596,6 @@ static void swrm_unlock_sleep(struct swr_mstr_ctrl *swrm) 
		 */

		if (likely(swrm->pm_state == SWRM_PM_AWAKE))

			swrm->pm_state = SWRM_PM_SLEEPABLE;

		pm_qos_update_request(&swrm->pm_qos_req,

				  PM_QOS_DEFAULT_VALUE);

		pm_relax(swrm->dev);

	}

	mutex_unlock(&swrm->pm_lock);

techpack/audio/soc/swr-mstr-ctrl.h

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define _SWR_WCD_CTRL_H

#include <linux/module.h>

#include <soc/swr-wcd.h>

#include <linux/pm_qos.h>

#include <soc/qcom/pm.h>



#define SWR_ROW_48		0
@@ -167,7 +166,6 @@ struct swr_mstr_ctrl { 
	u32 ipc_wakeup;

	bool dev_up;

	bool ipc_wakeup_triggered;

	struct pm_qos_request pm_qos_req;

	enum swrm_pm_state pm_state;

	wait_queue_head_t pm_wq;

	int wlock_holders;