Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:02:13 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_gfx.c
Log Message:
amdgpu: amdgpu_gfx.c
...plus a bogus stub for sscanf, hoping it's not that important
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/external/bsd/common/include/linux/kernel.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx.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/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.44 src/sys/external/bsd/common/include/linux/kernel.h:1.45
--- src/sys/external/bsd/common/include/linux/kernel.h:1.44 Sun Dec 19 11:35:36 2021
+++ src/sys/external/bsd/common/include/linux/kernel.h Sun Dec 19 12:02:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.44 2021/12/19 11:35:36 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.45 2021/12/19 12:02:13 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -275,4 +275,10 @@ static_branch_likely(const bool *flagp)
return __predict_true(*flagp);
}
+static inline int
+sscanf(const char *fmt, ...)
+{
+ return 0; /* XXX */
+}
+
#endif /* _LINUX_KERNEL_H_ */
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx.c:1.4 Sat Dec 18 23:44:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx.c Sun Dec 19 12:02:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_gfx.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $ */
+/* $NetBSD: amdgpu_gfx.c,v 1.5 2021/12/19 12:02:13 riastradh Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx.c,v 1.5 2021/12/19 12:02:13 riastradh Exp $");
#include "amdgpu.h"
#include "amdgpu_gfx.h"
@@ -315,7 +315,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdg
return r;
ring->eop_gpu_addr = kiq->eop_gpu_addr;
- sprintf(ring->name, "kiq_%d.%d.%d", ring->me, ring->pipe, ring->queue);
+ snprintf(ring->name, sizeof(ring->name), "kiq_%d.%d.%d", ring->me, ring->pipe, ring->queue);
r = amdgpu_ring_init(adev, ring, 1024,
irq, AMDGPU_CP_KIQ_IRQ_DRIVER0);
if (r)
