Revert "fbdev: Prevent probing generic drivers if a FB is already registered"

This reverts commit ff33729587d2a6793ed44a73de0a4da5a7b3ddf1.

With

commit 889ae79e9a8c572479f34741d8315ffcbfd494b0
Author: Thomas Zimmermann <tzimmermann@suse.de>
Date:   Tue Jan 25 10:12:18 2022 +0100

    fbdev: Hot-unplug firmware fb devices on forced removal

this should be fixed properly and we can remove this somewhat hackish
check here (e.g. this won't catch drm drivers if fbdev emulation isn't
enabled).

Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Zack Rusin <zackr@vmware.com>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Zack Rusin <zackr@vmware.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Ilya Trukhanov <lahvuun@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Cc: Peter Jones <pjones@redhat.com>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220607182338.344270-5-javierm@redhat.com

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index ea42ba6445b2ddaad7cd1a699ff793dec1bceb4c..edca3703b9640ccf905cc627140535852806738c 100644 (file)
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -351,17 +351,6 @@ static int efifb_probe(struct platform_device *dev)
        char *option = NULL;
        efi_memory_desc_t md;
 
-       /*
-        * Generic drivers must not be registered if a framebuffer exists.
-        * If a native driver was probed, the display hardware was already
-        * taken and attempting to use the system framebuffer is dangerous.
-        */
-       if (num_registered_fb > 0) {
-               dev_err(&dev->dev,
-                       "efifb: a framebuffer is already registered\n");
-               return -EINVAL;
-       }
-
        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI || pci_dev_disabled)
                return -ENODEV;
 

diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 94fc9c6d04113661e57a7f5f7b43f88f17beb5b8..0ef41173325a09ae37d0e79f905850f54393d0e0 100644 (file)
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -413,17 +413,6 @@ static int simplefb_probe(struct platform_device *pdev)
        struct simplefb_par *par;
        struct resource *res, *mem;
 
-       /*
-        * Generic drivers must not be registered if a framebuffer exists.
-        * If a native driver was probed, the display hardware was already
-        * taken and attempting to use the system framebuffer is dangerous.
-        */
-       if (num_registered_fb > 0) {
-               dev_err(&pdev->dev,
-                       "simplefb: a framebuffer is already registered\n");
-               return -EINVAL;
-       }
-
        if (fb_get_options("simplefb", NULL))
                return -ENODEV;