CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core
Module Name:src
Committed By: mrg
Date: Tue Jan 8 05:57:34 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_option.c
Log Message:
revert this commit:
>date: 2018-08-27 07:19:47 -0700; author: riastradh; state: Exp; lines: +2
>-0; commitid: 9o7sY7hwNGx6zLPA;
>For now, unconditionally set nouveau verbosity to debug.
nouveau works mostly again now, and the debug output is very verbose.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.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/core/nouveau_nvkm_core_option.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.3 Mon Aug 27 14:19:47 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c Tue Jan 8 05:57:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_option.c,v 1.3 2018/08/27 14:19:47 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_option.c,v 1.4 2019/01/08 05:57:34 mrg Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_option.c,v 1.3 2018/08/27 14:19:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_option.c,v 1.4 2019/01/08 05:57:34 mrg Exp $");
#include
#include
@@ -101,8 +101,6 @@ nvkm_dbgopt(const char *optstr, const ch
{
int mode = 1, level = CONFIG_NOUVEAU_DEBUG_DEFAULT;
- return NV_DBG_DEBUG;
-
while (optstr) {
int len = strcspn(optstr, ",=");
switch (optstr[len]) {
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 14:19:47 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_option.c
Log Message:
For now, unconditionally set nouveau verbosity to debug.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.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/core/nouveau_nvkm_core_option.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.2 Mon Aug 27 04:58:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c Mon Aug 27 14:19:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_option.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_option.c,v 1.3 2018/08/27 14:19:47 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_option.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_option.c,v 1.3 2018/08/27 14:19:47 riastradh Exp $");
#include
#include
@@ -101,6 +101,8 @@ nvkm_dbgopt(const char *optstr, const ch
{
int mode = 1, level = CONFIG_NOUVEAU_DEBUG_DEFAULT;
+ return NV_DBG_DEBUG;
+
while (optstr) {
int len = strcspn(optstr, ",=");
switch (optstr[len]) {
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core
Module Name:src Committed By: riastradh Date: Mon Aug 27 14:16:17 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core: nouveau_nvkm_core_event.c Log Message: Destroy spin locks we created. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_event.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/core/nouveau_nvkm_core_event.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_event.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_event.c:1.3 --- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_event.c:1.2 Mon Aug 27 04:58:30 2018 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_event.c Mon Aug 27 14:16:17 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nvkm_core_event.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */ +/* $NetBSD: nouveau_nvkm_core_event.c,v 1.3 2018/08/27 14:16:17 riastradh Exp $ */ /* * Copyright 2013-2014 Red Hat Inc. @@ -22,7 +22,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #include -__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_event.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_event.c,v 1.3 2018/08/27 14:16:17 riastradh Exp $"); #include #include @@ -83,6 +83,8 @@ nvkm_event_fini(struct nvkm_event *event kfree(event->refs); event->refs = NULL; } + spin_lock_destroy(&event->list_lock); + spin_lock_destroy(&event->refs_lock); } int
