Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:31:51 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_chan.c
Log Message:
Fix bad merge.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.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/nouveau/nouveau_chan.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c:1.3 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c Mon Aug 27 07:31:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_chan.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: nouveau_chan.c,v 1.4 2018/08/27 07:31:51 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_chan.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_chan.c,v 1.4 2018/08/27 07:31:51 riastradh Exp $");
#include <nvif/os.h>
#include <nvif/class.h>
@@ -96,8 +96,8 @@ nouveau_channel_prep(struct nouveau_drm
{
struct nouveau_cli *cli = (void *)device->object.client;
struct nvkm_mmu *mmu = nvxx_mmu(device);
- static const struct nv_dma_class zero_args;
- struct nv_dma_class args = zero_args;
+ static const struct nv_dma_v0 zero_args;
+ struct nv_dma_v0 args = zero_args;
struct nouveau_channel *chan;
u32 target;
int ret;
@@ -301,8 +301,8 @@ nouveau_channel_init(struct nouveau_chan
struct nvif_device *device = chan->device;
struct nouveau_cli *cli = (void *)chan->user.client;
struct nvkm_mmu *mmu = nvxx_mmu(device);
- static const struct nv_dma_class zero_args;
- struct nv_dma_class args = zero_args;
+ static const struct nv_dma_v0 zero_args;
+ struct nv_dma_v0 args = zero_args;
int ret, i;
nvif_object_map(&chan->user);
