[PATCH v5 4/9] video/aperture: Only kick vgacon when the pdev is decoding vga
Thomas Zimmermann
tzimmermann at suse.de
Thu Apr 6 13:21:04 UTC 2023
From: Daniel Vetter <daniel.vetter at ffwll.ch>
Otherwise it's a bit silly, and we might throw out the driver for the
screen the user is actually looking at. I haven't found a bug report
for this case yet, but we did get bug reports for the analog case
where we're throwing out the efifb driver.
v2: Flip the check around to make it clear it's a special case for
kicking out the vgacon driver only (Thomas)
v4:
- fixes to commit message
- fix Daniel's S-o-b address
v5:
- add back an S-o-b tag with Daniel's Intel address
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216303
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Cc: Thomas Zimmermann <tzimmermann at suse.de>
Cc: Javier Martinez Canillas <javierm at redhat.com>
Cc: Helge Deller <deller at gmx.de>
Cc: linux-fbdev at vger.kernel.org
Reviewed-by: Javier Martinez Canillas <javierm at redhat.com>
---
drivers/video/aperture.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index d0eccc4ed60b..26bdba6b2725 100644
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -342,13 +342,15 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
return ret;
}
- /*
- * WARNING: Apparently we must kick fbdev drivers before vgacon,
- * otherwise the vga fbdev driver falls over.
- */
- ret = vga_remove_vgacon(pdev);
- if (ret)
- return ret;
+ if (primary) {
+ /*
+ * WARNING: Apparently we must kick fbdev drivers before vgacon,
+ * otherwise the vga fbdev driver falls over.
+ */
+ ret = vga_remove_vgacon(pdev);
+ if (ret)
+ return ret;
+ }
return 0;
--
2.40.0
More information about the dri-devel
mailing list