[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau fix error path when n...

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

details:   https://anonhg.NetBSD.org/src/rev/5782a4ee7d19
branches:  trunk
changeset: 1007278:5782a4ee7d19
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Feb 12 20:08:31 2020 +0000

description:
fix error path when nouveaufb fails to attach (such as when it's not
actually configured into the kernel), the gem was not released
properly leading to:
panic: LOCKDEBUG: Reader / writer lock error: kmem_intr_free,289: allocation contains active lock

diffstat:

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

diffs (27 lines):

diff -r 62f2a3b04d99 -r 5782a4ee7d19 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Wed Feb 12 19:55:32 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Wed Feb 12 20:08:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_fbcon.c,v 1.5 2018/08/27 07:57:34 riastradh Exp $      */
+/*     $NetBSD: nouveau_fbcon.c,v 1.6 2020/02/12 20:08:31 jdolecek Exp $       */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.5 2018/08/27 07:57:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.6 2020/02/12 20:08:31 jdolecek Exp $");
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -507,7 +507,7 @@
 out_unpin:
        nouveau_bo_unpin(nvbo);
 out_unref:
-       nouveau_bo_ref(NULL, &nvbo);
+       nouveau_gem_object_del(&nvbo->gem);
 out:
        return ret;
 }