Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon drm: Ifdef out alpha-s...



details:   https://anonhg.NetBSD.org/src/rev/acf37deeba3c
branches:  trunk
changeset: 368578:acf37deeba3c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 20 01:22:38 2022 +0000

description:
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!

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 38941c8e48fb -r acf37deeba3c sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c        Wed Jul 20 01:20:20 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c        Wed Jul 20 01:22:38 2022 +0000
@@ -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 @@
                        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 @@
                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);



Home | Main Index | Thread Index | Old Index