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/include/linux Stub dma_addressing_limi...



details:   https://anonhg.NetBSD.org/src/rev/a61d1df16d81
branches:  trunk
changeset: 1028255:a61d1df16d81
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:57:01 2021 +0000

description:
Stub dma_addressing_limited, fixup references for caller

This might turn out to be a mistake if we actually need to distinguish
if a device is only capable of 32-bit DMA.


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c |   6 +++---
 sys/external/bsd/drm2/include/linux/dma-mapping.h  |  10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r ae103969cbee -r a61d1df16d81 sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c        Sun Dec 19 09:56:53 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c        Sun Dec 19 09:57:01 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_ttm.c,v 1.21 2021/12/19 09:56:53 riastradh Exp $        */
+/*     $NetBSD: radeon_ttm.c,v 1.22 2021/12/19 09:57:01 riastradh Exp $        */
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.21 2021/12/19 09:56:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.22 2021/12/19 09:57:01 riastradh Exp $");
 
 #include <linux/dma-mapping.h>
 #include <linux/pagemap.h>
@@ -988,7 +988,7 @@
                               rdev->ddev->anon_inode->i_mapping,
 #endif
                               rdev->ddev->vma_offset_manager,
-                              dma_addressing_limited(&rdev->pdev->dev));
+                              dma_addressing_limited(&rdev->pdev->pd_dev));
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                return r;
diff -r ae103969cbee -r a61d1df16d81 sys/external/bsd/drm2/include/linux/dma-mapping.h
--- a/sys/external/bsd/drm2/include/linux/dma-mapping.h Sun Dec 19 09:56:53 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/dma-mapping.h Sun Dec 19 09:57:01 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dma-mapping.h,v 1.7 2021/12/19 01:42:10 riastradh Exp $        */
+/*     $NetBSD: dma-mapping.h,v 1.8 2021/12/19 09:57:01 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
 #ifndef _LINUX_DMA_MAPPING_H_
 #define _LINUX_DMA_MAPPING_H_
 
+#include <sys/param.h>
 #include <sys/bus.h>
 
 #include <machine/limits.h>
@@ -47,4 +48,11 @@
        return ~(~(uintmax_t)0 << nbits);
 }
 
+static inline bool
+dma_addressing_limited(device_t *dev)
+{
+
+       return false;
+}
+
 #endif  /* _LINUX_DMA_MAPPING_H_ */



Home | Main Index | Thread Index | Old Index