[src/trunk]: src/sys/external/bsd/drm2 Upstream nixed __OS_HAS_AGP; use CONFI...

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

details:   https://anonhg.NetBSD.org/src/rev/beaccfb6a393
branches:  trunk
changeset: 366207:beaccfb6a393
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:55:24 2018 +0000

description:
Upstream nixed __OS_HAS_AGP; use CONFIG_AGP instead.

diffstat:

 sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h |  4 ++--
 sys/external/bsd/drm2/pci/files.drmkms_pci         |  5 +----
 sys/external/bsd/drm2/ttm/ttm_agp_backend.c        |  6 +++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r c887f2c67f21 -r beaccfb6a393 sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h        Mon Aug 27 13:55:12 2018 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h        Mon Aug 27 13:55:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_agp_netbsd.h,v 1.6 2015/10/17 21:27:02 jmcneill Exp $      */
+/*     $NetBSD: drm_agp_netbsd.h,v 1.7 2018/08/27 13:55:24 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
 #define NAGP 1
 #endif
 #if NAGP > 0
-#define        __OS_HAS_AGP    1
+#define        CONFIG_AGP      1
 #endif
 __CTASSERT(PAGE_SIZE == AGP_PAGE_SIZE);
 __CTASSERT(PAGE_SHIFT == AGP_PAGE_SHIFT);
diff -r c887f2c67f21 -r beaccfb6a393 sys/external/bsd/drm2/pci/files.drmkms_pci
--- a/sys/external/bsd/drm2/pci/files.drmkms_pci        Mon Aug 27 13:55:12 2018 +0000
+++ b/sys/external/bsd/drm2/pci/files.drmkms_pci        Mon Aug 27 13:55:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms_pci,v 1.8 2015/04/29 11:37:31 riastradh Exp $
+#      $NetBSD: files.drmkms_pci,v 1.9 2018/08/27 13:55:24 riastradh Exp $
 
 # Attribute for kernel components supporting PCI-based real graphics
 # drivers, a.k.a. `KMS' (kernel mode-setting), as opposed to the legacy
@@ -6,9 +6,6 @@
 # drivers, a.k.a. `UMS' (user mode-setting), attach.
 define drmkms_pci: drmkms
 
-# XXX Not quite right!  Should AGP stuff be kept separate?
-makeoptions    drmkms_pci      CPPFLAGS+="-DCONFIG_AGP"
-
 #file  external/bsd/drm2/dist/drm/ati_pcigart.c        drmkms_pci
 file   external/bsd/drm2/dist/drm/drm_agpsupport.c     drmkms_pci
 file   external/bsd/drm2/pci/drm_pci.c                 drmkms_pci
diff -r c887f2c67f21 -r beaccfb6a393 sys/external/bsd/drm2/ttm/ttm_agp_backend.c
--- a/sys/external/bsd/drm2/ttm/ttm_agp_backend.c       Mon Aug 27 13:55:12 2018 +0000
+++ b/sys/external/bsd/drm2/ttm/ttm_agp_backend.c       Mon Aug 27 13:55:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_agp_backend.c,v 1.6 2017/03/09 08:27:18 maya Exp $ */
+/*     $NetBSD: ttm_agp_backend.c,v 1.7 2018/08/27 13:55:24 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_agp_backend.c,v 1.6 2017/03/09 08:27:18 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_agp_backend.c,v 1.7 2018/08/27 13:55:24 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/kmem.h>
@@ -42,7 +42,7 @@
 #include <ttm/ttm_bo_driver.h>
 #include <ttm/ttm_page_alloc.h>
 
-#if __OS_HAS_AGP
+#if CONFIG_AGP
 
 struct ttm_agp {
        struct ttm_dma_tt ttm_dma;