MLK-16941: hdmi: check video mode with cmdline mode

when EDID function is disabled, the cmdline mode is
the max support video mode.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit 4bdf485762441578a50a1b1586777f1291dd32e5)

diff --git a/drivers/gpu/drm/imx/hdp/imx-hdp.c b/drivers/gpu/drm/imx/hdp/imx-hdp.c
index e90c919..bf1f795 100644 (file)
--- a/drivers/gpu/drm/imx/hdp/imx-hdp.c
+++ b/drivers/gpu/drm/imx/hdp/imx-hdp.c
@@ -716,6 +716,14 @@ imx_hdp_connector_mode_valid(struct drm_connector *connector,
        struct imx_hdp *hdp = container_of(connector, struct imx_hdp,
                                             connector);
        enum drm_mode_status mode_status = MODE_OK;
+       struct drm_cmdline_mode *cmdline_mode;
+       cmdline_mode = &connector->cmdline_mode;
+
+       /* cmdline mode is the max support video mode when edid disabled */
+       if (!hdp->is_edid)
+               if (cmdline_mode->xres != 0 &&
+                       cmdline_mode->xres < mode->hdisplay)
+                       return MODE_BAD_HVALUE;
 
        if (hdp->is_4kp60 && mode->clock > 594000)
                return MODE_CLOCK_HIGH;