Module Name: src
Committed By: riastradh
Date: Tue Oct 25 23:35:29 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_cmdbuf.c
Log Message:
vmwgfx(4): Use bus_dma tag, not struct device, for dma_pool shims.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_cmdbuf.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/dist/drm/vmwgfx/vmwgfx_cmdbuf.c
diff -u src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_cmdbuf.c:1.6 src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_cmdbuf.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_cmdbuf.c:1.6 Tue Oct 25 23:33:44 2022
+++ src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_cmdbuf.c Tue Oct 25 23:35:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vmwgfx_cmdbuf.c,v 1.6 2022/10/25 23:33:44 riastradh Exp $ */
+/* $NetBSD: vmwgfx_cmdbuf.c,v 1.7 2022/10/25 23:35:29 riastradh Exp $ */
// SPDX-License-Identifier: GPL-2.0 OR MIT
/**************************************************************************
@@ -28,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmwgfx_cmdbuf.c,v 1.6 2022/10/25 23:33:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmwgfx_cmdbuf.c,v 1.7 2022/10/25 23:35:29 riastradh Exp $");
#include <linux/dmapool.h>
#include <linux/pci.h>
@@ -1373,7 +1373,11 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_cr
man->num_contexts = (dev_priv->capabilities & SVGA_CAP_HP_CMD_QUEUE) ?
2 : 1;
man->headers = dma_pool_create("vmwgfx cmdbuf",
+#ifdef __NetBSD__
+ dev_priv->dev->dmat,
+#else
&dev_priv->dev->pdev->dev,
+#endif
sizeof(SVGACBHeader),
64, PAGE_SIZE);
if (!man->headers) {
@@ -1382,7 +1386,11 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_cr
}
man->dheaders = dma_pool_create("vmwgfx inline cmdbuf",
+#ifdef __NetBSD__
+ dev_priv->dev->dmat,
+#else
&dev_priv->dev->pdev->dev,
+#endif
sizeof(struct vmw_cmdbuf_dheader),
64, PAGE_SIZE);
if (!man->dheaders) {
