From 3c7a46f4b41d1adacbffe22bb4b4114d1cf9b098 Mon Sep 17 00:00:00 2001 From: wolfgar Date: Thu, 1 Aug 2013 01:41:01 +0200 Subject: [PATCH 1/3] Fix uninitialized variables warnings --- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 2 +- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c | 2 +- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c index 7964585e7afaaa..c567640c908e30 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c @@ -886,7 +886,7 @@ gckKERNEL_Dispatch( { gceSTATUS status = gcvSTATUS_OK; gctSIZE_T bytes; - gcuVIDMEM_NODE_PTR node; + gcuVIDMEM_NODE_PTR node = gcvNULL; gctBOOL locked = gcvFALSE; gctPHYS_ADDR physical = gcvNULL; gctPOINTER logical = gcvNULL; diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c index 9685a5db3ea85c..af053f925ab18c 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c @@ -1106,7 +1106,7 @@ _AllocateCommandBuffer( gctUINT requestedSize; gctUINT allocationSize; gctUINT32 address = 0; - gcsCMDBUFFER_PTR commandBuffer; + gcsCMDBUFFER_PTR commandBuffer = gcvNULL; gctUINT8_PTR endCommand; /* Determine the aligned header size. */ diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c index d49aa6463296ec..d9370e2fae3da8 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c @@ -1660,7 +1660,7 @@ gckVIDMEM_Lock( gctBOOL acquired = gcvFALSE; gctBOOL locked = gcvFALSE; gckOS os = gcvNULL; - gctBOOL needMapping; + gctBOOL needMapping = gcvFALSE; gctUINT32 baseAddress; gcmkHEADER_ARG("Node=0x%x", Node); From 15bb848908719c50d97c50f17855a36e96327485 Mon Sep 17 00:00:00 2001 From: wolfgar Date: Thu, 1 Aug 2013 01:45:11 +0200 Subject: [PATCH 2/3] Fix compilation when mipi-csi option is disabled --- arch/arm/mach-mx6/board-wand.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c index ded741c5bc16dc..3ebda1086e6972 100644 --- a/arch/arm/mach-mx6/board-wand.c +++ b/arch/arm/mach-mx6/board-wand.c @@ -514,6 +514,7 @@ static void wand_init_hdmi(void) { mxc_iomux_set_gpr_register(0, 0, 1, 1); } +#ifdef CONFIG_IMX_HAVE_PLATFORM_IMX_MIPI_CSI /**************************************************************************** * * MIPI CSI @@ -628,8 +629,8 @@ static struct mipi_csi2_platform_data wand_mipi_csi2_platform_data = { }; /* Wandboard MIPI CSI init function */ -static void __init wand_init_mipi_csi(void){ - +static void __init wand_init_mipi_csi(void) +{ pr_debug("%s\n", __func__); /* Add CSI2 */ @@ -640,6 +641,12 @@ static void __init wand_init_mipi_csi(void){ i2c_register_board_info(1, wand_mipi_csi_i2c_board_info, ARRAY_SIZE(wand_mipi_csi_i2c_board_info)); } +#else +static void __init wand_init_mipi_csi(void) +{ + return; +} +#endif /**************************************************************************** * @@ -1181,7 +1188,7 @@ static void __init wand_board_init(void) { capture_data[i].ipu = 0; imx6q_add_v4l2_capture(i, &capture_data[i]); } - wand_init_mipi_csi(); + wand_init_mipi_csi(); wand_init_lcd(); wand_init_wifi(); wand_init_bluetooth(); From c81dfc952ee31a43c1d0a7d993687985ef7cf9ec Mon Sep 17 00:00:00 2001 From: wolfgar Date: Thu, 1 Aug 2013 01:02:21 +0200 Subject: [PATCH 3/3] Adapt video memory limit according to wandboard version (cherry picked from commit 11a509c6d0958741af52fd85661c08975d1e271d) --- arch/arm/mach-mx6/board-wand.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c index 3ebda1086e6972..56e1ba7b09d86b 100644 --- a/arch/arm/mach-mx6/board-wand.c +++ b/arch/arm/mach-mx6/board-wand.c @@ -1149,7 +1149,12 @@ static void __init wand_reserve(void) { phys_addr_t phys; if (wand_gpu_pdata.reserved_mem_size) { - phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G); + if (cpu_is_mx6q()) + phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G); + else if (cpu_is_mx6dl()) + phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_1G); + else + phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_512M); memblock_remove(phys, wand_gpu_pdata.reserved_mem_size); wand_gpu_pdata.reserved_mem_base = phys; }