rockchip:midgard:1,update gpu version to r4p1-00rel0 2,add input handler when runtim...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / mali_kbase_mem.c

diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c
index c913c14708d16d25c7ca64668b46466df0e57318..f1f44769c9b9ebf7e9d9fe133b27fdb4d5d11139 100755 (executable)
--- a/drivers/gpu/arm/midgard/mali_kbase_mem.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c
@@ -137,6 +137,8 @@ kbase_va_region *kbase_region_tracker_find_region_enclosing_address(kbase_contex
 
        KBASE_DEBUG_ASSERT(NULL != kctx);
 
+       lockdep_assert_held(&kctx->reg_lock);
+
        rbnode = kctx->reg_rbtree.rb_node;
        while (rbnode) {
                u64 tmp_start_pfn, tmp_end_pfn;
@@ -168,6 +170,8 @@ kbase_va_region *kbase_region_tracker_find_region_base_address(kbase_context *kc
 
        KBASE_DEBUG_ASSERT(NULL != kctx);
 
+       lockdep_assert_held(&kctx->reg_lock);
+
        rbnode = kctx->reg_rbtree.rb_node;
        while (rbnode) {
                reg = rb_entry(rbnode, struct kbase_va_region, rblink);
@@ -348,6 +352,8 @@ mali_error kbase_add_va_region(kbase_context *kctx, struct kbase_va_region *reg,
        KBASE_DEBUG_ASSERT(NULL != kctx);
        KBASE_DEBUG_ASSERT(NULL != reg);
 
+       lockdep_assert_held(&kctx->reg_lock);
+
        if (!align)
                align = 1;