3 files changed, 48 insertions, 21 deletions

diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 121d30ca2d44..87fe8ed92ebe 100644
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -70,7 +70,9 @@ static const struct dw_hdmi_curr_ctrl imx_cur_ctr[] = {
                 118800000, { 0x091c, 0x091c, 0x06dc },
         }, {
                 216000000, { 0x06dc, 0x0b5c, 0x091c },
-        }
+        }, {
+                ~0UL, { 0x0000, 0x0000, 0x0000 },
+        },
 };
 
 static const struct dw_hdmi_sym_term imx_sym_term[] = {
@@ -136,11 +138,34 @@ static struct drm_encoder_funcs dw_hdmi_imx_encoder_funcs = {
         .destroy = drm_encoder_cleanup,
 };
 
+static enum drm_mode_status imx6q_hdmi_mode_valid(struct drm_connector *con,
+                                                  struct drm_display_mode *mode)
+{
+        if (mode->clock < 13500)
+                return MODE_CLOCK_LOW;
+        if (mode->clock > 266000)
+                return MODE_CLOCK_HIGH;
+
+        return MODE_OK;
+}
+
+static enum drm_mode_status imx6dl_hdmi_mode_valid(struct drm_connector *con,
+                                                   struct drm_display_mode *mode)
+{
+        if (mode->clock < 13500)
+                return MODE_CLOCK_LOW;
+        if (mode->clock > 270000)
+                return MODE_CLOCK_HIGH;
+
+        return MODE_OK;
+}
+
 static struct dw_hdmi_plat_data imx6q_hdmi_drv_data = {
-        .mpll_cfg = imx_mpll_cfg,
-        .cur_ctr  = imx_cur_ctr,
-        .sym_term = imx_sym_term,
-        .dev_type = IMX6Q_HDMI,
+        .mpll_cfg   = imx_mpll_cfg,
+        .cur_ctr    = imx_cur_ctr,
+        .sym_term   = imx_sym_term,
+        .dev_type   = IMX6Q_HDMI,
+        .mode_valid = imx6q_hdmi_mode_valid,
 };
 
 static struct dw_hdmi_plat_data imx6dl_hdmi_drv_data = {
@@ -148,6 +173,7 @@ static struct dw_hdmi_plat_data imx6dl_hdmi_drv_data = {
         .cur_ctr  = imx_cur_ctr,
         .sym_term = imx_sym_term,
         .dev_type = IMX6DL_HDMI,
+        .mode_valid = imx6dl_hdmi_mode_valid,
 };
 
 static const struct of_device_id dw_hdmi_imx_dt_ids[] = {
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 1b86aac0b341..2d6dc94e1e64 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -163,22 +163,7 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder)
 {
         struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
         struct imx_ldb *ldb = imx_ldb_ch->ldb;
-        struct drm_display_mode *mode = &encoder->crtc->hwmode;
         u32 pixel_fmt;
-        unsigned long serial_clk;
-        unsigned long di_clk = mode->clock * 1000;
-        int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);
-
-        if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
-                /* dual channel LVDS mode */
-                serial_clk = 3500UL * mode->clock;
-                imx_ldb_set_clock(ldb, mux, 0, serial_clk, di_clk);
-                imx_ldb_set_clock(ldb, mux, 1, serial_clk, di_clk);
-        } else {
-                serial_clk = 7000UL * mode->clock;
-                imx_ldb_set_clock(ldb, mux, imx_ldb_ch->chno, serial_clk,
-                                di_clk);
-        }
 
         switch (imx_ldb_ch->chno) {
         case 0:
@@ -247,6 +232,9 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,
         struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
         struct imx_ldb *ldb = imx_ldb_ch->ldb;
         int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
+        unsigned long serial_clk;
+        unsigned long di_clk = mode->clock * 1000;
+        int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);
 
         if (mode->clock > 170000) {
                 dev_warn(ldb->dev,
@@ -257,6 +245,16 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,
                          "%s: mode exceeds 85 MHz pixel clock\n", __func__);
         }
 
+        if (dual) {
+                serial_clk = 3500UL * mode->clock;
+                imx_ldb_set_clock(ldb, mux, 0, serial_clk, di_clk);
+                imx_ldb_set_clock(ldb, mux, 1, serial_clk, di_clk);
+        } else {
+                serial_clk = 7000UL * mode->clock;
+                imx_ldb_set_clock(ldb, mux, imx_ldb_ch->chno, serial_clk,
+                                  di_clk);
+        }
+
         /* FIXME - assumes straight connections DI0 --> CH0, DI1 --> CH1 */
         if (imx_ldb_ch == &ldb->channel[0]) {
                 if (mode->flags & DRM_MODE_FLAG_NVSYNC)
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 5e83e007080f..900dda6a8e71 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -236,8 +236,11 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
         }
 
         panel_node = of_parse_phandle(np, "fsl,panel", 0);
-        if (panel_node)
+        if (panel_node) {
                 imxpd->panel = of_drm_find_panel(panel_node);
+                if (!imxpd->panel)
+                        return -EPROBE_DEFER;
+        }
 
         imxpd->dev = dev;