CVS commit: src/sys/external/bsd/drm2

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 10:47:13 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/drm: drm_memory.c
        src/sys/external/bsd/drm2/linux: linux_writecomb.c

Log Message:
Misc stubs.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/drm/drm_memory.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/linux/linux_writecomb.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/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.16 src/sys/external/bsd/drm2/drm/drm_memory.c:1.17
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.16	Sun Dec 19 10:36:13 2021
+++ src/sys/external/bsd/drm2/drm/drm_memory.c	Sun Dec 19 10:47:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_memory.c,v 1.16 2021/12/19 10:36:13 riastradh Exp $	*/
+/*	$NetBSD: drm_memory.c,v 1.17 2021/12/19 10:47:13 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.16 2021/12/19 10:36:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.17 2021/12/19 10:47:13 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 
@@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_memory.c
 
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
+#include <drm/drm_cache.h>
 #include <drm/drm_legacy.h>
 #include <drm/drm_pci.h>
 #include <drm/drm_print.h>
@@ -346,3 +347,10 @@ dma32:		dev->dmat = dev->bus_dmat32;
 	/* Success!  */
 	return 0;
 }
+
+bool
+drm_need_swiotlb(int dma_bits)
+{
+
+	return false;
+}

Index: src/sys/external/bsd/drm2/linux/linux_writecomb.c
diff -u src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.8 src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.9
--- src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.8	Mon Aug 27 14:42:23 2018
+++ src/sys/external/bsd/drm2/linux/linux_writecomb.c	Sun Dec 19 10:47:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_writecomb.c,v 1.8 2018/08/27 14:42:23 riastradh Exp $	*/
+/*	$NetBSD: linux_writecomb.c,v 1.9 2021/12/19 10:47:13 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.8 2018/08/27 14:42:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.9 2021/12/19 10:47:13 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 #define HAS_MTRR 1
@@ -157,3 +157,16 @@ arch_phys_wc_index(int handle)
 	/* XXX Actually implement this...requires changes to our MTRR API.  */
 	return handle;
 }
+
+/* XXX Reserve PAT space on x86.  */
+
+int
+arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size)
+{
+	return 0;
+}
+
+void
+arch_io_free_memtype_wc(resource_size_t start, resource_size_t size)
+{
+}