From 85aacadad89d262f7960dde7c6afdb4b63eb6296 Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Wed, 9 Sep 2015 11:34:04 -0700 Subject: [PATCH] msm: mdss: fix mixer_type assignment in writeback start Assign and use the correct mixer_type in writeback start. Change-Id: Iacb0424b1518eec7077d2c053222358cf6a38abb Signed-off-by: Veera Sundaram Sankaran --- drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c index 9e961694fef5..4d8daeeea056 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c @@ -819,7 +819,7 @@ int mdss_mdp_writeback_start(struct mdss_mdp_ctl *ctl) struct mdss_mdp_writeback_ctx *ctx; struct mdss_mdp_writeback *wb; u32 mem_sel; - u32 mixer_type = 0; + u32 mixer_type = MDSS_MDP_MIXER_TYPE_UNUSED; pr_debug("start ctl=%d\n", ctl->num); @@ -841,13 +841,12 @@ int mdss_mdp_writeback_start(struct mdss_mdp_ctl *ctl) pr_err("invalid writeback mode %d\n", mem_sel); return -EINVAL; } + if (ctl->mixer_left) mixer_type = ctl->mixer_left->type; - else - mixer_type = MDSS_MDP_MIXER_TYPE_UNUSED; if (mdss_mdp_is_cdm_supported(ctl->mdata, ctl->intf_type, - ctl->mixer_left->type)) { + mixer_type)) { ctl->cdm = mdss_mdp_cdm_init(ctl, MDP_CDM_CDWN_OUTPUT_WB); if (!ctl->cdm) { pr_err("%s failed to init cdm\n", __func__);