[src/trunk]: src/sys/external/bsd/drm Make code compile when the kernel has n...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15e4ff327cfb
branches:  trunk
changeset: 763596:15e4ff327cfb
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Mar 27 08:45:11 2011 +0000

description:
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

diffstat:

 sys/external/bsd/drm/conf/files.drm               |  4 ++--
 sys/external/bsd/drm/dist/shared-core/radeon_cp.c |  2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 55ce9457c847 -r 15e4ff327cfb sys/external/bsd/drm/conf/files.drm
--- a/sys/external/bsd/drm/conf/files.drm       Sun Mar 27 08:04:50 2011 +0000
+++ b/sys/external/bsd/drm/conf/files.drm       Sun Mar 27 08:45:11 2011 +0000
@@ -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 @@
 
 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
diff -r 55ce9457c847 -r 15e4ff327cfb sys/external/bsd/drm/dist/shared-core/radeon_cp.c
--- a/sys/external/bsd/drm/dist/shared-core/radeon_cp.c Sun Mar 27 08:04:50 2011 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/radeon_cp.c Sun Mar 27 08:45:11 2011 +0000
@@ -2006,11 +2006,13 @@
        }
 
        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);