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

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

details:   https://anonhg.NetBSD.org/src/rev/3bed04e3acc5
branches:  trunk
changeset: 1029002:3bed04e3acc5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:41:23 2021 +0000

description:
amdgpu: Fix register offsets in amdgpu_mm_rreg8/wreg8.

We already added rmmio_base when mapping rmmioh; let's not add it
again!

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 8435cec7db8d -r 3bed04e3acc5 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Sun Dec 19 12:41:15 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Sun Dec 19 12:41:23 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_device.c,v 1.14 2021/12/19 12:36:59 riastradh Exp $     */
+/*     $NetBSD: amdgpu_device.c,v 1.15 2021/12/19 12:41:23 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.14 2021/12/19 12:36:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.15 2021/12/19 12:41:23 riastradh Exp $");
 
 #include <linux/power_supply.h>
 #include <linux/kthread.h>
@@ -272,8 +272,7 @@
 uint8_t amdgpu_mm_rreg8(struct amdgpu_device *adev, uint32_t offset) {
        if (offset < adev->rmmio_size)
 #ifdef __NetBSD__
-               return bus_space_read_1(adev->rmmiot, adev->rmmioh,
-                   adev->rmmio_base + offset);
+               return bus_space_read_1(adev->rmmiot, adev->rmmioh, offset);
 #else
                return (readb(adev->rmmio + offset));
 #endif
@@ -298,8 +297,7 @@
 void amdgpu_mm_wreg8(struct amdgpu_device *adev, uint32_t offset, uint8_t value) {
        if (offset < adev->rmmio_size)
 #ifdef __NetBSD__
-               bus_space_write_1(adev->rmmiot, adev->rmmioh,
-                   adev->rmmio_base + offset, value);
+               bus_space_write_1(adev->rmmiot, adev->rmmioh, offset, value);
 #else
                writeb(value, adev->rmmio + offset);
 #endif