Unverified Commit bdde97ac authored by Simona Vetter's avatar Simona Vetter Committed by Javier Martinez Canillas
Browse files

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



This reverts commit fb561bf9.

With

commit 27599aac
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: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Cc: Peter Jones <pjones@redhat.com>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220607182338.344270-5-javierm@redhat.com
parent 873eb3b1

drivers/video/fbdev/efifb.c

+0 −11
Original line number Diff line number Diff line
@@ -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;

drivers/video/fbdev/simplefb.c

+0 −11
Original line number Diff line number Diff line
@@ -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;