Only remove sysfb and VGA devices for primary graphics devices. The PCI helper for aperture ownership now detects primary devices. Resolves bug reports about lost framebuffer consoles on systems with multiple graphics cards. The series picks up Daniel's patchset at v3 from [1] and cleans up a few minor things. There's another patch on top that clarifys gma500's special case. v5: * fix gma500 comment * add S-o-b tag with Daniel's Intel address v4: * add gma500 patch on top of v3 * fix Daniel's S-o-b address * fix various typos in the commit messages Daniel Vetter (8): drm/gma500: Use drm_aperture_remove_conflicting_pci_framebuffers video/aperture: use generic code to figure out the vga default device drm/aperture: Remove primary argument video/aperture: Only kick vgacon when the pdev is decoding vga video/aperture: Move vga handling to pci function video/aperture: Drop primary argument video/aperture: Only remove sysfb on the default vga pci device fbdev: Simplify fb_is_primary_device for x86 Thomas Zimmermann (1): video/aperture: Provide a VGA helper for gma500 and internal use arch/x86/video/fbdev.c | 13 +--- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/drm_aperture.c | 11 +--- drivers/gpu/drm/gma500/psb_drv.c | 43 ++++++++++--- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 - drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/stm/drv.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/video/aperture.c | 70 ++++++++++++++------- drivers/video/fbdev/hyperv_fb.c | 2 +- include/drm/drm_aperture.h | 7 +-- include/linux/aperture.h | 16 +++-- 17 files changed, 108 insertions(+), 73 deletions(-) -- 2.40.0
