Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:22:49 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce: dce_audio.h
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100:
amdgpu_dce100_resource.c
Added Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_xgmi.c
Log Message:
amdgpu: Tie up some loose ends.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/amdgpu/amdgpu_xgmi.c
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c
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/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.22 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.23
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.22 Sun Dec 19 12:21:29 2021
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Dec 19 12:22:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.amdgpu,v 1.22 2021/12/19 12:21:29 riastradh Exp $
+# $NetBSD: files.amdgpu,v 1.23 2021/12/19 12:22:48 riastradh Exp $
version 20180827
@@ -147,7 +147,7 @@ file external/bsd/drm2/dist/drm/amd/amdg
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/core/amdgpu_dc_surface.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/core/amdgpu_dc_vm_helper.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_abm.c amdgpu
-#file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_audio.c amdgpu
+file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_audio.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_aux.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_clock_source.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_dmcu.c amdgpu
@@ -497,4 +497,4 @@ file external/bsd/drm2/dist/drm/amd/amdg
file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm_cpu.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm_sdma.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vram_mgr.c amdgpu
-#file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_xgmi.c amdgpu
+file external/bsd/drm2/amdgpu/amdgpu_xgmi.c amdgpu
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h:1.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h:1.4 Sun Dec 19 11:59:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h Sun Dec 19 12:22:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dce_audio.h,v 1.4 2021/12/19 11:59:30 riastradh Exp $ */
+/* $NetBSD: dce_audio.h,v 1.5 2021/12/19 12:22:48 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
#ifndef __DAL_AUDIO_DCE_110_H__
#define __DAL_AUDIO_DCE_110_H__
-#include "audio.h"
+#include "hw/audio.h"
#define AUD_COMMON_REG_LIST(id)\
SRI(AZALIA_F0_CODEC_ENDPOINT_INDEX, AZF0ENDPOINT, id),\
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c:1.5 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c:1.5 Sun Dec 19 11:59:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c Sun Dec 19 12:22:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce100_resource.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce100_resource.c,v 1.6 2021/12/19 12:22:49 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce100_resource.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce100_resource.c,v 1.6 2021/12/19 12:22:49 riastradh Exp $");
#include <linux/slab.h>
@@ -1132,7 +1132,6 @@ res_create_fail:
return false;
}
-static __unused
struct resource_pool *dce100_create_resource_pool(
uint8_t num_virtual_links,
struct dc *dc)
Added files:
Index: src/sys/external/bsd/drm2/amdgpu/amdgpu_xgmi.c
diff -u /dev/null src/sys/external/bsd/drm2/amdgpu/amdgpu_xgmi.c:1.1
--- /dev/null Sun Dec 19 12:22:49 2021
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_xgmi.c Sun Dec 19 12:22:48 2021
@@ -0,0 +1,83 @@
+/* $NetBSD: amdgpu_xgmi.c,v 1.1 2021/12/19 12:22:48 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_xgmi.c,v 1.1 2021/12/19 12:22:48 riastradh Exp $");
+
+#include <sys/types.h>
+
+#include "amdgpu.h"
+#include "amdgpu_xgmi.h"
+
+struct amdgpu_hive_info *
+amdgpu_get_xgmi_hive(struct amdgpu_device *adev, int lock)
+{
+ return NULL;
+}
+
+int
+amdgpu_xgmi_update_topology(struct amdgpu_hive_info *hive,
+ struct amdgpu_device *adev)
+{
+ return -ENOSYS;
+}
+
+int
+amdgpu_xgmi_add_device(struct amdgpu_device *adev)
+{
+ return -ENOSYS;
+}
+
+void
+amdgpu_xgmi_remove_device(struct amdgpu_device *adev)
+{
+}
+
+int
+amdgpu_xgmi_set_pstate(struct amdgpu_device *adev, int pstate)
+{
+ return -ENOSYS;
+}
+
+int
+amdgpu_xgmi_get_hops_count(struct amdgpu_device *adev,
+ struct amdgpu_device *peer_adev)
+{
+ return -ENOSYS;
+}
+
+int
+amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev)
+{
+ return 0;
+}
+
+void
+amdgpu_xgmi_ras_fini(struct amdgpu_device *adev)
+{
+}
