summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinu Deokaran <vinud@codeaurora.org>2015-11-24 14:55:33 -0500
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:13:56 -0700
commit79a61c8acca6c64fcb7d80b52db86dff123aa0d5 (patch)
tree5b6013fc00cc563ee359f433dd1ba6e18fe4698c
parent8025140d379d9dcc436a80d8b5ff42eb1d398336 (diff)
msm: mdss: add a new display id for panel destination
Since driver could support four displays running concurrently, adding one more display id for setting up panel destination. Change-Id: I0999b3787e1a329538d6513fc3c9a43a3da9999a Signed-off-by: Vinu Deokaran <vinud@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_hdmi_tx.c4
-rw-r--r--drivers/video/fbdev/msm/mdss_panel.h3
-rw-r--r--drivers/video/fbdev/msm/mdss_wb.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
index eee318a5e370..83cd1b10db50 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
@@ -1688,7 +1688,7 @@ static int hdmi_tx_init_panel_info(struct hdmi_tx_ctrl *hdmi_ctrl)
pinfo->lcdc.v_pulse_width = timing.pulse_width_v;
pinfo->type = DTV_PANEL;
- pinfo->pdest = DISPLAY_2;
+ pinfo->pdest = DISPLAY_3;
pinfo->wait_cycle = 0;
pinfo->bpp = 24;
pinfo->fb_num = 1;
@@ -4905,7 +4905,7 @@ static int hdmi_tx_get_dt_data(struct platform_device *pdev,
if (!pdata->cont_splash_enabled)
pdata->cont_splash_enabled =
- hdmi_ctrl->mdss_util->panel_intf_status(DISPLAY_2,
+ hdmi_ctrl->mdss_util->panel_intf_status(DISPLAY_3,
MDSS_PANEL_INTF_HDMI) ? true : false;
pdata->pluggable = of_property_read_bool(pdev->dev.of_node,
diff --git a/drivers/video/fbdev/msm/mdss_panel.h b/drivers/video/fbdev/msm/mdss_panel.h
index b7a17c8bd152..46294fe25583 100644
--- a/drivers/video/fbdev/msm/mdss_panel.h
+++ b/drivers/video/fbdev/msm/mdss_panel.h
@@ -87,7 +87,8 @@ enum {
enum {
DISPLAY_1 = 0, /* attached as first device */
DISPLAY_2, /* attached on second device */
- DISPLAY_3, /* attached on third writeback device */
+ DISPLAY_3, /* attached on third device */
+ DISPLAY_4, /* attached on fourth device */
MAX_PHYS_TARGET_NUM,
};
diff --git a/drivers/video/fbdev/msm/mdss_wb.c b/drivers/video/fbdev/msm/mdss_wb.c
index 6dff49caae64..68ccfebf4e29 100644
--- a/drivers/video/fbdev/msm/mdss_wb.c
+++ b/drivers/video/fbdev/msm/mdss_wb.c
@@ -153,7 +153,7 @@ static int mdss_wb_probe(struct platform_device *pdev)
pdata->panel_info.type = WRITEBACK_PANEL;
pdata->panel_info.clk_rate = 74250000;
- pdata->panel_info.pdest = DISPLAY_3;
+ pdata->panel_info.pdest = DISPLAY_4;
pdata->panel_info.out_format = MDP_Y_CBCR_H2V2_VENUS;
pdata->event_handler = mdss_wb_event_handler;