From a46d7cde8866ab656cd18b6343312ce7cbacb544 Mon Sep 17 00:00:00 2001 From: Loren HUANG Date: Mon, 21 Jan 2013 15:37:03 +0800 Subject: [PATCH] ENGR00240988-12 Enable GPU hardware reset for 3.5 kernel Cherry-pick from imx_3.5.7 branch. Signed-off-by: Loren HUANG Acked-by: Lily Zhang --- .../mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 cb6d3ea2c16f..792dd96aac1c 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 @@ -38,9 +38,13 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23) #include #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) +#include +#endif #include #include + #define _GC_OBJ_ZONE gcvZONE_OS /******************************************************************************* @@ -6886,10 +6890,10 @@ gckOS_ResetGPU( IN gceCORE Core ) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) #define SRC_SCR_OFFSET 0 #define BP_SRC_SCR_GPU3D_RST 1 #define BP_SRC_SCR_GPU2D_RST 4 -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) void __iomem *src_base = IO_ADDRESS(SRC_BASE_ADDR); gctUINT32 bit_offset,val; @@ -6913,6 +6917,8 @@ gckOS_ResetGPU( } gcmkFOOTER_NO(); +#else + imx_src_reset_gpu((int)Core); #endif return gcvSTATUS_OK; } -- 2.39.5