From: Ajay Singh Parmar <aparmar@codeaurora.org>
Date: Thu, 6 Oct 2016 23:02:07 +0000 (-0700)
Subject: msm: mdss: edid: limit resolutions support based on interface
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36d28227a524396fcb0d909a58d048920686a2d3;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

msm: mdss: edid: limit resolutions support based on interface

Limit the resolutions provided by sink to the ones supported
by the interface so that user modules do not receive the resolutions
which are not supported by the interface.

Change-Id: I63657f139cd7b058d211c306fb596ac5d80f2495
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
---

diff --git a/drivers/video/fbdev/msm/mdss_hdmi_util.c b/drivers/video/fbdev/msm/mdss_hdmi_util.c
index 9ed909e9a387..b3d929b15b44 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_util.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_util.c
@@ -560,7 +560,7 @@ int msm_hdmi_get_timing_info(
 int hdmi_get_supported_mode(struct msm_hdmi_mode_timing_info *info,
 	struct hdmi_util_ds_data *ds_data, u32 mode)
 {
-	int ret;
+	int ret, i = 0;
 
 	if (!info)
 		return -EINVAL;
@@ -570,9 +570,23 @@ int hdmi_get_supported_mode(struct msm_hdmi_mode_timing_info *info,
 
 	ret = msm_hdmi_get_timing_info(info, mode);
 
-	if (!ret && ds_data && ds_data->ds_registered && ds_data->ds_max_clk) {
-		if (info->pixel_freq > ds_data->ds_max_clk)
-			info->supported = false;
+	if (!ret && ds_data && ds_data->ds_registered) {
+		if (ds_data->ds_max_clk) {
+			if (info->pixel_freq > ds_data->ds_max_clk)
+				info->supported = false;
+		}
+
+		if (ds_data->modes_num) {
+			u32 *modes = ds_data->modes;
+
+			for (i = 0; i < ds_data->modes_num; i++) {
+				if (info->video_format == *modes++)
+					break;
+			}
+
+			if (i == ds_data->modes_num)
+				info->supported = false;
+		}
 	}
 
 	return ret;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_util.h b/drivers/video/fbdev/msm/mdss_hdmi_util.h
index e65cf915fe92..8a7e4d1ebafc 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_util.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_util.h
@@ -459,6 +459,8 @@ struct hdmi_tx_ddc_ctrl {
 struct hdmi_util_ds_data {
 	bool ds_registered;
 	u32 ds_max_clk;
+	u32 modes_num;
+	u32 *modes;
 };
 
 static inline int hdmi_tx_get_v_total(const struct msm_hdmi_mode_timing_info *t)