Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make code compile when the kernel has no support for AGP. For now this also 

rules out PCIE support without AGP because all the code is drm_agpsupport.c
This commit is contained in:
mlelstv 2011-03-27 08:45:11 +00:00
parent 8e9bf29753
commit 818c0190bf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/external/bsd/drm/conf/files.drm vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: files.drm,v 1.6 2011/02/18 14:26:09 jmcneill Exp $
# $NetBSD: files.drm,v 1.7 2011/03/27 08:45:11 mlelstv Exp $
# direct rendering modules
define drmbase
@ -8,7 +8,7 @@ defflag opt_drm.h DRM_DEBUG DRM_NO_AGP DRM_NO_MTRR
makeoptions drmbase CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core"
file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase
file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase & agp
file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase
file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase
file external/bsd/drm/dist/bsd-core/drm_context.c drmbase

2
sys/external/bsd/drm/dist/shared-core/radeon_cp.c vendored
View File

@ -2006,11 +2006,13 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
}
dev_priv->chip_family = flags & RADEON_FAMILY_MASK;
#if !defined(__NetBSD__) || NAGP > 0
if (drm_device_is_agp(dev))
dev_priv->flags |= RADEON_IS_AGP;
else if (drm_device_is_pcie(dev))
dev_priv->flags |= RADEON_IS_PCIE;
else
#endif
dev_priv->flags |= RADEON_IS_PCI;
ret = drm_vblank_init(dev, 2);