1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index ab6494818050..aaffe9e64ffb 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -54,8 +54,13 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector)
 static int sun4i_rgb_mode_valid(struct drm_connector *connector,
                                 struct drm_display_mode *mode)
 {
+        struct sun4i_rgb *rgb = drm_connector_to_sun4i_rgb(connector);
+        struct sun4i_drv *drv = rgb->drv;
+        struct sun4i_tcon *tcon = drv->tcon;
         u32 hsync = mode->hsync_end - mode->hsync_start;
         u32 vsync = mode->vsync_end - mode->vsync_start;
+        unsigned long rate = mode->clock * 1000;
+        long rounded_rate;
 
         DRM_DEBUG_DRIVER("Validating modes...\n");
 
@@ -87,6 +92,15 @@ static int sun4i_rgb_mode_valid(struct drm_connector *connector,
 
         DRM_DEBUG_DRIVER("Vertical parameters OK\n");
 
+        rounded_rate = clk_round_rate(tcon->dclk, rate);
+        if (rounded_rate < rate)
+                return MODE_CLOCK_LOW;
+
+        if (rounded_rate > rate)
+                return MODE_CLOCK_HIGH;
+
+        DRM_DEBUG_DRIVER("Clock rate OK\n");
+
         return MODE_OK;
 }
 
@@ -203,7 +217,7 @@ int sun4i_rgb_init(struct drm_device *drm)
         int ret;
 
         /* If we don't have a panel, there's no point in going on */
-        if (!tcon->panel)
+        if (IS_ERR(tcon->panel))
                 return -ENODEV;
 
         rgb = devm_kzalloc(drm->dev, sizeof(*rgb), GFP_KERNEL);