diff options
author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-22 21:26:49 +0000 |
---|---|---|
committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-22 21:26:49 +0000 |
commit | efaaf8fdb0ae277917aee89ce3717ef1fa793fa0 (patch) | |
tree | 1b5628ae32f72b00560a9f3eb1394e984b21d2e0 /sys/arch/i386/conf/GENERIC | |
parent | e352ee055ffd21c59021f5da76de929ac5cd366e (diff) |
Move the drm drivers over from:
vga1 at pci0
inteldrm0 at vga1
to
vga1 at pci0
inteldrm0 at vga1
drm0 at inteldrm0
i.e. a similar scheme to audio(4) where the interface attaches on top of
the wildly different drivers. This helps to clean up the code a lot
(more is coming) and help me start to move drm to being essentially bus
independent, which will help in the future.
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index de8ff873db1..f5dc3919703 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.639 2008/11/09 15:11:19 oga Exp $ +# $OpenBSD: GENERIC,v 1.640 2008/11/22 21:26:47 oga Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -346,13 +346,21 @@ agp* at viaagp? # AGP bridges #option DRM_DEBUG inteldrm* at vga? # Intel i915, i945 DRM driver +drm* at inteldrm? #machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver +#drm* at machdrm? #mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver +#drm* at mgadrm? #ragedrm* at vga? # ATI Rage 128 DRM driver +#drm* at ragedrm? radeondrm* at vga? # ATI Radeon DRM driver +drm* at radeondrm? #savagedrm* at vga? # S3 Savage DRM driver +#drm* at savagedrm? #sisdrm* at vga? # SiS DRM driver +#drm* at sisdrm? #tdfxdrm* at vga? # 3dfx (voodoo) DRM driver +#drm* at tdfxdrm? #option VESABIOSVERBOSE #option VESAFB # VESA bios framebuffer support for X11 |