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

Commit ac8e2409 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: avoid skip pipe reconfiguration if pipe was freed"

parents c6297e1e 4caaff3f

drivers/video/msm/mdss/mdss_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ struct mdss_mdp_pipe { 


	struct mdp_overlay req_data;

	u32 params_changed;

	bool dirty;



	struct mdss_mdp_pipe_smp_map smp_map[MAX_PLANES];

drivers/video/msm/mdss/mdss_mdp_overlay.c

+3 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd, 
		req->flags ^= mfd->panel_orientation;



	req->priority = pipe->priority;

	if (!memcmp(req, &pipe->req_data, sizeof(*req))) {

	if (!pipe->dirty && !memcmp(req, &pipe->req_data, sizeof(*req))) {

		pr_debug("skipping pipe_reconfiguration\n");

		goto skip_reconfigure;

	}
@@ -972,6 +972,7 @@ cursor_done: 
	req->vert_deci = pipe->vert_deci;



	pipe->req_data = *req;

	pipe->dirty = false;



	pipe->params_changed++;

skip_reconfigure:
@@ -996,6 +997,7 @@ exit_fail: 
		pr_debug("freeing allocations for pipe %d\n", pipe->num);

		mdss_mdp_smp_unreserve(pipe);

		pipe->params_changed = 0;

		pipe->dirty = true;

	}

	mutex_unlock(&mdp5_data->list_lock);

	return ret;