From 336a6ad20f73689f9483d5b29ab0387800e18772 Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Wed, 7 Jun 2017 17:05:47 +0800 Subject: [PATCH] MGS-2857-2 [#imx-530] cleanup spinlock debug code from gpu kernel not make sense to use the different codes for spinlock debug Date: Jun 07, 2017 Signed-off-by: Xianzhong --- .../hal/os/linux/kernel/gc_hal_kernel_os.c | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c index 9bf60450f976..8efcd178d1a5 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c @@ -365,9 +365,6 @@ _QueryProcessPageTable( OUT gctPHYS_ADDR_T * Address ) { -#ifndef CONFIG_DEBUG_SPINLOCK - spinlock_t *lock = NULL; -#endif gctUINTPTR_T logical = (gctUINTPTR_T)Logical; pgd_t *pgd; pud_t *pud; @@ -405,45 +402,28 @@ _QueryProcessPageTable( return gcvSTATUS_NOT_FOUND; } -#ifndef CONFIG_DEBUG_SPINLOCK - pte = pte_offset_map_lock(current->mm, pmd, logical, &lock); -#else spin_lock(¤t->mm->page_table_lock); - pte = pte_offset_map(pmd, logical); -#endif if (!pte) { -#ifndef CONFIG_DEBUG_SPINLOCK - if (lock) - { - spin_unlock(lock); - } -#else spin_unlock(¤t->mm->page_table_lock); -#endif + return gcvSTATUS_NOT_FOUND; } if (!pte_present(*pte)) { -#ifndef CONFIG_DEBUG_SPINLOCK - pte_unmap_unlock(pte, lock); -#else pte_unmap(pte); spin_unlock(¤t->mm->page_table_lock); -#endif + return gcvSTATUS_NOT_FOUND; } *Address = (pte_pfn(*pte) << PAGE_SHIFT) | offset; -#ifndef CONFIG_DEBUG_SPINLOCK - pte_unmap_unlock(pte, lock); -#else + pte_unmap(pte); spin_unlock(¤t->mm->page_table_lock); -#endif return gcvSTATUS_OK; } -- 2.17.1