From 5ddbf6aedc66e6fe8403a9997c659371a3c66193 Mon Sep 17 00:00:00 2001 From: Benjamin Chan Date: Tue, 22 Nov 2016 17:22:47 -0500 Subject: [PATCH] msm: mdss: Fix disabling destination scalar using 4K panel 4K panel uses split control path setup, so there is no need to correct the panel width when updating the mixer width resolution during destination scalar disabling. CRs-Fixed: 1093549 Change-Id: I064987534124e025abaccec05ab70acf93538bce Signed-off-by: Benjamin Chan --- drivers/video/fbdev/msm/mdss_mdp_layer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_layer.c b/drivers/video/fbdev/msm/mdss_mdp_layer.c index 73350b3a5a6f..b3e204fe7b8d 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_layer.c +++ b/drivers/video/fbdev/msm/mdss_mdp_layer.c @@ -71,6 +71,7 @@ static void mdss_mdp_disable_destination_scaler_setup(struct mdss_mdp_ctl *ctl) { struct mdss_data_type *mdata = ctl->mdata; struct mdss_panel_info *pinfo = &ctl->panel_data->panel_info; + struct mdss_mdp_ctl *split_ctl; if (test_bit(MDSS_CAPS_DEST_SCALER, mdata->mdss_caps_map)) { if (ctl->mixer_left && ctl->mixer_right && @@ -80,9 +81,11 @@ static void mdss_mdp_disable_destination_scaler_setup(struct mdss_mdp_ctl *ctl) /* * DUAL mode disable */ + split_ctl = mdss_mdp_get_split_ctl(ctl); ctl->mixer_left->width = get_panel_width(ctl); ctl->mixer_left->height = get_panel_yres(pinfo); - ctl->mixer_left->width /= 2; + if (!split_ctl) + ctl->mixer_left->width /= 2; ctl->mixer_right->width = ctl->mixer_left->width; ctl->mixer_right->height = ctl->mixer_left->height; ctl->mixer_left->roi = (struct mdss_rect) { 0, 0, -- 2.11.0