firmware: PSCI: Fix PSCI support for OF live trees

[oweals/u-boot.git] / drivers / video / display-uclass.c

diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 99ef5e76f54bbb7f310a6a366416d723f364c189..1a29ce5d85891b56bc997fb4bc4ef78f0b85c4c0 100644 (file)
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -37,6 +37,17 @@ int display_enable(struct udevice *dev, int panel_bpp,
        return 0;
 }
 
+static bool display_mode_valid(void *priv, const struct display_timing *timing)
+{
+       struct udevice *dev = priv;
+       struct dm_display_ops *ops = display_get_ops(dev);
+
+       if (ops && ops->mode_valid)
+               return ops->mode_valid(dev, timing);
+
+       return true;
+}
+
 int display_read_timing(struct udevice *dev, struct display_timing *timing)
 {
        struct dm_display_ops *ops = display_get_ops(dev);
@@ -53,7 +64,9 @@ int display_read_timing(struct udevice *dev, struct display_timing *timing)
        if (ret < 0)
                return ret;
 
-       return edid_get_timing(buf, ret, timing, &panel_bits_per_colour);
+       return edid_get_timing_validate(buf, ret, timing,
+                                       &panel_bits_per_colour,
+                                       display_mode_valid, dev);
 }
 
 bool display_in_use(struct udevice *dev)