diff options
| author | Ajay Singh Parmar <aparmar@codeaurora.org> | 2014-09-04 12:10:08 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:32:59 -0700 |
| commit | cbf7aaa27fedf6063e4285668b22aaaae9328786 (patch) | |
| tree | a49c3cbeb94935725d833671f28ff64104b3d80c /drivers/video/fbdev | |
| parent | 0cdfe89e5bf72c9ffb90b922691ceee4574d05c4 (diff) | |
msm: mdss: hdmi: get vic from cmdline in case hdmi is primary
In case of HDMI is primary, get the default VIC (Video Identification
Code) from the command line to configure the display pipeline with this
resolution data for continuous splash screen.
Change-Id: I96325045f4af0712d2f68fadf190edcf6d815841
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 8be9fe2c527d..28a09318d4ce 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -3404,10 +3404,7 @@ static int hdmi_tx_register_panel(struct hdmi_tx_ctrl *hdmi_ctrl) hdmi_ctrl->panel_data.event_handler = hdmi_tx_panel_event_handler; - /* Default 1080p resolution for hdmi primary display */ - if (hdmi_ctrl->pdata.primary) - hdmi_ctrl->video_resolution = DEFAULT_HDMI_PRIMARY_RESOLUTION; - else + if (!hdmi_ctrl->pdata.primary) hdmi_ctrl->video_resolution = DEFAULT_VIDEO_RESOLUTION; rc = hdmi_tx_init_panel_info(hdmi_ctrl->video_resolution, @@ -4015,8 +4012,13 @@ static int hdmi_tx_probe(struct platform_device *pdev) if (IS_ERR(pan_cfg)) { return PTR_ERR(pan_cfg); } else if (pan_cfg) { - DEV_DBG("%s: HDMI is primary\n", __func__); + int vic; + + if (kstrtoint(pan_cfg->arg_cfg, 10, &vic)) + vic = DEFAULT_HDMI_PRIMARY_RESOLUTION; + hdmi_ctrl->pdata.primary = true; + hdmi_ctrl->video_resolution = vic; } rc = hdmi_tx_init_resource(hdmi_ctrl); |