[src/trunk]: src/sys/external/bsd/drm2/include/linux Let radeon DRM driver bu...

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

details:   https://anonhg.NetBSD.org/src/rev/d503fddccc94
branches:  trunk
changeset: 366457:d503fddccc94
user:      manu <manu%NetBSD.org@localhost>
date:      Sat May 28 01:07:47 2022 +0000

description:
Let radeon DRM driver build on ports that lack ACPI

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c |   6 +++---
 sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h  |  11 ++++++++++-
 sys/external/bsd/drm2/include/linux/acpi.h          |   4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (75 lines):

diff -r 870c54adbe7c -r d503fddccc94 sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c       Sat May 28 00:53:41 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c       Sat May 28 01:07:47 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $       */
+/*     $NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $    */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $");
 
 #include <linux/acpi.h>
 #include <linux/pci.h>
@@ -41,7 +41,7 @@
 #include "radeon.h"
 #include "radeon_reg.h"
 
-#ifdef __NetBSD__
+#if defined(__NetBSD__) && NACPICA > 0
 #include <dev/acpi/acpireg.h>
 #define        _COMPONENT      ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("radeon_acpi")
diff -r 870c54adbe7c -r d503fddccc94 sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h        Sat May 28 00:53:41 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h        Sat May 28 01:07:47 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_drv.h,v 1.3 2021/12/18 23:45:43 riastradh Exp $ */
+/*     $NetBSD: radeon_drv.h,v 1.4 2022/05/28 01:07:47 manu Exp $      */
 
 /* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
  *
@@ -33,6 +33,15 @@
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 
+#if defined(__NetBSD__)
+#ifdef _KERNEL_OPT
+#include "acpica.h"
+#endif  /* _KERNEL_OPT */
+#if (NACPICA > 0)
+#define CONFIG_ACPI
+#endif  /* NACPICA > 0 */
+#endif  /* __NetBSD__ */
+
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 #include <drm/drm_legacy.h>
diff -r 870c54adbe7c -r d503fddccc94 sys/external/bsd/drm2/include/linux/acpi.h
--- a/sys/external/bsd/drm2/include/linux/acpi.h        Sat May 28 00:53:41 2022 +0000
+++ b/sys/external/bsd/drm2/include/linux/acpi.h        Sat May 28 01:07:47 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.h,v 1.9 2022/02/27 14:22:50 riastradh Exp $       */
+/*     $NetBSD: acpi.h,v 1.10 2022/05/28 01:07:47 manu Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
 
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
-#endif
 
 #include <linux/types.h>
 #include <linux/uuid.h>
@@ -58,4 +57,5 @@
     uint64_t, uint64_t, union acpi_object *, acpi_object_type);
 bool acpi_check_dsm(acpi_handle, const guid_t *, uint64_t, uint64_t);
 
+#endif /* NACPICA > 0 */
 #endif  /* _LINUX_ACPI_H_ */