Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:36:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_device.c
Log Message:
amdgpu: Fix indexing for 64-bit doorbells.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.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/dist/drm/amd/amdgpu/amdgpu_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.11 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.11 Sun Dec 19 12:31:45 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Sun Dec 19 12:36:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_device.c,v 1.11 2021/12/19 12:31:45 riastradh Exp $ */
+/* $NetBSD: amdgpu_device.c,v 1.12 2021/12/19 12:36:41 riastradh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.11 2021/12/19 12:31:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.12 2021/12/19 12:36:41 riastradh Exp $");
#include <linux/power_supply.h>
#include <linux/kthread.h>
@@ -484,7 +484,7 @@ u64 amdgpu_mm_rdoorbell64(struct amdgpu_
if (index < adev->doorbell.num_doorbells) {
#ifdef __NetBSD__
return bus_space_read_8(adev->doorbell.bst, adev->doorbell.bsh,
- 4*index);
+ 8*index);
#else
return atomic64_read((atomic64_t *)(adev->doorbell.ptr + index));
#endif
@@ -509,7 +509,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu
if (index < adev->doorbell.num_doorbells) {
#ifdef __NetBSD__
bus_space_write_8(adev->doorbell.bst, adev->doorbell.bsh,
- 4*index, v);
+ 8*index, v);
#else
atomic64_set((atomic64_t *)(adev->doorbell.ptr + index), v);
#endif
