From 4133deb0cc1afda46b90ec2789371793025b7428 Mon Sep 17 00:00:00 2001 From: Sandor Yu Date: Wed, 22 Nov 2017 18:29:31 +0800 Subject: [PATCH] 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 (cherry picked from commit 4bdf485762441578a50a1b1586777f1291dd32e5) --- drivers/gpu/drm/imx/hdp/imx-hdp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/imx/hdp/imx-hdp.c b/drivers/gpu/drm/imx/hdp/imx-hdp.c index ba772ae45ebf..9698f363bc4e 100644 --- a/drivers/gpu/drm/imx/hdp/imx-hdp.c +++ b/drivers/gpu/drm/imx/hdp/imx-hdp.c @@ -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; -- 2.17.1