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 io_mapping_map_wc takes ...



details:   https://anonhg.NetBSD.org/src/rev/75777b896b4c
branches:  trunk
changeset: 1027987:75777b896b4c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:25:28 2021 +0000

description:
io_mapping_map_wc takes a size argument now. Must be PAGE_SIZE.

diffstat:

 sys/external/bsd/drm2/include/linux/io-mapping.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r d5e6a99e8ecd -r 75777b896b4c sys/external/bsd/drm2/include/linux/io-mapping.h
--- a/sys/external/bsd/drm2/include/linux/io-mapping.h  Sun Dec 19 01:25:21 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/io-mapping.h  Sun Dec 19 01:25:28 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: io-mapping.h,v 1.5 2015/02/25 14:02:43 riastradh Exp $ */
+/*     $NetBSD: io-mapping.h,v 1.6 2021/12/19 01:25:28 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -100,10 +100,12 @@
 }
 
 static inline void *
-io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
+io_mapping_map_wc(struct io_mapping *mapping, bus_addr_t offset,
+    bus_size_t size)
 {
        paddr_t cookie;
 
+       KASSERT(size == PAGE_SIZE);
        KASSERT(0 == (offset & (PAGE_SIZE - 1)));
        KASSERT(PAGE_SIZE <= mapping->diom_size);
        KASSERT(offset <= (mapping->diom_size - PAGE_SIZE));
@@ -140,7 +142,7 @@
 io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset)
 {
 
-       return io_mapping_map_wc(mapping, offset);
+       return io_mapping_map_wc(mapping, offset, PAGE_SIZE);
 }
 
 static inline void



Home | Main Index | Thread Index | Old Index