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

Commit 6b15c71b 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: reset cdm pointer when ctl is destroyed"

parents 89d3103b 6cb2b31a

drivers/video/msm/mdss/mdss_mdp_ctl.c

+1 −0
Original line number Diff line number Diff line
@@ -2096,6 +2096,7 @@ int mdss_mdp_ctl_free(struct mdss_mdp_ctl *ctl) 
	ctl->mixer_left = NULL;

	ctl->mixer_right = NULL;

	ctl->wb = NULL;

	ctl->cdm = NULL;

	memset(&ctl->ops, 0, sizeof(ctl->ops));

	mutex_unlock(&mdss_mdp_ctl_lock);

drivers/video/msm/mdss/mdss_mdp_intf_video.c

+1 −1
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ static int mdss_mdp_video_ctx_setup(struct mdss_mdp_ctl *ctl, 


	if (mdss_mdp_is_cdm_supported(mdata, ctl->intf_type, 0)) {

		ctl->cdm = mdss_mdp_cdm_init(ctl, MDP_CDM_CDWN_OUTPUT_HDMI);

		if (ctl->cdm) {

		if (!IS_ERR_OR_NULL(ctl->cdm)) {

			if (mdss_mdp_video_cdm_setup(ctl->cdm, pinfo)) {

				pr_err("%s: setting up cdm failed\n",

				       __func__);

drivers/video/msm/mdss/mdss_mdp_intf_writeback.c

+2 −1
Original line number Diff line number Diff line
@@ -848,11 +848,12 @@ int mdss_mdp_writeback_start(struct mdss_mdp_ctl *ctl) 
	if (mdss_mdp_is_cdm_supported(ctl->mdata, ctl->intf_type,

				mixer_type)) {

		ctl->cdm = mdss_mdp_cdm_init(ctl, MDP_CDM_CDWN_OUTPUT_WB);

		if (!ctl->cdm) {

		if (IS_ERR_OR_NULL(ctl->cdm)) {

			pr_err("%s failed to init cdm\n", __func__);

			return -EBUSY;

		}

	} else {

		ctl->cdm = NULL;

		pr_debug("%s: cdm not supported\n", __func__);

	}

	ctl->priv_data = ctx;