diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-06-22 10:32:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-06-22 10:33:09 +1000 |
| commit | 0a2af0bd6e48775646dea5f3524a52a74afae7e0 (patch) | |
| tree | 93034a346b2e8f12d13be8282be3953ab47cd6b4 /drivers/video/fbdev/core/fbmem.c | |
| parent | 0f95ee9a0c579ebed0309657f6918673927189f2 (diff) | |
| parent | e4a8864f74e9e9e4a7eb93952a4cfa35c165c930 (diff) | |
Merge tag 'drm-misc-next-2022-06-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v5.20:
UAPI Changes:
Cross-subsystem Changes:
* dma-buf: Add sync-file API; Set DMA mask for udmabuf devices
* fbcon: Cleanups
* fbdev: Disable firmware-device registration when first native driver loads
* iosys-map: Documentation fixes
Core Changes:
* edid: Use struct drm_edid in more places
* gem-cma-helper: Improve documentation
* of: Add data-lane helpers and convert drivers
* syncobj: Fixes
Driver Changes:
* amdgpu: Build fixes
* ast: Support multiple outputs
* bochs: Include <linux/module.h>
* bridge: adv7511: I2C fixes; anx7625: Fix error handling; lt6505: Kconfig fixes
* display/dp: Documentation fixes
* display/dp-mst: Read extended DPCD capabilities during system resume
* logicvc: Add new driver
* magag200: Build fixes
* nouveau: Cleanups
* panel: Add backlight support; nt36672a: DT backlight support
* qxl: Cleanups
* sun4i: HDMI PHY cleanups
* vc4: Add support for BCM2711
* virt-gpu: Avoid NULL dereference; Fix error checks; Cleanups
* vkms: Allocate output buffer with vmalloc(); Fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YqwriEhn0l4uO+Gn@linux-uq9g
Diffstat (limited to 'drivers/video/fbdev/core/fbmem.c')
| -rw-r--r-- | drivers/video/fbdev/core/fbmem.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 2a1a425ceb98..c4a18322dee9 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -19,6 +19,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/slab.h> +#include <linux/sysfb.h> #include <linux/mm.h> #include <linux/mman.h> #include <linux/vt.h> @@ -1764,6 +1765,17 @@ int remove_conflicting_framebuffers(struct apertures_struct *a, do_free = true; } + /* + * 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(); + mutex_lock(®istration_lock); do_remove_conflicting_framebuffers(a, name, primary); mutex_unlock(®istration_lock); |