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

Commit b39bd3c3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: reduce rotator fps for high resolution"

parents 50866b7b c3d96a66

drivers/video/msm/mdss/mdss_mdp_ctl.c

+15 −2
Original line number Diff line number Diff line
@@ -495,6 +495,20 @@ static inline u32 get_panel_xres(struct mdss_panel_info *pinfo) 
	return xres;

}



static u32 mdss_mdp_get_rotator_fps(struct mdss_mdp_pipe *pipe)

{

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();

	u32 fps = DEFAULT_FRAME_RATE;



	if (mdata->traffic_shaper_en)

		fps = DEFAULT_ROTATOR_FRAME_RATE;



	if (pipe->src.w >= 3840 || pipe->src.h >= 3840)

		fps = ROTATOR_LOW_FRAME_RATE;



	return fps;

}



/**

 * mdss_mdp_perf_calc_pipe() - calculate performance numbers required by pipe

 * @pipe:	Source pipe struct containing updated pipe params
@@ -540,8 +554,7 @@ int mdss_mdp_perf_calc_pipe(struct mdss_mdp_pipe *pipe, 
	src = pipe->src;



	if (mixer->rotator_mode) {

		if (mdata->traffic_shaper_en)

			fps = DEFAULT_ROTATOR_FRAME_RATE;

		fps = mdss_mdp_get_rotator_fps(pipe);

	} else if (mixer->type != MDSS_MDP_MIXER_TYPE_WRITEBACK) {

		struct mdss_panel_info *pinfo;

drivers/video/msm/mdss/mdss_panel.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ struct panel_id { 


#define DEFAULT_FRAME_RATE	60

#define DEFAULT_ROTATOR_FRAME_RATE 120

#define ROTATOR_LOW_FRAME_RATE 30

#define MDSS_DSI_RST_SEQ_LEN	10

#define MDSS_MDP_MAX_FETCH 12