From cfdb95cb0ee667c5bf918efb42ee3e679df783a0 Mon Sep 17 00:00:00 2001 From: "yufei.huan" Date: Wed, 26 Jul 2023 14:45:42 +0800 Subject: [PATCH] deinterlace: 5.15 pq_api move to uapi [1/1] PD#SWPL-127313 Problem: move pq_api to uapi path Solution: move pq_api to uapi path Verify: verify on t5m Change-Id: I253a8fce92feb84b630ea5d1199b2b1c724b57b3 Signed-off-by: yufei.huan --- include/linux/amlogic/media/amvecm/amvecm.h | 17 ----------------- include/uapi/amlogic/amvecm_ext.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/include/linux/amlogic/media/amvecm/amvecm.h b/include/linux/amlogic/media/amvecm/amvecm.h index ffc5781af..eb24c15eb 100644 --- a/include/linux/amlogic/media/amvecm/amvecm.h +++ b/include/linux/amlogic/media/amvecm/amvecm.h @@ -189,10 +189,6 @@ bool is_hdmi_ll_as_hdr10(void); #define CSC_FLAG_CHECK_OUTPUT 2 #define CSC_FLAG_FORCE_SIGNAL 4 -#define _DI_ 'D' - -#define AMDI_IOC_SET_PQ_PARM _IOW(_DI_, 0x51, struct am_pq_parm_s) - /*hdr output mode*/ #define HDR_OUTPUT_MODE_DOLBY_VISION 0 #define HDR_OUTPUT_MODE_HDR10 1 @@ -333,19 +329,6 @@ struct ve_pq_overscan_s { extern struct ve_pq_overscan_s overscan_table[TIMING_MAX]; -struct am_pq_parm_s { - unsigned int table_name; - unsigned int table_len; - union { - void *table_ptr; - long long l_table; - }; - union { - void *reserved; - long long l_reserved; - }; -}; - /*3D LUT IOCTL command list*/ struct table_3dlut_s { unsigned int data[17 * 17 * 17][3]; diff --git a/include/uapi/amlogic/amvecm_ext.h b/include/uapi/amlogic/amvecm_ext.h index ac3d0857b..0d8bb8621 100644 --- a/include/uapi/amlogic/amvecm_ext.h +++ b/include/uapi/amlogic/amvecm_ext.h @@ -9,6 +9,7 @@ #include #define _VE_CM 'C' +#define _DI_ 'D' #define DNLP_SCURV_LEN 65 #define GAIN_VAR_LUT_LEN 49 @@ -163,6 +164,19 @@ enum pq_table_name_e { TABLE_NAME_MAX, }; +struct am_pq_parm_s { + unsigned int table_name; + unsigned int table_len; + union { + void *table_ptr; + long long l_table; + }; + union { + void *reserved; + long long l_reserved; + }; +}; + struct ve_pq_load_s { enum pq_table_name_e param_id; unsigned int length; @@ -560,6 +574,7 @@ struct ve_ble_whe_param_s { #define AMVECM_IOC_3D_SYNC_EN _IO(_VE_CM, 0x49) #define AMVECM_IOC_GAMMA_SET _IOW(_VE_CM, 0X4a, struct gm_tbl_s) #define AMVECM_IOC_3D_SYNC_DIS _IO(_VE_CM, 0x50) +#define AMDI_IOC_SET_PQ_PARM _IOW(_DI_, 0x51, struct am_pq_parm_s) #define AMVECM_IOC_SET_OVERSCAN _IOW(_VE_CM, 0x52, struct ve_pq_load_s) /*DNLP IOCTL command list*/ #define AMVECM_IOC_G_DNLP_STATE _IOR(_VE_CM, 0x53, enum dnlp_state_e)