Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu call ...



details:   https://anonhg.NetBSD.org/src/rev/7b4dfa655b97
branches:  trunk
changeset: 449717:7b4dfa655b97
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 18 02:01:41 2019 +0000

description:
call destroy on a mutex before freeing it.
fixes LOCKDEBUG assert on a GT 6xx card.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_base.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 7819030f4f1a -r 7b4dfa655b97 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_base.c     Sun Mar 17 19:57:54 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_base.c     Mon Mar 18 02:01:41 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_subdev_mmu_base.c,v 1.4 2018/09/01 04:38:22 riastradh Exp $       */
+/*     $NetBSD: nouveau_nvkm_subdev_mmu_base.c,v 1.5 2019/03/18 02:01:41 mrg Exp $     */
 
 /*
  * Copyright 2010 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mmu_base.c,v 1.4 2018/09/01 04:38:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mmu_base.c,v 1.5 2019/03/18 02:01:41 mrg Exp $");
 
 #include "priv.h"
 
@@ -528,6 +528,11 @@
 
        nvkm_mm_fini(&vm->mm);
        vfree(vm->pgt);
+#ifdef __NetBSD__
+       linux_mutex_destroy(&vm->mutex);
+#else
+       mutex_destroy(&vm->mutex);
+#endif
        kfree(vm);
 }
 



Home | Main Index | Thread Index | Old Index