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_mmu.c

diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu.c b/drivers/gpu/arm/midgard/mali_kbase_mmu.c
index 27fd4f29b315d2db2567cdcaa8da04b0b3957498..17e4e08b68ff906ed6f0ded1fa5867114f2c01fa 100755 (executable)
--- a/drivers/gpu/arm/midgard/mali_kbase_mmu.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c
@@ -213,8 +213,8 @@ static void page_fault_worker(struct work_struct *data)
                if (MALI_ERROR_NONE != err) {
                        /* failed to insert pages, handle as a normal PF */
                        mutex_unlock(&faulting_as->transaction_mutex);
-                       kbase_gpu_vm_unlock(kctx);
                        kbase_free_phy_pages_helper(region->alloc, new_pages);
+                       kbase_gpu_vm_unlock(kctx);
                        /* The locked VA region will be unlocked and the cache invalidated in here */
                        kbase_mmu_report_fault_and_kill(kctx, faulting_as);
                        goto fault_done;