Module Name: src
Committed By: riastradh
Date: Wed Jul 20 01:22:38 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
Log Message:
drm: Ifdef out alpha-specific logic in radeon.
Guessing this is handled transparently by bus_space(9) when we ask
for prefetchable linear mappings. Need an alpha wizard to review!
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.25 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.25 Sat May 21 17:50:21 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Wed Jul 20 01:22:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_ttm.c,v 1.25 2022/05/21 17:50:21 riastradh Exp $ */
+/* $NetBSD: radeon_ttm.c,v 1.26 2022/07/20 01:22:38 riastradh Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.25 2022/05/21 17:50:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.26 2022/07/20 01:22:38 riastradh Exp $");
#include <linux/dma-mapping.h>
#include <linux/pagemap.h>
@@ -453,6 +453,7 @@ static int radeon_ttm_io_mem_reserve(str
return -EINVAL;
mem->bus.base = rdev->mc.aper_base;
mem->bus.is_iomem = true;
+#ifndef __NetBSD__ /* alpha hose handled through bus_space(9) */
#ifdef __alpha__
/*
* Alpha: use bus.addr to hold the ioremap() return,
@@ -478,6 +479,7 @@ static int radeon_ttm_io_mem_reserve(str
mem->bus.base = (mem->bus.base & 0x0ffffffffUL) +
rdev->ddev->hose->dense_mem_base;
#endif
+#endif
KASSERTMSG((mem->bus.base & (PAGE_SIZE - 1)) == 0,
"mc aperture is not page-aligned: %" PRIx64 "",
(uint64_t)mem->bus.base);
