[src/trunk]: src/sys/external/bsd/drm2/include/drm Define CONFIG_MTRR and CON...

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

details:   https://anonhg.NetBSD.org/src/rev/cc41dcb3baff
branches:  trunk
changeset: 835181:cc41dcb3baff
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:50:08 2018 +0000

description:
Define CONFIG_MTRR and CONFIG_X86_PAT.

diffstat:

 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 73d41d06aa65 -r cc41dcb3baff sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Mon Aug 27 07:49:58 2018 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Mon Aug 27 07:50:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_os_netbsd.h,v 1.8 2018/08/27 06:42:54 riastradh Exp $      */
+/*     $NetBSD: drm_os_netbsd.h,v 1.9 2018/08/27 07:50:08 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,12 +36,9 @@
 #include "opt_drmkms.h"
 #endif
 
-/*
- * XXX Better to get rid of CONFIG_X86, but that's not convenient at
- * the moment.
- */
 #if defined(__i386__) || defined(__x86_64__)
 #define        CONFIG_X86      1
+#define        CONFIG_X86_PAT  1
 #endif
 
 #include "pci.h"
@@ -57,6 +54,14 @@
 #define CONFIG_PNP
 #endif
 
+#if defined(_KERNEL_OPT)
+#include "opt_mtrr.h"
+#endif
+
+#ifdef MTRR
+#define        CONFIG_MTRR     1
+#endif
+
 #include <drm/drm_agp_netbsd.h>
 #include <drm/drm_auth_netbsd.h>
 #include <drm/drm_copy_netbsd.h>