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 e4763de73df5e312ee810eeda9edb8d066176bd9..1a29ce5d85891b56bc997fb4bc4ef78f0b85c4c0 100644 (file)
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2014 Google Inc.
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
@@ -23,10 +22,30 @@ int display_enable(struct udevice *dev, int panel_bpp,
                        const struct display_timing *timing)
 {
        struct dm_display_ops *ops = display_get_ops(dev);
+       struct display_plat *disp_uc_plat;
+       int ret;
 
        if (!ops || !ops->enable)
                return -ENOSYS;
-       return ops->enable(dev, panel_bpp, timing);
+       ret = ops->enable(dev, panel_bpp, timing);
+       if (ret)
+               return ret;
+
+       disp_uc_plat = dev_get_uclass_platdata(dev);
+       disp_uc_plat->in_use = true;
+
+       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)
@@ -45,7 +64,16 @@ 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)
+{
+       struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev);
+
+       return disp_uc_plat->in_use;
 }
 
 UCLASS_DRIVER(display) = {