[src/netbsd-7-0]: src/sys/external/bsd/drm2/drm Pull up following revision(s)...

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

details:   https://anonhg.NetBSD.org/src/rev/86fda5d6572a
branches:  netbsd-7-0
changeset: 801245:86fda5d6572a
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 03 12:23:57 2016 +0000

description:
Pull up following revision(s) (requested by maya in ticket #1277):
        sys/external/bsd/drm2/drm/drm_vma_manager.c: revision 1.5
Lock the manager and not just the node for inserting/removing nodes
should fix/help PR kern/50349: radeondrmkms vt-switching crash
ok riastradh

diffstat:

 sys/external/bsd/drm2/drm/drm_vma_manager.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r c6815e0e09e1 -r 86fda5d6572a sys/external/bsd/drm2/drm/drm_vma_manager.c
--- a/sys/external/bsd/drm2/drm/drm_vma_manager.c       Sat Dec 03 12:06:56 2016 +0000
+++ b/sys/external/bsd/drm2/drm/drm_vma_manager.c       Sat Dec 03 12:23:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_vma_manager.c,v 1.1.4.2 2015/07/05 21:29:26 snj Exp $      */
+/*     $NetBSD: drm_vma_manager.c,v 1.1.4.2.2.1 2016/12/03 12:23:57 martin Exp $       */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.1.4.2 2015/07/05 21:29:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.1.4.2.2.1 2016/12/03 12:23:57 martin Exp $");
 
 #include <sys/kmem.h>
 #include <sys/rbtree.h>
@@ -176,10 +176,10 @@
        node->von_startpage = startpage;
        node->von_npages = npages;
 
-       rw_enter(&node->von_lock, RW_WRITER);
+       rw_enter(&mgr->vom_lock, RW_WRITER);
        collision = rb_tree_insert_node(&mgr->vom_nodes, node);
        KASSERT(collision == node);
-       rw_exit(&node->von_lock);
+       rw_exit(&mgr->vom_lock);
 
        return 0;
 }
@@ -192,9 +192,9 @@
        if (node->von_npages == 0)
                return;
 
-       rw_enter(&node->von_lock, RW_WRITER);
+       rw_enter(&mgr->vom_lock, RW_WRITER);
        rb_tree_remove_node(&mgr->vom_nodes, node);
-       rw_exit(&node->von_lock);
+       rw_exit(&mgr->vom_lock);
 
        vmem_free(mgr->vom_vmem, node->von_startpage, node->von_npages);