On Sun, Mar 03, 2013 at 10:39:46PM +0100, Mark Kettenis wrote:
> In order to be able to support a framebuffer console on i386/amd64 I'd
> like to reorder some code such that wsdisaplay(4) attaches to vga(4)
> *after* drm(4). Since I don't have any hardware with radeondrm(4) I'd
> appreciate it if people with access to such hardware would test the
> diff below. Just check that your vga text glass console and X still
> work.
>
Hey Mark,
Seems all good here on an i386 with radeondrm(4):
vga1 at pci1 dev 0 function 0 "ATI Radeon Mobility X1400" rev 0x00
radeondrm0 at vga1: apic 1 int 16
drm0 at radeondrm0
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
Both text console and X seem as fine as ever, killed X a couple
times and restarted, plus switched back and forth between X and
console a few times to make sure everything seemed ok.
Cheers,
-ryan
> Thanks,
>
> Mark
>
>
> Index: vga_pci.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/vga_pci.c,v
> retrieving revision 1.69
> diff -u -p -r1.69 vga_pci.c
> --- vga_pci.c 8 Oct 2012 21:47:50 -0000 1.69
> +++ vga_pci.c 3 Mar 2013 21:34:59 -0000
> @@ -249,8 +249,6 @@ vga_pci_attach(struct device *parent, st
> }
> #endif
> printf("\n");
> - sc->sc_vc = vga_common_attach(self, pa->pa_iot, pa->pa_memt,
> - WSDISPLAY_TYPE_PCIVGA);
>
> vga_pci_bar_init(sc, pa);
>
> @@ -294,6 +292,9 @@ vga_pci_attach(struct device *parent, st
> #if NDRM > 0
> config_found_sm(self, aux, NULL, drmsubmatch);
> #endif
> +
> + sc->sc_vc = vga_common_attach(self, pa->pa_iot, pa->pa_memt,
> + WSDISPLAY_TYPE_PCIVGA);
> }
>
> int
>
