MALI: rockchip: upgrade midgard DDK to r14p0-01rel0

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

diff --git a/drivers/gpu/arm/midgard/mali_kbase_device.c b/drivers/gpu/arm/midgard/mali_kbase_device.c
index 62ab0caf9858a6153e04081bc83e674f976eaa9f..7484eec5108fed3b06fcb82f0dac5a4502554dae 100644 (file)
--- a/drivers/gpu/arm/midgard/mali_kbase_device.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_device.c
@@ -82,7 +82,6 @@ static int kbase_device_as_init(struct kbase_device *kbdev, int i)
        if (!kbdev->as[i].pf_wq)
                return -EINVAL;
 
-       mutex_init(&kbdev->as[i].transaction_mutex);
        INIT_WORK(&kbdev->as[i].work_pagefault, page_fault_worker);
        INIT_WORK(&kbdev->as[i].work_busfault, bus_fault_worker);
 
@@ -151,6 +150,7 @@ int kbase_device_init(struct kbase_device * const kbdev)
 #endif /* CONFIG_ARM64 */
 
        spin_lock_init(&kbdev->mmu_mask_change);
+       mutex_init(&kbdev->mmu_hw_mutex);
 #ifdef CONFIG_ARM64
        kbdev->cci_snoop_enabled = false;
        np = kbdev->dev->of_node;