Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:56:50 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_amdkfd.c
amdgpu_ttm.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc: amdgpu_dc_helper.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc: dmub_types.h
Log Message:
Fix up amdgpu just enough to get through depend.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c:1.4 Sat Dec 18 23:44:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c Sun Dec 19 10:56:50 2021
@@ -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 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_
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,
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c:1.6 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c:1.6 Sat Dec 18 23:44:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c Sun Dec 19 10:56:50 2021
@@ -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 @@ static int amdgpu_ttm_tt_pin_userptr(str
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 @@ static int amdgpu_ttm_tt_pin_userptr(str
release_sg:
kfree(ttm->sg);
return r;
-#endif
}
/**
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c:1.2 Sat Dec 18 23:45:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/amdgpu_dc_helper.c Sun Dec 19 10:56:50 2021
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h:1.2 Sat Dec 18 23:45:06 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dmub/inc/dmub_types.h Sun Dec 19 10:56:50 2021
@@ -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" {
