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

Commit 3b75fe0c 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 danger/safe signal disabling for NRT clients"

parents f1bbcc52 d2f5d949

drivers/video/msm/mdss/mdss_mdp_pipe.c

+5 −3
Original line number Diff line number Diff line
@@ -666,8 +666,8 @@ static struct mdss_mdp_pipe *mdss_mdp_pipe_init(struct mdss_mdp_mixer *mixer, 
		return NULL;

	}



	if (pipe && mdss_mdp_pipe_panic_signal_ctrl(pipe, false))

		return NULL;

	if (pipe && mdss_mdp_panic_signal_supported(mdata, pipe))

		mdss_mdp_pipe_panic_signal_ctrl(pipe, false);



	if (pipe && mdss_mdp_pipe_is_sw_reset_available(mdata)) {

		force_off_mask =
@@ -815,12 +815,14 @@ struct mdss_mdp_pipe *mdss_mdp_pipe_search(struct mdss_data_type *mdata, 
static void mdss_mdp_pipe_free(struct kref *kref)

{

	struct mdss_mdp_pipe *pipe;

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();



	pipe = container_of(kref, struct mdss_mdp_pipe, kref);



	pr_debug("ndx=%x pnum=%d\n", pipe->ndx, pipe->num);



	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);

	if (pipe && mdss_mdp_panic_signal_supported(mdata, pipe))

		mdss_mdp_pipe_panic_signal_ctrl(pipe, false);



	if (pipe->play_cnt) {