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

Commit 9ab85f80 authored by Carl Vanderlip's avatar Carl Vanderlip Committed by Gerrit - the friendly Code Review server
Browse files

msm: mdss: Support multiple vsync handlers for CMD mode 



Add support for multiple vsync handlers for command mode panels.

Change-Id: I21bf032ac20100dce252dcc09400ad2142a1dcf4
Signed-off-by: default avatarCarl Vanderlip <carlv@codeaurora.org>
parent 35448679

drivers/video/msm/mdss/mdss_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ typedef void (*mdp_vsync_handler_t)(struct mdss_mdp_ctl *, ktime_t); 


struct mdss_mdp_vsync_handler {

	bool enabled;

	bool cmd_post_flush;

	mdp_vsync_handler_t vsync_handler;

	struct list_head list;

};

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+37 −19
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct mdss_mdp_cmd_ctx { 
	u8 ref_cnt;

	struct completion pp_comp;

	struct completion stop_comp;

	mdp_vsync_handler_t send_vsync;

	struct list_head vsync_handlers;

	int panel_on;

	int koff_cnt;

	int clk_enabled;
@@ -212,6 +212,7 @@ static void mdss_mdp_cmd_readptr_done(void *arg) 
{

	struct mdss_mdp_ctl *ctl = arg;

	struct mdss_mdp_cmd_ctx *ctx = ctl->priv_data;

	struct mdss_mdp_vsync_handler *tmp;

	ktime_t vsync_time;



	if (!ctx) {
@@ -223,8 +224,10 @@ static void mdss_mdp_cmd_readptr_done(void *arg) 
	ctl->vsync_cnt++;



	spin_lock(&ctx->clk_lock);

	if (ctx->send_vsync)

		ctx->send_vsync(ctl, vsync_time);

	list_for_each_entry(tmp, &ctx->vsync_handlers, list) {

		if (tmp->enabled && !tmp->cmd_post_flush)

			tmp->vsync_handler(ctl, vsync_time);

	}



	if (!ctx->vsync_enabled) {

		if (ctx->rdptr_enabled)
@@ -245,6 +248,8 @@ static void mdss_mdp_cmd_pingpong_done(void *arg) 
{

	struct mdss_mdp_ctl *ctl = arg;

	struct mdss_mdp_cmd_ctx *ctx = ctl->priv_data;

	struct mdss_mdp_vsync_handler *tmp;

	ktime_t vsync_time;



	if (!ctx) {

		pr_err("%s: invalid ctx\n", __func__);
@@ -252,6 +257,10 @@ static void mdss_mdp_cmd_pingpong_done(void *arg) 
	}



	spin_lock(&ctx->clk_lock);

	list_for_each_entry(tmp, &ctx->vsync_handlers, list) {

		if (tmp->enabled && tmp->cmd_post_flush)

			tmp->vsync_handler(ctl, vsync_time);

	}

	mdss_mdp_irq_disable_nosync(MDSS_MDP_IRQ_PING_PONG_COMP, ctx->pp_num);



	complete_all(&ctx->pp_comp);
@@ -298,14 +307,15 @@ static int mdss_mdp_cmd_add_vsync_handler(struct mdss_mdp_ctl *ctl, 
	}



	spin_lock_irqsave(&ctx->clk_lock, flags);

	if (ctx->vsync_enabled) {

		spin_unlock_irqrestore(&ctx->clk_lock, flags);

		return 0;

	}

	if (!handle->enabled) {

		handle->enabled = true;

		list_add(&handle->list, &ctx->vsync_handlers);

		if (!handle->cmd_post_flush)

			ctx->vsync_enabled = 1;

	ctx->send_vsync = handle->vsync_handler;

	}

	spin_unlock_irqrestore(&ctx->clk_lock, flags);



	if (!handle->cmd_post_flush)

		mdss_mdp_cmd_clk_on(ctx);



	return 0;
@@ -317,6 +327,8 @@ static int mdss_mdp_cmd_remove_vsync_handler(struct mdss_mdp_ctl *ctl, 


	struct mdss_mdp_cmd_ctx *ctx;

	unsigned long flags;

	struct mdss_mdp_vsync_handler *tmp;

	int num_rdptr_vsync = 0;



	ctx = (struct mdss_mdp_cmd_ctx *) ctl->priv_data;

	if (!ctx) {
@@ -326,13 +338,18 @@ static int mdss_mdp_cmd_remove_vsync_handler(struct mdss_mdp_ctl *ctl, 




	spin_lock_irqsave(&ctx->clk_lock, flags);

	if (!ctx->vsync_enabled) {

		spin_unlock_irqrestore(&ctx->clk_lock, flags);

		return 0;

	if (handle->enabled) {

		handle->enabled = false;

		list_del_init(&handle->list);

	}

	list_for_each_entry(tmp, &ctx->vsync_handlers, list) {

		if (!tmp->cmd_post_flush)

			num_rdptr_vsync++;

	}

	if (!num_rdptr_vsync) {

		ctx->vsync_enabled = 0;

	ctx->send_vsync = NULL;

		ctx->rdptr_enabled = VSYNC_EXPIRE_TICK;

	}

	spin_unlock_irqrestore(&ctx->clk_lock, flags);

	return 0;

}
@@ -432,6 +449,7 @@ int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl) 
{

	struct mdss_mdp_cmd_ctx *ctx;

	unsigned long flags;

	struct mdss_mdp_vsync_handler *tmp, *handle;

	int need_wait = 0;

	int ret = 0;
@@ -445,10 +463,6 @@ int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl) 
		INIT_COMPLETION(ctx->stop_comp);

		need_wait = 1;

	}

	if (ctx->vsync_enabled) {

		pr_err("%s: vsync should be disabled\n", __func__);

		ctx->vsync_enabled = 0;

	}

	spin_unlock_irqrestore(&ctx->clk_lock, flags);



	if (need_wait)
@@ -463,6 +477,9 @@ int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl) 


	ctx->panel_on = 0;



	list_for_each_entry_safe(handle, tmp, &ctx->vsync_handlers, list)

		mdss_mdp_cmd_remove_vsync_handler(ctl, handle);



	mdss_mdp_set_intr_callback(MDSS_MDP_IRQ_PING_PONG_RD_PTR, ctx->pp_num,

				   NULL, NULL);

	mdss_mdp_set_intr_callback(MDSS_MDP_IRQ_PING_PONG_COMP, ctx->pp_num,
@@ -527,6 +544,7 @@ int mdss_mdp_cmd_start(struct mdss_mdp_ctl *ctl) 
	spin_lock_init(&ctx->clk_lock);

	mutex_init(&ctx->clk_mtx);

	INIT_WORK(&ctx->clk_work, clk_ctrl_work);

	INIT_LIST_HEAD(&ctx->vsync_handlers);



	pr_debug("%s: ctx=%p num=%d mixer=%d\n", __func__,

				ctx, ctx->pp_num, mixer->num);

drivers/video/msm/mdss/mdss_mdp_overlay.c

+1 −0
Original line number Diff line number Diff line
@@ -2257,6 +2257,7 @@ static int mdss_mdp_overlay_on(struct msm_fb_data_type *mfd) 
		}

		ctl->vsync_handler.vsync_handler =

						mdss_mdp_overlay_handle_vsync;

		ctl->vsync_handler.cmd_post_flush = false;



		if (mfd->split_display && pdata->next) {

			/* enable split display */

drivers/video/msm/mdss/mdss_mdp_pp.c

+1 −0
Original line number Diff line number Diff line
@@ -3468,6 +3468,7 @@ int mdss_mdp_ad_addr_setup(struct mdss_data_type *mdata, u32 *ad_off) 
		mdata->ad_cfgs[i].last_bl = 0;

		mutex_init(&mdata->ad_cfgs[i].lock);

		mdata->ad_cfgs[i].handle.vsync_handler = pp_ad_vsync_handler;

		mdata->ad_cfgs[i].handle.cmd_post_flush = true;

		INIT_WORK(&mdata->ad_cfgs[i].calc_work, pp_ad_calc_worker);

	}

	return rc;