Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/include/drm only define __OS_HAS_AGP i...



details:   https://anonhg.NetBSD.org/src/rev/f5ca5f0628a9
branches:  trunk
changeset: 341079:f5ca5f0628a9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 17 21:09:49 2015 +0000

description:
only define __OS_HAS_AGP if x86 and NAGP > 0

diffstat:

 sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 8f5e5a981139 -r f5ca5f0628a9 sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h        Sat Oct 17 21:07:23 2015 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h        Sat Oct 17 21:09:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_agp_netbsd.h,v 1.4 2014/08/23 08:03:33 riastradh Exp $     */
+/*     $NetBSD: drm_agp_netbsd.h,v 1.5 2015/10/17 21:09:49 jmcneill Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -47,12 +47,16 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 
-#define        __OS_HAS_AGP    1
-
 #define        PCI_AGP_COMMAND_FW      AGPCMD_FWEN
 
+#if defined(__i386__) || defined(__x86_64__)
+#include "agp.h"
+#if NAGP > 0
+#define        __OS_HAS_AGP    1
+#endif
 __CTASSERT(PAGE_SIZE == AGP_PAGE_SIZE);
 __CTASSERT(PAGE_SHIFT == AGP_PAGE_SHIFT);
+#endif
 
 struct agp_kern_info {
        struct agp_info aki_info;



Home | Main Index | Thread Index | Old Index