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/drm build on platforms without agp_i810



details:   https://anonhg.NetBSD.org/src/rev/283d235519b3
branches:  trunk
changeset: 341067:283d235519b3
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 17 15:13:39 2015 +0000

description:
build on platforms without agp_i810

diffstat:

 sys/external/bsd/drm2/drm/drm_memory.c |  22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 5205b2b3df3e -r 283d235519b3 sys/external/bsd/drm2/drm/drm_memory.c
--- a/sys/external/bsd/drm2/drm/drm_memory.c    Sat Oct 17 15:13:19 2015 +0000
+++ b/sys/external/bsd/drm2/drm/drm_memory.c    Sat Oct 17 15:13:39 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_memory.c,v 1.7 2015/04/29 04:38:55 riastradh Exp $ */
+/*     $NetBSD: drm_memory.c,v 1.8 2015/10/17 15:13:39 jmcneill Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,14 +30,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.7 2015/04/29 04:38:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.8 2015/10/17 15:13:39 jmcneill Exp $");
+
+#if defined(__i386__) || defined(__x86_64__)
+#define HAS_AGP_I810   1
+#else
+#define HAS_AGP_I810   0
+#endif
 
 #ifdef _KERNEL_OPT
-#include "agp_i810.h"
-#include "genfb.h"
+# if HAS_AGP_I810 > 0
+#  include "agp_i810.h"
+# else
+#  define NAGP_I810    0
+# endif
+# include "genfb.h"
 #else
-#define        NAGP_I810       1       /* XXX WTF?  */
-#define        NGENFB          0       /* XXX WTF?  */
+# define NAGP_I810     HAS_AGP_I810    /* XXX WTF?  */
+# define NGENFB                0       /* XXX WTF?  */
 #endif
 
 #include <sys/bus.h>



Home | Main Index | Thread Index | Old Index