ENGR00301095 gpu:gpu hang when dma memory is used up

When dma zone memory used up, gckOS_AllocateCMAMemoryFSL() will try to
free non paged memory cache and allocate again. Such operation will cause
 twice memory mutex request and cause gpu driver hang.

The solution is free the memory mutex at first before trying to free non
paged memory cache.

Date: Feb 27, 2014
Signed-off-by: Loren Huang <b02279@freescale.com>
Acked-by: Shawn Guo
(cherry picked from commit 79ed8edd23f990f6c1429154c2ee773c83bfd72e)

1 files changed, 4 insertions, 0 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 edb86dcbd7d6..eda7e53c6f55 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
@@ -2113,8 +2113,12 @@ gckOS_AllocateCMAMemoryFSL(
 #if gcdUSE_NON_PAGED_MEMORY_CACHE
     if(addr == gcvNULL)
     {
+            MEMORY_UNLOCK(Os);
+            locked = gcvFALSE;
             /*Free all cache and try again*/
             _FreeAllNonPagedMemoryCache(Os);
+            MEMORY_LOCK(Os);
+            locked = gcvTRUE;
             addr = dma_alloc_writecombine(gcvNULL,
                 mdl->numPages * PAGE_SIZE,
                 &mdl->dmaHandle,