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

Commit a67b13b7 authored by Samantha Tran's avatar Samantha Tran Committed by Gerrit - the friendly Code Review server
Browse files

msm: sde: create stub for bus scale register 



This change checks for QCOM_BUS_SCALING before entering
bus scale register function. If flag is not enabled,
it will enter a stub function.

Change-Id: Ia93db6adaeedd4df2350209df95eaffb573f3b4e
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent 0bfb9a4f

drivers/media/platform/msm/sde/rotator/sde_rotator_base.c

+9 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012, 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012, 2015-2019, The Linux Foundation. All rights reserved.

 */

#define pr_fmt(fmt)	"%s: " fmt, __func__
@@ -746,6 +746,8 @@ static void sde_mdp_destroy_dt_misc(struct platform_device *pdev, 
#define BUS_VOTE_40_MHZ 320000000

#define BUS_VOTE_80_MHZ 640000000



#ifdef CONFIG_QCOM_BUS_SCALING



static struct msm_bus_vectors mdp_reg_bus_vectors[] = {

	MDP_REG_BUS_VECTOR_ENTRY(0, 0),

	MDP_REG_BUS_VECTOR_ENTRY(0, BUS_VOTE_19_MHZ),
@@ -786,6 +788,12 @@ static int sde_mdp_bus_scale_register(struct sde_rot_data_type *mdata) 


	return 0;

}

#else

static inline int sde_mdp_bus_scale_register(struct sde_rot_data_type *mdata)

{

	return 0;

}

#endif



static void sde_mdp_bus_scale_unregister(struct sde_rot_data_type *mdata)

{

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+34 −3
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ 


#define BUS_VOTE_19_MHZ 153600000



/* forward prototype */

static int sde_rotator_update_perf(struct sde_rot_mgr *mgr);



#ifdef CONFIG_QCOM_BUS_SCALING

static struct msm_bus_vectors rot_reg_bus_vectors[] = {

	SDE_REG_BUS_VECTOR_ENTRY(0, 0),

	SDE_REG_BUS_VECTOR_ENTRY(0, BUS_VOTE_19_MHZ),
@@ -91,9 +95,6 @@ static struct msm_bus_scale_pdata rot_reg_bus_scale_table = { 
	.active_only = 1,

};



/* forward prototype */

static int sde_rotator_update_perf(struct sde_rot_mgr *mgr);



static int sde_rotator_bus_scale_set_quota(struct sde_rot_bus_data_type *bus,

		u64 quota)

{
@@ -190,6 +191,18 @@ static int sde_rotator_enable_reg_bus(struct sde_rot_mgr *mgr, u64 quota) 


	return ret;

}

#else

static inline int sde_rotator_enable_reg_bus(struct sde_rot_mgr *mgr, u64 quota)

{

	return 0;

}



static inline int sde_rotator_bus_scale_set_quota(

		struct sde_rot_bus_data_type *bus, u64 quota)

{

	return 0;

}

#endif



/*

 * Clock rate of all open sessions working a particular hw block
@@ -2730,6 +2743,7 @@ static struct attribute_group sde_rotator_fs_attr_group = { 
	.attrs = sde_rotator_fs_attrs

};



#ifdef CONFIG_QCOM_BUS_SCALING

static int sde_rotator_parse_dt_bus(struct sde_rot_mgr *mgr,

	struct platform_device *dev)

{
@@ -2772,6 +2786,13 @@ static int sde_rotator_parse_dt_bus(struct sde_rot_mgr *mgr, 


	return ret;

}

#else

static inline int sde_rotator_parse_dt_bus(struct sde_rot_mgr *mgr,

	struct platform_device *dev)

{

	return 0;

}

#endif



static int sde_rotator_parse_dt(struct sde_rot_mgr *mgr,

	struct platform_device *dev)
@@ -2876,6 +2897,7 @@ static int sde_rotator_get_dt_vreg_data(struct device *dev, 
	return rc;

}



#ifdef CONFIG_QCOM_BUS_SCALING

static void sde_rotator_bus_scale_unregister(struct sde_rot_mgr *mgr)

{

	SDEROT_DBG("unregister bus_hdl=%x, reg_bus_hdl=%x\n",
@@ -2919,6 +2941,15 @@ static int sde_rotator_bus_scale_register(struct sde_rot_mgr *mgr) 


	return 0;

}

#else

static inline void sde_rotator_bus_scale_unregister(struct sde_rot_mgr *mgr)

{

}

static inline int sde_rotator_bus_scale_register(struct sde_rot_mgr *mgr)

{

	return 0;

}

#endif



static inline int sde_rotator_search_dt_clk(struct platform_device *pdev,

		struct sde_rot_mgr *mgr, char *clk_name, int clk_idx,