[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo Fix ...

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

details:   https://anonhg.NetBSD.org/src/rev/080bafafa459
branches:  trunk
changeset: 366044:080bafafa459
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:40:11 2018 +0000

description:
Fix artefacts of unfinished merge of renamed variables.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c |  8 ++++----
 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r c27cd557d283 -r 080bafafa459 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c  Mon Aug 27 07:39:56 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c  Mon Aug 27 07:40:11 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_fifo_gf100.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $     */
+/*     $NetBSD: nouveau_nvkm_engine_fifo_gf100.c,v 1.3 2018/08/27 07:40:11 riastradh Exp $     */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_gf100.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_gf100.c,v 1.3 2018/08/27 07:40:11 riastradh Exp $");
 
 #include "gf100.h"
 #include "changf100.h"
@@ -80,7 +80,7 @@
        if (cold) {
                uint count = 2000;
                while (count-- > 0) {
-                       if (!(nvkm_rd32(priv, 0x00227c) & 0x00100000))
+                       if (!(nvkm_rd32(device, 0x00227c) & 0x00100000))
                                break;
                        delay(1000);
                }
@@ -92,7 +92,7 @@
                spin_lock(&fifo->runlist.lock);
                DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, &fifo->runlist.wait,
                    &fifo->runlist.lock, msecs_to_jiffies(2000),
-                   !(nvkm_rd32(priv, 0x00227c) & 0x00100000));
+                   !(nvkm_rd32(device, 0x00227c) & 0x00100000));
                if (ret == 0)
                        nvkm_error(subdev, "runlist update timeout\n");
                spin_unlock(&fifo->runlist.lock);
diff -r c27cd557d283 -r 080bafafa459 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c  Mon Aug 27 07:39:56 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c  Mon Aug 27 07:40:11 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_fifo_gk104.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $     */
+/*     $NetBSD: nouveau_nvkm_engine_fifo_gk104.c,v 1.3 2018/08/27 07:40:11 riastradh Exp $     */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_gk104.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_gk104.c,v 1.3 2018/08/27 07:40:11 riastradh Exp $");
 
 #include "gk104.h"
 #include "changk104.h"
@@ -81,7 +81,7 @@
        if (cold) {
                uint count = 2000;
                while (count-- > 0) {
-                       if (!(nvkm_rd32(priv, 0x002284 +
+                       if (!(nvkm_rd32(device, 0x002284 +
                            (engine * 0x08)) & 0x00100000))
                                break;
                        delay(1000);
@@ -95,7 +95,7 @@
                spin_lock(&engn->lock);
                DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, &engn->wait, &engn->lock,
                    msecs_to_jiffies(2000),
-                   !(nvkm_rd32(priv, 0x002284 +
+                   !(nvkm_rd32(device, 0x002284 +
                            (engine * 0x08)) & 0x00100000));
                if (ret == 0)
                        nvkm_error(subdev, "runlist %d update timeout\n",