[PATCH 09/11] video/aperture: Remove conflicting VGA devices, if any
From: Thomas Zimmermann <tzimmermann@suse.de>
Date: 2022-07-07 15:40:26
Also in:
dri-devel, linux-staging
Subsystem:
drm driver for firmware framebuffers, framebuffer layer, the rest · Maintainers:
Thomas Zimmermann, Javier Martinez Canillas, Helge Deller, Linus Torvalds
On the primary graphics adapter, a driver might conflict with a VGA driver that controls the VGA framebuffer I/O range. Remove the VGA driver from the aperture helpers. Until now, this case has been hendled by fbdev, but it should work even with fbdev disabled. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/video/aperture.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index 101e13c2cf41..abc691284a77 100644
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c@@ -12,6 +12,8 @@ #include <linux/types.h> #include <linux/vgaarb.h> +#include <video/vga.h> + /** * DOC: overview *
@@ -300,6 +302,16 @@ int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t si */ sysfb_disable(); + aperture_detach_devices(base, size); + + /* + * If this is the primary adapter, there could be a VGA device + * that consumes the VGA framebuffer I/O range. Remove this device + * as well. + */ + if (primary) + aperture_detach_devices(VGA_FB_PHYS_BASE, VGA_FB_PHYS_SIZE); + #if IS_REACHABLE(CONFIG_FB) a = alloc_apertures(1); if (!a)
@@ -315,8 +327,6 @@ int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t si return ret; #endif - aperture_detach_devices(base, size); - return 0; } EXPORT_SYMBOL(aperture_remove_conflicting_devices);
--
2.36.1