Index: sys/external/bsd/drm2/radeon/radeon_pci.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/radeon/radeon_pci.c,v
retrieving revision 1.6
diff -u -r1.6 radeon_pci.c
--- sys/external/bsd/drm2/radeon/radeon_pci.c 16 Feb 2015 12:17:57 -0000 1.6
+++ sys/external/bsd/drm2/radeon/radeon_pci.c 28 Feb 2015 23:12:05 -0000
@@ -186,6 +186,13 @@
"i386 radeondrmkms hack\n");
#endif
+#if NVGA > 0
+ /* XXX should be something like WSDISPLAY_TYPE_RADEONVGA */
+ if (vga_cndetach())
+ (void) vga_cnattach(pa->pa_iot, pa->pa_memt,
+ WSDISPLAY_TYPE_UNKNOWN, 1);
+#endif
+
config_mountroot(self, &radeon_attach_real);
}
Index: sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c,v
retrieving revision 1.5
diff -u -r1.5 radeondrmkmsfb.c
--- sys/external/bsd/drm2/radeon/radeondrmkmsfb.c 18 Nov 2014 09:28:36 -0000 1.5
+++ sys/external/bsd/drm2/radeon/radeondrmkmsfb.c 28 Feb 2015 23:12:05 -0000
@@ -182,10 +182,9 @@
/* XXX Whattakludge! */
#if NVGA > 0
- if (vga_is_console(rfa->rfa_fb_helper->dev->pdev->pd_pa.pa_iot, -1)) {
+ if (vga_cndetach()) {
what_was_cons = CONS_VGA;
prop_dictionary_set_bool(dict, "is_console", true);
- vga_cndetach();
} else
#endif
if (genfb_is_console() && genfb_is_enabled()) {
