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

Commit 67e2481d 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: Add mdp clock optimization for mdp3 targets"

parents 197e643c 5241e103

drivers/video/msm/mdss/mdp3.c

+2 −2
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int mdp3_clk_setup(void) 
	if (rc)

		return rc;



	rc = mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, MDP_CORE_CLK_RATE,

	rc = mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, MDP_CORE_CLK_RATE_SVS,

			MDP3_CLIENT_DMA_P);

	if (rc)

		pr_err("%s: Error setting max clock during probe\n", __func__);
@@ -1692,7 +1692,7 @@ static int mdp3_continuous_splash_on(struct mdss_panel_data *pdata) 
	mdp3_clk_set_rate(MDP3_CLK_VSYNC, MDP_VSYNC_CLK_RATE,

			MDP3_CLIENT_DMA_P);



	mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, MDP_CORE_CLK_RATE,

	mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, MDP_CORE_CLK_RATE_SVS,

			MDP3_CLIENT_DMA_P);



	bus_handle = &mdp3_res->bus_handle[MDP3_BUS_HANDLE];

drivers/video/msm/mdss/mdp3.h

+6 −1
Original line number Diff line number Diff line
@@ -26,7 +26,12 @@ 
#include "mdss.h"



#define MDP_VSYNC_CLK_RATE	19200000

#define MDP_CORE_CLK_RATE	307200000

#define MDP_CORE_CLK_RATE_SVS	150000000

#define MDP_CORE_CLK_RATE_MAX	307200000



/* PPP cant work at SVS for panel res above qHD */

#define SVS_MAX_PIXEL		(540 * 960)



#define KOFF_TIMEOUT msecs_to_jiffies(84)



enum  {

drivers/video/msm/mdss/mdp3_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int mdp3_ctrl_res_req_clk(struct msm_fb_data_type *mfd, int status) 
	int rc = 0;

	if (status) {



		mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, MDP_CORE_CLK_RATE,

		mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, MDP_CORE_CLK_RATE_SVS,

				MDP3_CLIENT_DMA_P);

		mdp3_clk_set_rate(MDP3_CLK_VSYNC, MDP_VSYNC_CLK_RATE,

				MDP3_CLIENT_DMA_P);

drivers/video/msm/mdss/mdp3_ppp.c

+35 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#define MDP_IS_IMGTYPE_BAD(x) ((x) >= MDP_IMGTYPE_LIMIT)

#define MDP_RELEASE_BW_TIMEOUT 50

#define MDP_BLIT_CLK_RATE	200000000



#define MDP_PPP_MAX_BPP 4

#define MDP_PPP_DYNAMIC_FACTOR 3

#define MDP_PPP_MAX_READ_WRITE 3
@@ -100,6 +100,7 @@ struct ppp_status { 
	struct work_struct free_bw_work;

	bool bw_on;

	bool bw_optimal;

	u32 mdp_clk;

};



static struct ppp_status *ppp_stat;
@@ -326,16 +327,38 @@ void mdp3_ppp_kickoff(void) 
	mdp3_irq_disable(MDP3_PPP_DONE);

}



u32 mdp3_clk_calc(struct msm_fb_data_type *mfd, struct blit_req_list *lreq)

{

	struct mdss_panel_info *panel_info = mfd->panel_info;

	int i, lcount = 0;

	struct mdp_blit_req *req;

	u32 total_pixel;

	u32 mdp_clk_rate = MDP_CORE_CLK_RATE_SVS;



	total_pixel = panel_info->xres * panel_info->yres;

	if (total_pixel > SVS_MAX_PIXEL)

		return MDP_CORE_CLK_RATE_MAX;



	for (i = 0; i < lcount; i++) {

		req = &(lreq->req_list[i]);



		if (req->src_rect.h != req->dst_rect.h ||

				req->src_rect.w != req->dst_rect.w) {

			mdp_clk_rate = MDP_CORE_CLK_RATE_MAX;

			break;

		}

	}

	return mdp_clk_rate;

}



int mdp3_ppp_vote_update(struct msm_fb_data_type *mfd)

{

	struct mdss_panel_info *panel_info = mfd->panel_info;

	uint64_t req_bw = 0, ab = 0, ib = 0;

	int rate = 0;

	int rc = 0;

	if (!ppp_stat->bw_on)

		pr_err("%s: PPP vote update in wrong state\n", __func__);



	rate = MDP_BLIT_CLK_RATE;

	req_bw = panel_info->xres * panel_info->yres *

		panel_info->mipi.frame_rate *

		MDP_PPP_MAX_BPP *
@@ -363,7 +386,7 @@ int mdp3_ppp_turnon(struct msm_fb_data_type *mfd, int on_off) 
	int rc;



	if (on_off) {

		rate = MDP_BLIT_CLK_RATE;

		rate = MDP_CORE_CLK_RATE_SVS;

		req_bw = panel_info->xres * panel_info->yres *

			panel_info->mipi.frame_rate *

			MDP_PPP_MAX_BPP *
@@ -388,6 +411,7 @@ int mdp3_ppp_turnon(struct msm_fb_data_type *mfd, int on_off) 
		return rc;

	}

	ppp_stat->bw_on = on_off;

	ppp_stat->mdp_clk = MDP_CORE_CLK_RATE_SVS;

	return 0;

}
@@ -1033,6 +1057,7 @@ static void mdp3_ppp_blit_wq_handler(struct work_struct *work) 
	struct msm_fb_data_type *mfd = ppp_stat->mfd;

	struct blit_req_list *req;

	int i, rc = 0;

	u32 new_clk_rate;



	mutex_lock(&ppp_stat->config_ppp_mutex);

	req = mdp3_ppp_next_req(&ppp_stat->req_q);
@@ -1052,6 +1077,12 @@ static void mdp3_ppp_blit_wq_handler(struct work_struct *work) 
	}

	while (req) {

		mdp3_ppp_wait_for_fence(req);

		new_clk_rate = mdp3_clk_calc(mfd, req);

		if (new_clk_rate != ppp_stat->mdp_clk) {

			ppp_stat->mdp_clk = new_clk_rate;

			mdp3_clk_set_rate(MDP3_CLK_MDP_SRC, new_clk_rate,

							MDP3_CLIENT_PPP);

		}

		for (i = 0; i < req->count; i++) {

			if (!(req->req_list[i].flags & MDP_NO_BLIT)) {

				/* Do the actual blit. */