[src/trunk]: src/sys/external/bsd/drm2/linux drm: Fix ACPI crud in ALL kernel...

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

details:   https://anonhg.NetBSD.org/src/rev/063db2c8d88c
branches:  trunk
changeset: 362474:063db2c8d88c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Feb 28 17:15:29 2022 +0000

description:
drm: Fix ACPI crud in ALL kernel build.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c |  9 +++++++--
 sys/external/bsd/drm2/linux/linux_acpi.c            |  9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r d73220a5aff5 -r 063db2c8d88c sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c       Mon Feb 28 16:30:10 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c       Mon Feb 28 17:15:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_bios.c,v 1.10 2022/02/27 14:24:27 riastradh Exp $       */
+/*     $NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $       */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.10 2022/02/27 14:24:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/pci.h>
@@ -41,7 +41,12 @@
 #include "radeon.h"
 #include "radeon_reg.h"
 
+#ifdef __NetBSD__
+#include <dev/acpi/acpireg.h>
+#define        _COMPONENT      ACPI_DISPLAY_COMPONENT
+ACPI_MODULE_NAME("radeon_acpi")
 #include <linux/nbsd-namespace-acpi.h>
+#endif
 
 /*
  * BIOS.
diff -r d73220a5aff5 -r 063db2c8d88c sys/external/bsd/drm2/linux/linux_acpi.c
--- a/sys/external/bsd/drm2/linux/linux_acpi.c  Mon Feb 28 16:30:10 2022 +0000
+++ b/sys/external/bsd/drm2/linux/linux_acpi.c  Mon Feb 28 17:15:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_acpi.c,v 1.1 2022/02/27 14:22:21 riastradh Exp $ */
+/*     $NetBSD: linux_acpi.c,v 1.2 2022/02/28 17:15:30 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -27,10 +27,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_acpi.c,v 1.1 2022/02/27 14:22:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_acpi.c,v 1.2 2022/02/28 17:15:30 riastradh Exp $");
+
+#include <dev/acpi/acpireg.h>
 
 #include <linux/acpi.h>
 
+#define        _COMPONENT      ACPI_BUS_COMPONENT
+ACPI_MODULE_NAME("linux_acpi")
+
 union acpi_object *
 acpi_evaluate_dsm(acpi_handle handle, const guid_t *uuid, u64 rev, u64 func,
     union acpi_object *argv4)