From 2dbd8c396e68a40f4998a52803e5331c6732b67c Mon Sep 17 00:00:00 2001 From: George Shen Date: Thu, 8 Dec 2022 11:40:12 -0800 Subject: [PATCH] msm: eva: Support Lanai new HFI cvp_buf_type Keep ERR/WARN/FW logging only. Change-Id: I910dd109fa6d16f093848e7c3c3a03c1568f87e6 Signed-off-by: George Shen --- include/uapi/eva/media/msm_eva_private.h | 16 ---------------- msm/eva/msm_cvp_debug.c | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/uapi/eva/media/msm_eva_private.h b/include/uapi/eva/media/msm_eva_private.h index d54280cd6c..b64622de3f 100644 --- a/include/uapi/eva/media/msm_eva_private.h +++ b/include/uapi/eva/media/msm_eva_private.h @@ -119,7 +119,6 @@ struct eva_kmd_client_data { __u32 client_data1; __u32 client_data2; }; -#ifdef CVP_CONFIG_SYNX_V2 struct cvp_buf_type { __s32 fd; __u32 size; @@ -131,21 +130,6 @@ struct cvp_buf_type { __u32 input_handle; __u32 output_handle; }; -#else -struct cvp_buf_type { - __s32 fd; - __u32 size; - __u32 offset; - __u32 flags; - union { - struct dma_buf *dbuf; - struct { - __u32 reserved1; - __u32 reserved2; - }; - }; -}; -#endif /** * Structures and macros for Out-of-Band (OOB) buffer diff --git a/msm/eva/msm_cvp_debug.c b/msm/eva/msm_cvp_debug.c index e2f7c4481e..f8d7355180 100644 --- a/msm/eva/msm_cvp_debug.c +++ b/msm/eva/msm_cvp_debug.c @@ -12,7 +12,7 @@ #define CREATE_TRACE_POINTS #define MAX_SSR_STRING_LEN 10 -int msm_cvp_debug = CVP_ERR | CVP_WARN | CVP_FW | CVP_DBG; +int msm_cvp_debug = CVP_ERR | CVP_WARN | CVP_FW; EXPORT_SYMBOL(msm_cvp_debug); int msm_cvp_debug_out = CVP_OUT_PRINTK;