MLK-16941: hdmi: check video mode with cmdline mode
authorSandor Yu <Sandor.yu@nxp.com>
Wed, 22 Nov 2017 10:29:31 +0000 (18:29 +0800)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
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)

drivers/gpu/drm/imx/hdp/imx-hdp.c

index ba772ae..9698f36 100644 (file)
@@ -714,6 +714,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;