Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:40:11 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo:
nouveau_nvkm_engine_fifo_gf100.c nouveau_nvkm_engine_fifo_gk104.c
Log Message:
Fix artefacts of unfinished merge of renamed variables.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.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/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c:1.2 Mon Aug 27 04:58:31 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gf100.c Mon Aug 27 07:40:11 2018
@@ -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 @@ gf100_fifo_runlist_update(struct gf100_f
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 @@ gf100_fifo_runlist_update(struct gf100_f
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);
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c:1.2 Mon Aug 27 04:58:31 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c Mon Aug 27 07:40:11 2018
@@ -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 @@ gk104_fifo_runlist_update(struct gk104_f
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 @@ gk104_fifo_runlist_update(struct gk104_f
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",
