evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: apply bus throughput factor for high downscale cases"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-14 04:01:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit a189faf365
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/video/fbdev/msm/mdss.h
View file

@ -547,6 +547,7 @@ struct mdss_data_type {
u32 sec_session_cnt; u32 sec_session_cnt;
wait_queue_head_t secure_waitq; wait_queue_head_t secure_waitq;
struct cx_ipeak_client *mdss_cx_ipeak; struct cx_ipeak_client *mdss_cx_ipeak;
struct mult_factor bus_throughput_factor;
}; };
extern struct mdss_data_type *mdss_res; extern struct mdss_data_type *mdss_res;

9
drivers/video/fbdev/msm/mdss_mdp.c
View file

@ -4527,6 +4527,15 @@ static int mdss_mdp_parse_dt_misc(struct platform_device *pdev)
mdss_mdp_parse_dt_fudge_factors(pdev, "qcom,mdss-clk-factor", mdss_mdp_parse_dt_fudge_factors(pdev, "qcom,mdss-clk-factor",
&mdata->clk_factor); &mdata->clk_factor);
/*
* Bus throughput factor will be used during high downscale cases.
* The recommended default factor is 1.1.
*/
mdata->bus_throughput_factor.numer = 11;
mdata->bus_throughput_factor.denom = 10;
mdss_mdp_parse_dt_fudge_factors(pdev, "qcom,mdss-bus-througput-factor",
&mdata->bus_throughput_factor);
rc = of_property_read_u32(pdev->dev.of_node, rc = of_property_read_u32(pdev->dev.of_node,
"qcom,max-bandwidth-low-kbps", &mdata->max_bw_low); "qcom,max-bandwidth-low-kbps", &mdata->max_bw_low);
if (rc) if (rc)

24
drivers/video/fbdev/msm/mdss_mdp_ctl.c
View file

@ -31,6 +31,7 @@
#define MDSS_MDP_QSEED3_VER_DOWNSCALE_LIM 2 #define MDSS_MDP_QSEED3_VER_DOWNSCALE_LIM 2
#define NUM_MIXERCFG_REGS 3 #define NUM_MIXERCFG_REGS 3
#define MDSS_MDP_WB_OUTPUT_BPP 3 #define MDSS_MDP_WB_OUTPUT_BPP 3
#define MIN_BUS_THROUGHPUT_SCALE_FACTOR 35
struct mdss_mdp_mixer_cfg { struct mdss_mdp_mixer_cfg {
u32 config_masks[NUM_MIXERCFG_REGS]; u32 config_masks[NUM_MIXERCFG_REGS];
bool border_enabled; bool border_enabled;
@ -622,11 +623,21 @@ static u32 __calc_qseed3_mdp_clk_rate(struct mdss_mdp_pipe *pipe,
} }
static inline bool __is_vert_downscaling(u32 src_h, static inline bool __is_vert_downscaling(u32 src_h,
struct mdss_rect dst){ struct mdss_rect dst)
{
return (src_h > dst.h); return (src_h > dst.h);
} }
static inline bool __is_bus_throughput_factor_required(u32 src_h,
struct mdss_rect dst)
{
u32 scale_factor = src_h * 10;
do_div(scale_factor, dst.h);
return (__is_vert_downscaling(src_h, dst) &&
(scale_factor >= MIN_BUS_THROUGHPUT_SCALE_FACTOR));
}
static u32 get_pipe_mdp_clk_rate(struct mdss_mdp_pipe *pipe, static u32 get_pipe_mdp_clk_rate(struct mdss_mdp_pipe *pipe,
struct mdss_rect src, struct mdss_rect dst, struct mdss_rect src, struct mdss_rect dst,
u32 fps, u32 v_total, u32 flags) u32 fps, u32 v_total, u32 flags)
@ -673,6 +684,15 @@ static u32 get_pipe_mdp_clk_rate(struct mdss_mdp_pipe *pipe,
} }
} }
/*
* If the downscale factor is >= 3.5 for a 32 BPP surface,
* it is recommended to add a 10% bus throughput factor to
* the clock rate.
*/
if ((pipe->src_fmt->bpp == 4) &&
__is_bus_throughput_factor_required(src_h, dst))
rate = apply_fudge_factor(rate, &mdata->bus_throughput_factor);
if (flags & PERF_CALC_PIPE_APPLY_CLK_FUDGE) if (flags & PERF_CALC_PIPE_APPLY_CLK_FUDGE)
rate = mdss_mdp_clk_fudge_factor(mixer, rate); rate = mdss_mdp_clk_fudge_factor(mixer, rate);