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

Commit 40ef490b authored by Ujwal Patel's avatar Ujwal Patel
Browse files

msm: mdss: replace mdss_fudge_factor with mult_factor 



Currently there are two different data structure representing
multiplication factors. Replace internal one, mdss_fudge_factor, and
with the one shared with user-space, mult_factor.

Change-Id: I9e0dcc092b4f9033cbfcd7e185e642c922e29a27
Signed-off-by: default avatarUjwal Patel <ujwalp@codeaurora.org>
parent 861a4ae9

drivers/video/msm/mdss/mdss.h

+5 −10
Original line number Diff line number Diff line
@@ -74,11 +74,6 @@ struct mdss_debug_inf { 
	void (*debug_enable_clock)(int on);

};



struct mdss_fudge_factor {

	u32 numer;

	u32 denom;

};



struct mdss_perf_tune {

	unsigned long min_mdp_clk;

	u64 min_bus_vote;
@@ -317,11 +312,11 @@ struct mdss_data_type { 
	u32 *vbif_nrt_qos;

	u32 npriority_lvl;



	struct mdss_fudge_factor ab_factor;

	struct mdss_fudge_factor ib_factor;

	struct mdss_fudge_factor ib_factor_overlap;

	struct mdss_fudge_factor clk_factor;

	struct mdss_fudge_factor per_pipe_ib_factor;

	struct mult_factor ab_factor;

	struct mult_factor ib_factor;

	struct mult_factor ib_factor_overlap;

	struct mult_factor clk_factor;

	struct mult_factor per_pipe_ib_factor;

	bool apply_post_scale_bytes;

	bool hflip_buffer_reused;

drivers/video/msm/mdss/mdss_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ void mdss_debug_register_dump_range(struct platform_device *pdev, 
static ssize_t mdss_debug_factor_write(struct file *file,

		    const char __user *user_buf, size_t count, loff_t *ppos)

{

	struct mdss_fudge_factor *factor  = file->private_data;

	struct mult_factor *factor  = file->private_data;

	u32 numer;

	u32 denom;

	char buf[32];
@@ -699,7 +699,7 @@ static ssize_t mdss_debug_factor_write(struct file *file, 
static ssize_t mdss_debug_factor_read(struct file *file,

			char __user *buff, size_t count, loff_t *ppos)

{

	struct mdss_fudge_factor *factor = file->private_data;

	struct mult_factor *factor = file->private_data;

	int len = 0;

	char buf[32];

drivers/video/msm/mdss/mdss_mdp.c

+1 −1
Original line number Diff line number Diff line
@@ -2741,7 +2741,7 @@ static int mdss_mdp_parse_dt_smp(struct platform_device *pdev) 
}



static void mdss_mdp_parse_dt_fudge_factors(struct platform_device *pdev,

	char *prop_name, struct mdss_fudge_factor *ff)

	char *prop_name, struct mult_factor *ff)

{

	int rc;

	u32 data[2] = {1, 1};

drivers/video/msm/mdss/mdss_mdp.h

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ void mdss_mdp_data_calc_offset(struct mdss_mdp_data *data, u16 x, u16 y, 
struct mdss_mdp_format_params *mdss_mdp_get_format_params(u32 format);

void mdss_mdp_get_v_h_subsample_rate(u8 chroma_samp,

	u8 *v_sample, u8 *h_sample);

struct mdss_fudge_factor *mdss_mdp_get_comp_factor(u32 format,

struct mult_factor *mdss_mdp_get_comp_factor(u32 format,

	bool rt_factor);

int mdss_mdp_data_get(struct mdss_mdp_data *data, struct msmfb_data *planes,

		int num_planes, u32 flags, struct device *dev, bool rotator,

drivers/video/msm/mdss/mdss_mdp_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static inline u64 fudge_factor(u64 val, u32 numer, u32 denom) 
}



static inline u64 apply_fudge_factor(u64 val,

	struct mdss_fudge_factor *factor)

	struct mult_factor *factor)

{

	return fudge_factor(val, factor->numer, factor->denom);

}
@@ -1723,7 +1723,7 @@ static void mdss_mdp_ctl_update_client_vote(struct mdss_data_type *mdata, 
	if (test_bit(MDSS_MDP_BW_MODE_SINGLE_LAYER,

		perf->bw_vote_mode) &&

		(bus_ib_quota >= PERF_SINGLE_PIPE_BW_FLOOR)) {

		struct mdss_fudge_factor ib_factor_vscaling;

		struct mult_factor ib_factor_vscaling;

		ib_factor_vscaling.numer = 2;

		ib_factor_vscaling.denom = 1;

		bus_ib_quota = apply_fudge_factor(bus_ib_quota,