[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon Bus space for radeon m...

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

details:   https://anonhg.NetBSD.org/src/rev/33b6e9827799
branches:  trunk
changeset: 834841:33b6e9827799
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:38:51 2018 +0000

description:
Bus space for radeon mm rwreg.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon.h |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r b170ee241a96 -r 33b6e9827799 sys/external/bsd/drm2/dist/drm/radeon/radeon.h
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon.h    Mon Aug 27 06:38:36 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon.h    Mon Aug 27 06:38:51 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon.h,v 1.5 2018/08/27 06:38:36 riastradh Exp $     */
+/*     $NetBSD: radeon.h,v 1.6 2018/08/27 06:38:51 riastradh Exp $     */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -2553,7 +2553,11 @@
 {
        /* The mmio size is 64kb at minimum. Allows the if to be optimized out. */
        if ((reg < rdev->rmmio_size || reg < RADEON_MIN_MMIO_SIZE) && !always_indirect)
+#ifdef __NetBSD__
+               return bus_space_read_4(rdev->rmmio_bst, rdev->rmmio_bsh, reg);
+#else
                return readl(((void __iomem *)rdev->rmmio) + reg);
+#endif
        else
                return r100_mm_rreg_slow(rdev, reg);
 }
@@ -2561,7 +2565,11 @@
                                bool always_indirect)
 {
        if ((reg < rdev->rmmio_size || reg < RADEON_MIN_MMIO_SIZE) && !always_indirect)
+#ifdef __NetBSD__
+               bus_space_write_4(rdev->rmmio_bst, rdev->rmmio_bsh, reg, v);
+#else
                writel(v, ((void __iomem *)rdev->rmmio) + reg);
+#endif
        else
                r100_mm_wreg_slow(rdev, reg, v);
 }