diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-05-27 19:45:30 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-05-27 19:45:30 +0000 |
| commit | db5f6db1d3e912dd792a8013b5825b3922088bfe (patch) | |
| tree | 61722b7cf9120909eab212098aa55191865dd704 /sys/arch/amd64 | |
| parent | 6d2e844dc60d2d800fa27d11ad2794a7be3c1f56 (diff) | |
Since the vtophys stuff was nuked, drm now works on amd64 too. Add the
relavent config goo.
DRM_NO_MTRR is still needed on amd64 since the mtrr apis differ between
it and i386.
ok kettenis@.
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index f7f5aeb5867..9a0fce499b1 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.20 2008/05/14 20:49:46 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.21 2008/05/27 19:45:29 oga Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -173,6 +173,8 @@ cdev_decl(cztty); cdev_decl(nvram); #include "agp.h" cdev_decl(agp); +#include "drmbase.h" +cdev_decl(drm); #include "wsdisplay.h" #include "wskbd.h" @@ -296,6 +298,7 @@ struct cdevsw cdevsw[] = cdev_bthub_init(NBTHUB,bthub), /* 84: bthub */ cdev_nvram_init(NNVRAM,nvram), /* 85: NVRAM interface */ cdev_agp_init(NAGP,agp), /* 86: agp */ + cdev_drm_init(NDRMBASE,drm), /* 87: drm */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index e2de92acf80..6d8113af67c 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.230 2008/05/23 15:39:43 jasper Exp $ +# $OpenBSD: GENERIC,v 1.231 2008/05/27 19:45:29 oga Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -567,3 +567,14 @@ pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices pseudo-device wsmux 2 pseudo-device crypto 1 + +# DRM: direct rendering modules +#option DRM_DEBUG +#inteldrm* at vga? # Intel i915, i945 DRM driver +#machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver +#mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver +#ragedrm* at vga? # ATI Rage 128 DRM driver +#radeondrm* at vga? # ATI Radeon DRM driver +#savagedrm* at vga? # S3 Savage DRM driver +#sisdrm* at vga? # SiS DRM driver +#tdfxdrm* at vga? # 3dfx (voodoo) DRM driver |