summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2014-02-23 09:36:53 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2014-02-23 09:36:53 +0000
commit1400ffc109ef895ce5297d85b0b217cfd520274a (patch)
tree9c7efe4bd6caf8d5bd722c9e565785cbe5da58c2 /sys/arch/amd64
parent89a7bea5c9a1ead5f9f854a1c2d30060ee3f45c6 (diff)
Give drm(4) a console locator just like wsdisplay(4) such that we can make
sure /dev/drm0 always matches the primary display. ok mpi@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 0c945efed1a..413d92e1d79 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.359 2014/02/19 05:32:57 jmatthew Exp $
+# $OpenBSD: GENERIC,v 1.360 2014/02/23 09:36:52 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -308,8 +308,10 @@ agp* at intagp?
#option DRM_DEBUG
inteldrm* at vga? # Intel i915, i945 DRM driver
+drm0 at inteldrm? console 1
drm* at inteldrm?
radeondrm* at pci? # ATI Radeon DRM driver
+drm0 at radeondrm? console 1
drm* at radeondrm?
wsdisplay0 at radeondrm? console 1
wsdisplay* at radeondrm?