[src/trunk]: src/sys/external/bsd/drm2/dist/drm/amd Fix up amdgpu just enough...

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

details:   https://anonhg.NetBSD.org/src/rev/3012d8bb42a8
branches:  trunk
changeset: 1028394:3012d8bb42a8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:56:50 2021 +0000

description:
Fix up amdgpu just enough to get through depend.

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c        |  5 ++---
 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c           |  7 ++-----
 sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c |  6 +++---
 sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h |  4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diffs (105 lines):

diff -r 4225eab54a5e -r 3012d8bb42a8 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c Sun Dec 19 10:56:39 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c Sun Dec 19 10:56:50 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_amdkfd.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $      */
+/*     $NetBSD: amdgpu_amdkfd.c,v 1.5 2021/12/19 10:56:50 riastradh Exp $      */
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_amdkfd.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_amdkfd.c,v 1.5 2021/12/19 10:56:50 riastradh Exp $");
 
 #include "amdgpu_amdkfd.h"
 #include "amd_shared.h"
@@ -226,7 +226,6 @@
        if (amdgpu_device_should_recover_gpu(adev))
                amdgpu_device_gpu_recover(adev, NULL);
 }
-#endif
 
 int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
                                void **mem_obj, uint64_t *gpu_addr,
diff -r 4225eab54a5e -r 3012d8bb42a8 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c    Sun Dec 19 10:56:39 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c    Sun Dec 19 10:56:50 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_ttm.c,v 1.6 2021/12/18 23:44:58 riastradh Exp $ */
+/*     $NetBSD: amdgpu_ttm.c,v 1.7 2021/12/19 10:56:50 riastradh Exp $ */
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ttm.c,v 1.6 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ttm.c,v 1.7 2021/12/19 10:56:50 riastradh Exp $");
 
 #include <linux/dma-mapping.h>
 #include <linux/iommu.h>
@@ -966,10 +966,8 @@
        int r;
 
        int write = !(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY);
-#ifndef __NetBSD__
        enum dma_data_direction direction = write ?
                DMA_BIDIRECTIONAL : DMA_TO_DEVICE;
-#endif
 
        /* Allocate an SG array and squash pages into it */
        r = sg_alloc_table_from_pages(ttm->sg, ttm->pages, ttm->num_pages, 0,
@@ -993,7 +991,6 @@
 release_sg:
        kfree(ttm->sg);
        return r;
-#endif
 }
 
 /**
diff -r 4225eab54a5e -r 3012d8bb42a8 sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c
--- a/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c  Sun Dec 19 10:56:39 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c  Sun Dec 19 10:56:50 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_dc_helper.c,v 1.2 2021/12/18 23:45:00 riastradh Exp $   */
+/*     $NetBSD: amdgpu_dc_helper.c,v 1.3 2021/12/19 10:56:50 riastradh Exp $   */
 
 /*
  * Copyright 2017 Advanced Micro Devices, Inc.
@@ -30,12 +30,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_helper.c,v 1.2 2021/12/18 23:45:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_helper.c,v 1.3 2021/12/19 10:56:50 riastradh Exp $");
 
 #include <linux/delay.h>
 
 #include "dm_services.h"
-#include <stdarg.h>
+#include <sys/stdarg.h>
 
 #include "dc.h"
 #include "dc_dmub_srv.h"
diff -r 4225eab54a5e -r 3012d8bb42a8 sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h
--- a/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h  Sun Dec 19 10:56:39 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h  Sun Dec 19 10:56:50 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dmub_types.h,v 1.2 2021/12/18 23:45:06 riastradh Exp $ */
+/*     $NetBSD: dmub_types.h,v 1.3 2021/12/19 10:56:50 riastradh Exp $ */
 
 /*
  * Copyright 2019 Advanced Micro Devices, Inc.
@@ -33,7 +33,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/delay.h>
-#include <stdarg.h>
+#include <sys/stdarg.h>
 
 #if defined(__cplusplus)
 extern "C" {