From 900d41208585926221c911c3bd308757c2566fcb Mon Sep 17 00:00:00 2001 From: Luke Go Date: Tue, 23 Jun 2020 14:28:09 +0900 Subject: [PATCH] tmp Change-Id: Iba93a2353a0792553a39f70578e9a024aa6fa88b --- include/linux/amlogic/media/amdolbyvision/dolby_vision.h | 5 ++--- include/linux/amlogic/media/amvecm/amvecm.h | 7 +------ include/linux/amlogic/media/vout/vinfo.h | 3 +-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/include/linux/amlogic/media/amdolbyvision/dolby_vision.h b/include/linux/amlogic/media/amdolbyvision/dolby_vision.h index b2d9b16ba518..a73dfe887d55 100644 --- a/include/linux/amlogic/media/amdolbyvision/dolby_vision.h +++ b/include/linux/amlogic/media/amdolbyvision/dolby_vision.h @@ -64,7 +64,7 @@ extern void dolby_vision_set_toggle_flag(int flag); extern int dolby_vision_wait_metadata(struct vframe_s *vf); extern int dolby_vision_pop_metadata(void); int dolby_vision_update_metadata(struct vframe_s *vf, bool drop_flag); -extern int dolby_vision_process(struct vframe_s *vf, u32 display_size, +int dolby_vision_process(struct vframe_s *vf, u32 display_size, u8 pps_state); extern void dolby_vision_init_receiver(void *pdev); extern void dolby_vision_vf_put(struct vframe_s *vf); @@ -97,8 +97,7 @@ extern void tv_dolby_vision_dma_table_modify( u32 tbl_id, uint64_t value); extern void tv_dolby_vision_efuse_info(void); extern int dolby_vision_parse_metadata( - struct vframe_s *vf, u8 toggle_mode, - bool bypass_release, bool drop_flag); + struct vframe_s *vf, u8 toggle_mode, bool bypass_release); extern void dolby_vision_update_vsvdb_config( char *vsvdb_buf, u32 tbl_size); extern void tv_dolby_vision_el_info(void); diff --git a/include/linux/amlogic/media/amvecm/amvecm.h b/include/linux/amlogic/media/amvecm/amvecm.h index 0d5c74145c4a..68677dc9507b 100644 --- a/include/linux/amlogic/media/amvecm/amvecm.h +++ b/include/linux/amlogic/media/amvecm/amvecm.h @@ -464,12 +464,7 @@ extern int amvecm_on_vs( struct vframe_s *toggle_vf, int flags, unsigned int sps_h_en, - unsigned int sps_v_en, - unsigned int sps_w_in, - unsigned int sps_h_in, - unsigned int cm_in_w, - unsigned int cm_in_h, - enum vd_path_e vd_path); + unsigned int sps_v_en); extern void refresh_on_vs(struct vframe_s *vf); extern void pc_mode_process(void); extern void pq_user_latch_process(void); diff --git a/include/linux/amlogic/media/vout/vinfo.h b/include/linux/amlogic/media/vout/vinfo.h index 7fff36da4ff2..78945b8bdb5e 100644 --- a/include/linux/amlogic/media/vout/vinfo.h +++ b/include/linux/amlogic/media/vout/vinfo.h @@ -219,8 +219,7 @@ struct vout_device_s { const struct dv_info *dv_info; void (*fresh_tx_hdr_pkt)(struct master_display_info_s *data); void (*fresh_tx_vsif_pkt)(enum eotf_type type, - enum mode_type tunnel_mode, struct dv_vsif_para *data, - bool signal_sdr); + enum mode_type tunnel_mode, struct dv_vsif_para *data); void (*fresh_tx_hdr10plus_pkt)(unsigned int flag, struct hdr10plus_para *data); void (*fresh_tx_emp_pkt)(unsigned char *data, unsigned int type,