Commit f1d599d3 authored by Daniel Vetter's avatar Daniel Vetter Committed by Thomas Zimmermann
Browse files

video/aperture: Move vga handling to pci function 



A few reasons for this:

- It's really the only one where this matters. I tried looking around,
  and I didn't find any non-pci vga-compatible controllers for x86
  (since that's the only platform where we had this until a few
  patches ago), where a driver participating in the aperture claim
  dance would interfere.

- I also don't expect that any future bus anytime soon will
  not just look like pci towards the OS, that's been the case for like
  25+ years by now for practically everything (even non non-x86).

- Also it's a bit funny if we have one part of the vga removal in the
  pci function, and the other in the generic one.

v2: Rebase.

v4:
- fix Daniel's S-o-b address

v5:
- add back an S-o-b tag with Daniel's Intel address

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230406132109.32050-6-tzimmermann@suse.de
parent 7450cd23

drivers/video/aperture.c

+7 −8
Original line number Diff line number Diff line
@@ -298,14 +298,6 @@ int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t si 


	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);



	return 0;

}

EXPORT_SYMBOL(aperture_remove_conflicting_devices);
@@ -343,6 +335,13 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na 
	}



	if (primary) {

		/*

		 * 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.

		 */

		aperture_detach_devices(VGA_FB_PHYS_BASE, VGA_FB_PHYS_SIZE);



		/*

		 * WARNING: Apparently we must kick fbdev drivers before vgacon,

		 * otherwise the vga fbdev driver falls over.