diff options
| author |   kettenis <kettenis@openbsd.org> | 2013-03-04 21:52:36 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2013-03-04 21:52:36 +0000 |
| commit | f883e62554e82146fd6feb7d3ca36f809a4e6746 (patch) | |
| tree | 502dbad5d8deeabb9b06d8d65b2da45fea20e85d | |
| parent | i missed a list of ciphers that rogier krieger didn't miss. thanks. (diff) | |
| download | wireguard-openbsd-f883e62554e82146fd6feb7d3ca36f809a4e6746.tar.xz wireguard-openbsd-f883e62554e82146fd6feb7d3ca36f809a4e6746.zip | |
Reorder code such that wsdisplay(4) attaches after drm(4).
Preparation for framebuffer console support on amd64/i386.
tested by many
ok mpi@
| -rw-r--r-- | sys/dev/pci/vga_pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 56f977a1b93..2989798a77f 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pci.c,v 1.69 2012/10/08 21:47:50 deraadt Exp $ */ +/* $OpenBSD: vga_pci.c,v 1.70 2013/03/04 21:52:36 kettenis Exp $ */ /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */ /* @@ -249,8 +249,6 @@ vga_pci_attach(struct device *parent, struct device *self, void *aux) } #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, struct device *self, void *aux) #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 |