]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/omap: Use omapdss_stack_is_ready() to check that the display stack is up
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 3 May 2016 19:08:01 +0000 (22:08 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 3 Apr 2017 09:36:40 +0000 (12:36 +0300)
Instead of 'guessing' based on aliases of the status of the DSS drivers,
use the new interface to check that all needed drivers are loaded.
In this way we can be sure that all needed drivers are loaded so it is
safe to continue the probing of omapdrm.
This method will allow the omapdrm to be probed 'headless', without
outputs.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/gpu/drm/omapdrm/omap_drv.c

index c7dbf30a61fa7ab2b3587fe497b45bde90f2a443..ad8d16cf819c654124def8a8848dccf809c99c06 100644 (file)
@@ -250,7 +250,9 @@ static int omap_connect_dssdevs(void)
 {
        int r;
        struct omap_dss_device *dssdev = NULL;
-       bool no_displays = true;
+
+       if (!omapdss_stack_is_ready())
+               return -EPROBE_DEFER;
 
        for_each_dss_dev(dssdev) {
                r = dssdev->driver->connect(dssdev);
@@ -260,14 +262,9 @@ static int omap_connect_dssdevs(void)
                } else if (r) {
                        dev_warn(dssdev->dev, "could not connect display: %s\n",
                                dssdev->name);
-               } else {
-                       no_displays = false;
                }
        }
 
-       if (no_displays)
-               return -EPROBE_DEFER;
-
        return 0;
 
 cleanup: