Merge "msm: mdss: dp: do not include VICs from YC420 VDB"
This commit is contained in:
commit
c8eb182375
5 changed files with 13 additions and 0 deletions
|
@ -1967,6 +1967,7 @@ static int mdss_dp_edid_init(struct mdss_panel_data *pdata)
|
|||
|
||||
edid_init_data.kobj = dp_drv->kobj;
|
||||
edid_init_data.max_pclk_khz = dp_drv->max_pclk_khz;
|
||||
edid_init_data.yc420_support = false;
|
||||
|
||||
edid_data = hdmi_edid_init(&edid_init_data);
|
||||
if (!edid_data) {
|
||||
|
|
|
@ -165,6 +165,10 @@ static bool hdmi_edid_is_mode_supported(struct hdmi_edid_ctrl *edid_ctrl,
|
|||
pclk > edid_ctrl->init_data.max_pclk_khz)
|
||||
return false;
|
||||
|
||||
if ((out_format == MDP_Y_CBCR_H2V2) &&
|
||||
!edid_ctrl->init_data.yc420_support)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ struct hdmi_edid_init_data {
|
|||
struct kobject *kobj;
|
||||
struct hdmi_util_ds_data ds_data;
|
||||
u32 max_pclk_khz;
|
||||
bool yc420_support;
|
||||
u8 *buf;
|
||||
u32 buf_size;
|
||||
};
|
||||
|
|
|
@ -1832,6 +1832,7 @@ static int hdmi_tx_init_edid(struct hdmi_tx_ctrl *hdmi_ctrl)
|
|||
edid_init_data.kobj = hdmi_ctrl->kobj;
|
||||
edid_init_data.ds_data = hdmi_ctrl->ds_data;
|
||||
edid_init_data.max_pclk_khz = hdmi_ctrl->max_pclk_khz;
|
||||
edid_init_data.yc420_support = true;
|
||||
|
||||
edid_data = hdmi_edid_init(&edid_init_data);
|
||||
if (!edid_data) {
|
||||
|
|
|
@ -632,6 +632,12 @@ const char *msm_hdmi_mode_2string(u32 mode)
|
|||
case HDMI_RES_AR_16_10:
|
||||
aspect_ratio = "16/10";
|
||||
break;
|
||||
case HDMI_RES_AR_64_27:
|
||||
aspect_ratio = "64/27";
|
||||
break;
|
||||
case HDMI_RES_AR_256_135:
|
||||
aspect_ratio = "256/135";
|
||||
break;
|
||||
default:
|
||||
aspect_ratio = "???";
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue