Module Name: src
Committed By: mlelstv
Date: Sun Mar 6 10:59:56 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/drm: drm_memory.c
Log Message:
Non-x86 doesn't have AGP. This should really be handled by config logic.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/drm/drm_memory.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.9 src/sys/external/bsd/drm2/drm/drm_memory.c:1.10
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.9 Sat Mar 5 06:48:31 2016
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Sun Mar 6 10:59:56 2016
@@ -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
+
+# 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
-#define HAS_AGP_I810 0
-#endif
-#ifdef _KERNEL_OPT
-# include "agp.h"
-# if NAGP == 0
+# 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>
