Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:57:01 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
src/sys/external/bsd/drm2/include/linux: dma-mapping.h
Log Message:
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 <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/include/linux/dma-mapping.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_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.21 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.21 Sun Dec 19 09:56:53 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Sun Dec 19 09:57:01 2021
@@ -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 @@ int radeon_ttm_init(struct radeon_device
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;
Index: src/sys/external/bsd/drm2/include/linux/dma-mapping.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.7 src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.8
--- src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.7 Sun Dec 19 01:42:10 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-mapping.h Sun Dec 19 09:57:01 2021
@@ -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 @@ DMA_BIT_MASK(unsigned nbits)
return ~(~(uintmax_t)0 << nbits);
}
+static inline bool
+dma_addressing_limited(device_t *dev)
+{
+
+ return false;
+}
+
#endif /* _LINUX_DMA_MAPPING_H_ */
