From: sanghwan park Date: Tue, 11 Dec 2018 11:05:12 +0000 (+0900) Subject: [RAMEN9610-9358][9610] vipx: increase memory size for dram fw and mailbox latency X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a6da328b2452fd0d3d79597edcc10624302ed7e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [RAMEN9610-9358][9610] vipx: increase memory size for dram fw and mailbox latency Change-Id: Ibdd068ec2f761269ff96c5d07d769ef8e3422db1 Signed-off-by: sanghwan park --- diff --git a/arch/arm64/boot/dts/exynos/exynos9610-rmem.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-rmem.dtsi index 1ad4adcbcc63..9e924e3fb81a 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610-rmem.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-rmem.dtsi @@ -146,7 +146,7 @@ vipx_fw_code_rmem: vipx_fw_rmem@0xB8000000 { compatible = "exynos,vipx_fw_code_rmem"; - reg = <0x0 0xb8000000 0x500000>; + reg = <0x0 0xb8000000 0x1000000>; }; }; }; diff --git a/drivers/vision/vipx/vipx-config.h b/drivers/vision/vipx/vipx-config.h index f5ce08380550..bc36ec5c01f0 100644 --- a/drivers/vision/vipx/vipx-config.h +++ b/drivers/vision/vipx/vipx-config.h @@ -34,7 +34,7 @@ //#define DEBUG_LOG_MEMORY //#define DEBUG_LOG_CALL_TREE //#define DEBUG_LOG_MAILBOX_DUMP -#define DEBUG_LOG_REQUEST_DUMP +//#define DEBUG_LOG_REQUEST_DUMP //#define TEMP_RT_FRAMEWORK_TEST diff --git a/drivers/vision/vipx/vipx-context.c b/drivers/vision/vipx/vipx-context.c index a4baeb8560ff..882b73dfcf4f 100644 --- a/drivers/vision/vipx/vipx-context.c +++ b/drivers/vision/vipx/vipx-context.c @@ -13,10 +13,11 @@ #include "vipx-kernel-binary.h" #include "vipx-context.h" -#define KERNEL_BINARY_DEBUG -#define LOAD_GRAPH_INFO_DEBUG -#define UNLOAD_GRAPH_INFO_DEBUG -#define EXECUTE_DEBUG +/* Disable DEBUG_LOG */ +// #define KERNEL_BINARY_DEBUG +// #define LOAD_GRAPH_INFO_DEBUG +// #define UNLOAD_GRAPH_INFO_DEBUG +// #define EXECUTE_DEBUG static struct vipx_buffer *__vipx_context_create_buffer( struct vipx_context *vctx, diff --git a/drivers/vision/vipx/vipx-core.c b/drivers/vision/vipx/vipx-core.c index ab6995bba458..c06d96c98a6e 100644 --- a/drivers/vision/vipx/vipx-core.c +++ b/drivers/vision/vipx/vipx-core.c @@ -487,6 +487,9 @@ static int vipx_open(struct inode *inode, struct file *file) file->private_data = vctx; mutex_unlock(&core->lock); + + vipx_info("The vipx has been successfully opened\n"); + vipx_leave(); return 0; p_err_graph: @@ -494,6 +497,7 @@ p_err_vctx: __vref_put(&core->open_cnt); p_err_vref: mutex_unlock(&core->lock); + vipx_err("Failed to open the vipx [%d]\n", ret); p_err_lock: return ret; } @@ -522,6 +526,7 @@ static int vipx_release(struct inode *inode, struct file *file) __vref_put(&core->open_cnt); mutex_unlock(&core->lock); + vipx_info("The vipx has been closed\n"); vipx_leave(); return 0; } diff --git a/drivers/vision/vipx/vipx-interface.h b/drivers/vision/vipx/vipx-interface.h index e2fca1769556..cbb9ad62a007 100644 --- a/drivers/vision/vipx/vipx-interface.h +++ b/drivers/vision/vipx/vipx-interface.h @@ -21,7 +21,7 @@ #define VIPX_WORK_MAX_COUNT (20) #define VIPX_WORK_MAX_DATA (24) -#define VIPX_COMMAND_TIMEOUT (3 * HZ) +#define VIPX_COMMAND_TIMEOUT (10 * HZ) struct vipx_system;