video/aperture: Disable and unregister sysfb devices via aperture helpers

[platform/kernel/linux-starfive.git] / drivers / video / aperture.c

diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index f42a0d8..101e13c 100644 (file)
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -8,6 +8,7 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/sysfb.h>
 #include <linux/types.h>
 #include <linux/vgaarb.h>
 
@@ -286,7 +287,20 @@ int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t si
 #if IS_REACHABLE(CONFIG_FB)
        struct apertures_struct *a;
        int ret;
+#endif
+
+       /*
+        * If a driver asked to unregister a platform device registered by
+        * sysfb, then can be assumed that this is a driver for a display
+        * that is set up by the system firmware and has a generic driver.
+        *
+        * Drivers for devices that don't have a generic driver will never
+        * ask for this, so let's assume that a real driver for the display
+        * was already probed and prevent sysfb to register devices later.
+        */
+       sysfb_disable();
 
+#if IS_REACHABLE(CONFIG_FB)
        a = alloc_apertures(1);
        if (!a)
                return -ENOMEM;