[src/trunk]: src/sys/external/bsd/drm2/drm Non-x86 doesn't have AGP. This sho...

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

details:   https://anonhg.NetBSD.org/src/rev/f56fe9f954ac
branches:  trunk
changeset: 343944:f56fe9f954ac
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Mar 06 10:59:56 2016 +0000

description:
Non-x86 doesn't have AGP. This should really be handled by config logic.

diffstat:

 sys/external/bsd/drm2/drm/drm_memory.c |  36 +++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diffs (57 lines):

diff -r 1657b1e11173 -r f56fe9f954ac sys/external/bsd/drm2/drm/drm_memory.c
--- a/sys/external/bsd/drm2/drm/drm_memory.c    Sun Mar 06 10:26:57 2016 +0000
+++ b/sys/external/bsd/drm2/drm/drm_memory.c    Sun Mar 06 10:59:56 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_memory.c,v 1.9 2016/03/05 06:48:31 mlelstv Exp $   */
+/*     $NetBSD: drm_memory.c,v 1.10 2016/03/06 10:59:56 mlelstv Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,27 +30,33 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.9 2016/03/05 06:48:31 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.10 2016/03/06 10:59:56 mlelstv Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
-#define HAS_AGP_I810   1
-#else
-#define HAS_AGP_I810   0
-#endif
 
-#ifdef _KERNEL_OPT
-# include "agp.h"
-# if NAGP == 0
+# ifdef _KERNEL_OPT
+#  include "agp.h"
+#  if NAGP > 0
+#   include "agp_i810.h"
+#  else
+#   define NAGP_I810   0
+#  endif
+#  include "genfb.h"
+# else
+#  define NAGP_I810    1
+#  define NGENFB       0
+# endif
+
+#else
+
+# ifdef _KERNEL_OPT
 #  define NAGP_I810    0
-# elif HAS_AGP_I810 > 0
-#  include "agp_i810.h"
+#  include "genfb.h"
 # else
 #  define NAGP_I810    0
+#  define NGENFB       0
 # endif
-# include "genfb.h"
-#else
-# define NAGP_I810     HAS_AGP_I810    /* XXX WTF?  */
-# define NGENFB                0       /* XXX WTF?  */
+
 #endif
 
 #include <sys/bus.h>