From 4d47b797d6bb1db34ddf702f2cf78104be135a8f Mon Sep 17 00:00:00 2001 From: "Oliver F. Brown" Date: Fri, 24 Jul 2020 14:28:05 -0500 Subject: 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 Reviewed-by: Liu Ying (cherry picked from commit 863af2196cb53200f50b1d04c6eb90d04262b0e4) Related-to: ELB-3237 Signed-off-by: Max Krummenacher --- drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c | 9 ++++++--- 1 file 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); -- cgit v1.2.3