aboutsummaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2017-04-30 08:28:05 +0200
committerNico Huber <nico.h@gmx.de>2017-05-03 16:16:43 +0200
commit8c5884e8d739ed0271da051034f5c4f475a00b55 (patch)
tree6b120a66bed866c6ba8cd0ad0d20e8e7cf2bb896 /src/soc
parenta459a8a145be0413d540d6cb62f9a1b6ead3175a (diff)
lib/edid.c: Differentiate between absent and non-conformant EDID
Change-Id: Id90aa210ff72092c4ab638a7bafb82bd11889bdc Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/19502 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/nvidia/tegra124/dp.c2
-rw-r--r--src/soc/nvidia/tegra210/dp.c2
-rw-r--r--src/soc/rockchip/common/edp.c2
-rw-r--r--src/soc/rockchip/rk3288/hdmi.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/soc/nvidia/tegra124/dp.c b/src/soc/nvidia/tegra124/dp.c
index a308f68fe1..0132369073 100644
--- a/src/soc/nvidia/tegra124/dp.c
+++ b/src/soc/nvidia/tegra124/dp.c
@@ -1322,7 +1322,7 @@ static void tegra_dp_update_config(struct tegra_dc_dp_data *dp,
return;
}
- if (decode_edid(buf, sizeof(buf), &edid)) {
+ if (decode_edid(buf, sizeof(buf), &edid) != EDID_CONFORMANT) {
printk(BIOS_ERR, "%s: Failed to decode EDID. Use defaults.\n",
__func__);
return;
diff --git a/src/soc/nvidia/tegra210/dp.c b/src/soc/nvidia/tegra210/dp.c
index e0475842e3..350eb8254d 100644
--- a/src/soc/nvidia/tegra210/dp.c
+++ b/src/soc/nvidia/tegra210/dp.c
@@ -1361,7 +1361,7 @@ static void tegra_dp_update_config(struct tegra_dc_dp_data *dp,
return;
}
- if (decode_edid(buf, sizeof(buf), &edid)) {
+ if (decode_edid(buf, sizeof(buf), &edid) != EDID_CONFORMANT) {
printk(BIOS_ERR, "%s: Failed to decode EDID. Use defaults.\n",
__func__);
return;
diff --git a/src/soc/rockchip/common/edp.c b/src/soc/rockchip/common/edp.c
index 5723ccf660..259400530e 100644
--- a/src/soc/rockchip/common/edp.c
+++ b/src/soc/rockchip/common/edp.c
@@ -778,7 +778,7 @@ static int rk_edp_read_edid(struct rk_edp *edp, struct edid *edid)
}
}
- if (decode_edid(buf, edid_size, edid)) {
+ if (decode_edid(buf, edid_size, edid) != EDID_CONFORMANT) {
printk(BIOS_ERR, "%s: Failed to decode EDID.\n",
__func__);
return -1;
diff --git a/src/soc/rockchip/rk3288/hdmi.c b/src/soc/rockchip/rk3288/hdmi.c
index 496629316e..5e744236e7 100644
--- a/src/soc/rockchip/rk3288/hdmi.c
+++ b/src/soc/rockchip/rk3288/hdmi.c
@@ -814,7 +814,7 @@ int rk_hdmi_get_edid(struct edid *edid)
/* Assume usage of HDMI implies an external display in which case
* we should be lenient about errors that the EDID decoder finds. */
- if (decode_edid(edid_buf, edid_size, edid))
+ if (decode_edid(edid_buf, edid_size, edid) != EDID_CONFORMANT)
hdmi_debug("failed to decode edid.\n");
/* Try 480p for best compatibility. */