Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:38:52 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h
Log Message:
Bus space for radeon mm rwreg.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
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/radeon/radeon.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.5 Mon Aug 27 06:38:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h Mon Aug 27 06:38:51 2018
@@ -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 @@ static inline uint32_t r100_mm_rreg(stru
{
/* 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 @@ static inline void r100_mm_wreg(struct r
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);
}
