Module Name: src
Committed By: jdolecek
Date: Wed Feb 12 20:08:32 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_fbcon.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.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/nouveau_fbcon.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.5 Mon Aug 27 07:57:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c Wed Feb 12 20:08:31 2020
@@ -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_unlock:
out_unpin:
nouveau_bo_unpin(nvbo);
out_unref:
- nouveau_bo_ref(NULL, &nvbo);
+ nouveau_gem_object_del(&nvbo->gem);
out:
return ret;
}
