[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau Fix bad merge.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/14ef996c1cfd
branches:  trunk
changeset: 365997:14ef996c1cfd
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:31:51 2018 +0000

description:
Fix bad merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r e11552449d88 -r 14ef996c1cfd sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c     Mon Aug 27 07:31:40 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c     Mon Aug 27 07:31:51 2018 +0000
@@ -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 @@
 {
        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 @@
        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);