Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:48:20 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_kfd.c
Log Message:
bus_space_read/write_4, not readl/writel.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.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/radeon/radeon_kfd.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c:1.5 Mon Aug 27 07:48:07 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c Mon Aug 27 07:48:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_kfd.c,v 1.5 2018/08/27 07:48:07 riastradh Exp $ */
+/* $NetBSD: radeon_kfd.c,v 1.6 2018/08/27 07:48:20 riastradh Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_kfd.c,v 1.5 2018/08/27 07:48:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_kfd.c,v 1.6 2018/08/27 07:48:20 riastradh Exp $");
#include <linux/module.h>
#include <linux/fdtable.h>
@@ -342,14 +342,22 @@ static void write_register(struct kgd_de
{
struct radeon_device *rdev = get_radeon_device(kgd);
+#ifdef __NetBSD__
+ bus_space_write_4(rdev->rmmio_bst, rdev->rmmio_bsh, offset, value);
+#else
writel(value, (void __iomem *)(rdev->rmmio + offset));
+#endif
}
static uint32_t read_register(struct kgd_dev *kgd, uint32_t offset)
{
struct radeon_device *rdev = get_radeon_device(kgd);
+#ifdef __NetBSD__
+ return bus_space_read_4(rdev->rmmio_bst, rdev->rmmio_bsh, offset);
+#else
return readl((void __iomem *)(rdev->rmmio + offset));
+#endif
}
static void lock_srbm(struct kgd_dev *kgd, uint32_t mec, uint32_t pipe,
