summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver F. Brown <oliver.brown@nxp.com>2020-07-24 14:28:05 -0500
committerMax Krummenacher <max.krummenacher@toradex.com>2020-11-11 18:09:04 +0100
commit4d47b797d6bb1db34ddf702f2cf78104be135a8f (patch)
tree5a12b5cc42e97e42a9f5370eb852277b2ac18c39
parent3f945d0d10f0ce2d6d84d336abf52470794770d6 (diff)
MLK-24521: drm: bridge: hdmi: Prevent the driver from rejecting VIC 0 modes
iMX8QM can support the non CEA modes, iMX8M cannot support non CEA modes. So driver should allow non CEA modes for iMX8QM. Signed-off-by: Oliver F. Brown <oliver.brown@nxp.com> Reviewed-by: Liu Ying <victor.liu@nxp.com> (cherry picked from commit 863af2196cb53200f50b1d04c6eb90d04262b0e4) Related-to: ELB-3237 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
index 7792aef1151f..067290b3b3ad 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
@@ -388,9 +388,12 @@ cdns_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
if (mode->hdisplay > 3840 || mode->vdisplay > 2160)
return MODE_BAD_HVALUE;
- vic = drm_match_cea_mode(mode);
- if (vic == 0)
- return MODE_BAD;
+ /* imx8mq-hdmi does not support non CEA modes */
+ if (!strncmp("imx8mq-hdmi", mhdp->plat_data->plat_name, 11)) {
+ vic = drm_match_cea_mode(mode);
+ if (vic == 0)
+ return MODE_BAD;
+ }
mhdp->valid_mode = mode;
ret = cdns_mhdp_plat_call(mhdp, phy_video_valid);