From 3627ce52b5934e337e4ac620266b1a8d6c183285 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 4 Mar 2013 21:52:37 +0000 Subject: Reorder code such that wsdisplay(4) attaches after drm(4). Preparation for framebuffer console support on amd64/i386. tested by many ok mpi@ --- sys/dev/pci/vga_pci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/dev/pci/vga_pci.c') 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 -- cgit v1.2.3