From: Thomas Zimmermann <tzimmermann@suse.de> To: javierm@redhat.com, deller@gmx.de, daniel@ffwll.ch, sam@ravnborg.org, maxime@cerno.tech Cc: linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, dri-devel@lists.freedesktop.org, Thomas Zimmermann <tzimmermann@suse.de> Subject: [PATCH 09/11] video/aperture: Remove conflicting VGA devices, if any Date: Thu, 7 Jul 2022 17:39:50 +0200 [thread overview] Message-ID: <20220707153952.32264-10-tzimmermann@suse.de> (raw) In-Reply-To: <20220707153952.32264-1-tzimmermann@suse.de> 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
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Zimmermann <tzimmermann@suse.de> To: javierm@redhat.com, deller@gmx.de, daniel@ffwll.ch, sam@ravnborg.org, maxime@cerno.tech Cc: linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org Subject: [PATCH 09/11] video/aperture: Remove conflicting VGA devices, if any Date: Thu, 7 Jul 2022 17:39:50 +0200 [thread overview] Message-ID: <20220707153952.32264-10-tzimmermann@suse.de> (raw) In-Reply-To: <20220707153952.32264-1-tzimmermann@suse.de> 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
next prev parent reply other threads:[~2022-07-07 15:40 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-07 15:39 [PATCH 00/11] fbdev: Maintain device ownership with aperture helpers Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-07 15:39 ` [PATCH 01/11] fbdev: Remove trailing whitespaces Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-08 12:49 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 02/11] fbdev/vga16fb: Create EGA/VGA devices in sysfb code Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-08 13:09 ` Javier Martinez Canillas 2022-07-11 7:58 ` Thomas Zimmermann 2022-07-11 9:54 ` Javier Martinez Canillas 2022-07-11 10:42 ` Thomas Zimmermann 2022-07-11 10:50 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 03/11] fbdev/vga16fb: Auto-generate module init/exit code Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-08 13:16 ` Javier Martinez Canillas 2022-07-11 8:01 ` Thomas Zimmermann 2022-07-11 9:55 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 04/11] fbdev/core: Remove remove_conflicting_pci_framebuffers() Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 10:51 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 05/11] fbdev: Convert drivers to aperture helpers Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 11:01 ` Javier Martinez Canillas 2022-07-15 11:48 ` Thomas Zimmermann 2022-07-15 11:56 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 06/11] fbdev: Remove conflicting devices on PCI bus Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 11:13 ` Javier Martinez Canillas 2022-07-15 11:52 ` Thomas Zimmermann 2022-07-07 15:39 ` [PATCH 07/11] video/aperture: Disable and unregister sysfb devices via aperture helpers Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 11:16 ` Javier Martinez Canillas 2022-07-11 11:16 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 08/11] video: Provide constants for VGA I/O range Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 11:21 ` Javier Martinez Canillas 2022-07-07 15:39 ` Thomas Zimmermann [this message] 2022-07-07 15:39 ` [PATCH 09/11] video/aperture: Remove conflicting VGA devices, if any Thomas Zimmermann 2022-07-11 11:24 ` Javier Martinez Canillas 2022-07-07 15:39 ` [PATCH 10/11] fbdev: Acquire framebuffer apertures for firmware devices Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 11:29 ` Javier Martinez Canillas 2022-07-15 11:58 ` Thomas Zimmermann 2022-07-07 15:39 ` [PATCH 11/11] fbdev: Remove conflict-handling code Thomas Zimmermann 2022-07-07 15:39 ` Thomas Zimmermann 2022-07-11 11:33 ` Javier Martinez Canillas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220707153952.32264-10-tzimmermann@suse.de \ --to=tzimmermann@suse.de \ --cc=daniel@ffwll.ch \ --cc=deller@gmx.de \ --cc=dri-devel@lists.freedesktop.org \ --cc=javierm@redhat.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-staging@lists.linux.dev \ --cc=maxime@cerno.tech \ --cc=sam@ravnborg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.