CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 12:40:21 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_ioctl.c

Log Message:
nouveau: fix a "can return -1 to userland" problem.

nvkm_ioctl_del() for some reason converts 0 into 1 return.  this
appears to be a way to avoid having a log printed by nvkm_ioctl()
and to trigger some dead code ("hack" is always NULL afaict.)
after consuming this value convert it back to 0 for ioctl return.

Author: phone 
Committer: Taylor R Campbell 


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.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_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c:1.6 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c:1.6	Sun Dec 19 10:51:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c	Sun Dec 19 12:40:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_core_ioctl.c,v 1.6 2021/12/19 10:51:57 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_core_ioctl.c,v 1.7 2021/12/19 12:40:21 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs 
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_ioctl.c,v 1.6 2021/12/19 10:51:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_ioctl.c,v 1.7 2021/12/19 12:40:21 riastradh Exp $");
 
 #include 
 #include 
@@ -487,6 +487,10 @@ nvkm_ioctl(struct nvkm_client *client, b
 			client->data = NULL;
 		}
 	}
+#ifdef __NetBSD__
+	else
+		ret = 0;
+#endif
 
 	return ret;
 }

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 12:40:21 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_ioctl.c

Log Message:
nouveau: fix a "can return -1 to userland" problem.

nvkm_ioctl_del() for some reason converts 0 into 1 return.  this
appears to be a way to avoid having a log printed by nvkm_ioctl()
and to trigger some dead code ("hack" is always NULL afaict.)
after consuming this value convert it back to 0 for ioctl return.

Author: phone 
Committer: Taylor R Campbell 


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:07:12 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_object.c

Log Message:
nouveau: Maintain object->on_tree.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.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_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.10 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.10	Sun Dec 19 11:06:19 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c	Sun Dec 19 11:07:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_core_object.c,v 1.10 2021/12/19 11:06:19 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_core_object.c,v 1.11 2021/12/19 11:07:11 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.10 2021/12/19 11:06:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.11 2021/12/19 11:07:11 riastradh Exp $");
 
 #include 
 #include 
@@ -69,8 +69,10 @@ void
 nvkm_object_remove(struct nvkm_object *object)
 {
 #ifdef __NetBSD__
-	if (object->on_tree)
+	if (object->on_tree) {
 		rb_tree_remove_node(&object->client->objtree, object);
+		object->on_tree = false;
+	}
 #else
 	if (!RB_EMPTY_NODE(&object->node))
 		rb_erase(&object->node, &object->client->objroot);
@@ -83,7 +85,12 @@ nvkm_object_insert(struct nvkm_object *o
 #ifdef __NetBSD__
 	struct nvkm_object *collision =
 	rb_tree_insert_node(&object->client->objtree, object);
-	return collision == object;
+
+	if (collision != object)
+		return false;	/* EEXIST */
+
+	object->on_tree = true;
+	return true;
 #else
 	struct rb_node **ptr = &object->client->objroot.rb_node;
 	struct rb_node *parent = NULL;

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:07:12 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_object.c

Log Message:
nouveau: Maintain object->on_tree.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:06:19 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_object.c

Log Message:
nouveau: Fix sense of on_tree test before removal.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.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_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.9 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.9	Sun Dec 19 11:05:55 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c	Sun Dec 19 11:06:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_core_object.c,v 1.9 2021/12/19 11:05:55 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_core_object.c,v 1.10 2021/12/19 11:06:19 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.9 2021/12/19 11:05:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.10 2021/12/19 11:06:19 riastradh Exp $");
 
 #include 
 #include 
@@ -69,7 +69,7 @@ void
 nvkm_object_remove(struct nvkm_object *object)
 {
 #ifdef __NetBSD__
-	if (!object->on_tree)
+	if (object->on_tree)
 		rb_tree_remove_node(&object->client->objtree, object);
 #else
 	if (!RB_EMPTY_NODE(&object->node))

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:06:19 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_object.c

Log Message:
nouveau: Fix sense of on_tree test before removal.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:05:55 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_object.c

Log Message:
nouveau: Fix #endif NetBSD so we return ENOENT here.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.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_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.8 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.8	Sun Dec 19 10:51:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c	Sun Dec 19 11:05:55 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_core_object.c,v 1.8 2021/12/19 10:51:57 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_core_object.c,v 1.9 2021/12/19 11:05:55 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.8 2021/12/19 10:51:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.9 2021/12/19 11:05:55 riastradh Exp $");
 
 #include 
 #include 
@@ -53,8 +53,8 @@ nvkm_object_search(struct nvkm_client *c
 			else
 goto done;
 		}
-		return ERR_PTR(-ENOENT);
 #endif
+		return ERR_PTR(-ENOENT);
 	} else {
 		object = &client->object;
 	}

CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:05:55 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_object.c

Log Message:
nouveau: Fix #endif NetBSD so we return ENOENT here.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.