Commit c01d5546 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: partially get rid of one abstraction layer 



The very same macros are defined as CSS_foo and IA_CSS_foo.

Remove this abstraction, as it just make things confusing,
for no good reason.

Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent bdfdd9e7

drivers/staging/media/atomisp/pci/atomisp_acc.c

+6 −6
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 


static const struct {

	unsigned int flag;

	enum atomisp_css_pipe_id pipe_id;

	enum ia_css_pipe_id pipe_id;

} acc_flag_to_pipe[] = {

	{ ATOMISP_ACC_FW_LOAD_FL_PREVIEW, CSS_PIPE_ID_PREVIEW },

	{ ATOMISP_ACC_FW_LOAD_FL_COPY, CSS_PIPE_ID_COPY },

	{ ATOMISP_ACC_FW_LOAD_FL_VIDEO, CSS_PIPE_ID_VIDEO },

	{ ATOMISP_ACC_FW_LOAD_FL_CAPTURE, CSS_PIPE_ID_CAPTURE },

	{ ATOMISP_ACC_FW_LOAD_FL_ACC, CSS_PIPE_ID_ACC }

	{ ATOMISP_ACC_FW_LOAD_FL_PREVIEW, IA_CSS_PIPE_ID_PREVIEW },

	{ ATOMISP_ACC_FW_LOAD_FL_COPY, IA_CSS_PIPE_ID_COPY },

	{ ATOMISP_ACC_FW_LOAD_FL_VIDEO, IA_CSS_PIPE_ID_VIDEO },

	{ ATOMISP_ACC_FW_LOAD_FL_CAPTURE, IA_CSS_PIPE_ID_CAPTURE },

	{ ATOMISP_ACC_FW_LOAD_FL_ACC, IA_CSS_PIPE_ID_ACC }

};



/*

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+234 −234

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/atomisp/pci/atomisp_cmd.h

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "ia_css.h"



struct atomisp_device;

struct atomisp_css_frame;

struct ia_css_frame;



#define MSI_ENABLE_BIT		16

#define INTR_DISABLE_BIT	10
@@ -88,7 +88,7 @@ const struct atomisp_format_bridge *get_atomisp_format_bridge_from_mbus( 
    u32 mbus_code);

bool atomisp_is_mbuscode_raw(uint32_t code);

int atomisp_get_frame_pgnr(struct atomisp_device *isp,

			   const struct atomisp_css_frame *frame, u32 *p_pgnr);

			   const struct ia_css_frame *frame, u32 *p_pgnr);

void atomisp_delayed_init_work(struct work_struct *work);



/*
@@ -301,8 +301,8 @@ int atomisp_set_array_res(struct atomisp_sub_device *asd, 
 * Function to calculate real zoom region for every pipe

 */

int atomisp_calculate_real_zoom_region(struct atomisp_sub_device *asd,

				       struct atomisp_css_dz_config   *dz_config,

				       enum atomisp_css_pipe_id css_pipe_id);

				       struct ia_css_dz_config   *dz_config,

				       enum ia_css_pipe_id css_pipe_id);



int atomisp_cp_general_isp_parameters(struct atomisp_sub_device *asd,

				      struct atomisp_parameters *arg,
@@ -372,8 +372,8 @@ int atomisp_freq_scaling(struct atomisp_device *vdev, 
			 bool force);



void atomisp_buf_done(struct atomisp_sub_device *asd, int error,

		      enum atomisp_css_buffer_type buf_type,

		      enum atomisp_css_pipe_id css_pipe_id,

		      enum ia_css_buffer_type buf_type,

		      enum ia_css_pipe_id css_pipe_id,

		      bool q_buffers, enum atomisp_input_stream_id stream_id);



void atomisp_css_flush(struct atomisp_device *isp);

drivers/staging/media/atomisp/pci/atomisp_common.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct atomisp_format_bridge { 
	unsigned int pixelformat;

	unsigned int depth;

	u32 mbus_code;

	enum atomisp_css_frame_format sh_fmt;

	enum ia_css_frame_format sh_fmt;

	unsigned char description[32];	/* the same as struct v4l2_fmtdesc */

	bool planar;

};

drivers/staging/media/atomisp/pci/atomisp_compat.h

+70 −164
Original line number Diff line number Diff line
@@ -23,100 +23,6 @@ 
#include "../../include/linux/atomisp.h"

#include <media/videobuf-vmalloc.h>



#define CSS_RX_IRQ_INFO_BUFFER_OVERRUN \

	CSS_ID(CSS_RX_IRQ_INFO_BUFFER_OVERRUN)

#define CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE \

	CSS_ID(CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE)

#define CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE \

	CSS_ID(CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE)

#define CSS_RX_IRQ_INFO_ECC_CORRECTED \

	CSS_ID(CSS_RX_IRQ_INFO_ECC_CORRECTED)

#define CSS_RX_IRQ_INFO_ERR_SOT \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_SOT)

#define CSS_RX_IRQ_INFO_ERR_SOT_SYNC \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_SOT_SYNC)

#define CSS_RX_IRQ_INFO_ERR_CONTROL \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_CONTROL)

#define CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE)

#define CSS_RX_IRQ_INFO_ERR_CRC \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_CRC)

#define CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID)

#define CSS_RX_IRQ_INFO_ERR_FRAME_SYNC \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_FRAME_SYNC)

#define CSS_RX_IRQ_INFO_ERR_FRAME_DATA \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_FRAME_DATA)

#define CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT)

#define CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC)

#define CSS_RX_IRQ_INFO_ERR_LINE_SYNC \

	CSS_ID(CSS_RX_IRQ_INFO_ERR_LINE_SYNC)

#define CSS_RX_IRQ_INFO_INIT_TIMEOUT \

	CSS_ID(CSS_RX_IRQ_INFO_INIT_TIMEOUT)



#define CSS_IRQ_INFO_CSS_RECEIVER_SOF	CSS_ID(CSS_IRQ_INFO_CSS_RECEIVER_SOF)

#define CSS_IRQ_INFO_CSS_RECEIVER_EOF	CSS_ID(CSS_IRQ_INFO_CSS_RECEIVER_EOF)

#define CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW \

	CSS_ID(CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW)

#define CSS_EVENT_OUTPUT_FRAME_DONE	CSS_EVENT(OUTPUT_FRAME_DONE)

#define CSS_EVENT_SEC_OUTPUT_FRAME_DONE	CSS_EVENT(SECOND_OUTPUT_FRAME_DONE)

#define CSS_EVENT_VF_OUTPUT_FRAME_DONE	CSS_EVENT(VF_OUTPUT_FRAME_DONE)

#define CSS_EVENT_SEC_VF_OUTPUT_FRAME_DONE	CSS_EVENT(SECOND_VF_OUTPUT_FRAME_DONE)

#define CSS_EVENT_3A_STATISTICS_DONE	CSS_EVENT(3A_STATISTICS_DONE)

#define CSS_EVENT_DIS_STATISTICS_DONE	CSS_EVENT(DIS_STATISTICS_DONE)

#define CSS_EVENT_PIPELINE_DONE		CSS_EVENT(PIPELINE_DONE)

#define CSS_EVENT_METADATA_DONE		CSS_EVENT(METADATA_DONE)

#define CSS_EVENT_ACC_STAGE_COMPLETE	CSS_EVENT(ACC_STAGE_COMPLETE)

#define CSS_EVENT_TIMER			CSS_EVENT(TIMER)



#define CSS_BUFFER_TYPE_METADATA	CSS_ID(CSS_BUFFER_TYPE_METADATA)

#define CSS_BUFFER_TYPE_3A_STATISTICS	CSS_ID(CSS_BUFFER_TYPE_3A_STATISTICS)

#define CSS_BUFFER_TYPE_DIS_STATISTICS	CSS_ID(CSS_BUFFER_TYPE_DIS_STATISTICS)

#define CSS_BUFFER_TYPE_INPUT_FRAME	CSS_ID(CSS_BUFFER_TYPE_INPUT_FRAME)

#define CSS_BUFFER_TYPE_OUTPUT_FRAME	CSS_ID(CSS_BUFFER_TYPE_OUTPUT_FRAME)

#define CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME	CSS_ID(CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME)

#define CSS_BUFFER_TYPE_VF_OUTPUT_FRAME	CSS_ID(CSS_BUFFER_TYPE_VF_OUTPUT_FRAME)

#define CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME	CSS_ID(CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME)

#define CSS_BUFFER_TYPE_RAW_OUTPUT_FRAME \

	CSS_ID(CSS_BUFFER_TYPE_RAW_OUTPUT_FRAME)



#define CSS_FORMAT_RAW_8	CSS_FORMAT(RAW_8)

#define CSS_FORMAT_RAW_10	CSS_FORMAT(RAW_10)

#define CSS_FORMAT_RAW_12	CSS_FORMAT(RAW_12)

#define CSS_FORMAT_RAW_16	CSS_FORMAT(RAW_16)



#define CSS_CAPTURE_MODE_RAW		CSS_ID(CSS_CAPTURE_MODE_RAW)

#define CSS_CAPTURE_MODE_BAYER		CSS_ID(CSS_CAPTURE_MODE_BAYER)

#define CSS_CAPTURE_MODE_PRIMARY	CSS_ID(CSS_CAPTURE_MODE_PRIMARY)

#define CSS_CAPTURE_MODE_ADVANCED	CSS_ID(CSS_CAPTURE_MODE_ADVANCED)

#define CSS_CAPTURE_MODE_LOW_LIGHT	CSS_ID(CSS_CAPTURE_MODE_LOW_LIGHT)



#define CSS_MORPH_TABLE_NUM_PLANES	CSS_ID(CSS_MORPH_TABLE_NUM_PLANES)



#define CSS_FRAME_FORMAT_NV11		CSS_ID(CSS_FRAME_FORMAT_NV11)

#define CSS_FRAME_FORMAT_NV12		CSS_ID(CSS_FRAME_FORMAT_NV12)

#define CSS_FRAME_FORMAT_NV16		CSS_ID(CSS_FRAME_FORMAT_NV16)

#define CSS_FRAME_FORMAT_NV21		CSS_ID(CSS_FRAME_FORMAT_NV21)

#define CSS_FRAME_FORMAT_NV61		CSS_ID(CSS_FRAME_FORMAT_NV61)

#define CSS_FRAME_FORMAT_YV12		CSS_ID(CSS_FRAME_FORMAT_YV12)

#define CSS_FRAME_FORMAT_YV16		CSS_ID(CSS_FRAME_FORMAT_YV16)

#define CSS_FRAME_FORMAT_YUV420		CSS_ID(CSS_FRAME_FORMAT_YUV420)

#define CSS_FRAME_FORMAT_YUV420_16	CSS_ID(CSS_FRAME_FORMAT_YUV420_16)

#define CSS_FRAME_FORMAT_YUV422		CSS_ID(CSS_FRAME_FORMAT_YUV422)

#define CSS_FRAME_FORMAT_YUV422_16	CSS_ID(CSS_FRAME_FORMAT_YUV422_16)

#define CSS_FRAME_FORMAT_UYVY		CSS_ID(CSS_FRAME_FORMAT_UYVY)

#define CSS_FRAME_FORMAT_YUYV		CSS_ID(CSS_FRAME_FORMAT_YUYV)

#define CSS_FRAME_FORMAT_YUV444		CSS_ID(CSS_FRAME_FORMAT_YUV444)

#define CSS_FRAME_FORMAT_YUV_LINE	CSS_ID(CSS_FRAME_FORMAT_YUV_LINE)

#define CSS_FRAME_FORMAT_RAW		CSS_ID(CSS_FRAME_FORMAT_RAW)

#define CSS_FRAME_FORMAT_RGB565		CSS_ID(CSS_FRAME_FORMAT_RGB565)

#define CSS_FRAME_FORMAT_PLANAR_RGB888	CSS_ID(CSS_FRAME_FORMAT_PLANAR_RGB888)

#define CSS_FRAME_FORMAT_RGBA888	CSS_ID(CSS_FRAME_FORMAT_RGBA888)

#define CSS_FRAME_FORMAT_QPLANE6	CSS_ID(CSS_FRAME_FORMAT_QPLANE6)

#define CSS_FRAME_FORMAT_BINARY_8	CSS_ID(CSS_FRAME_FORMAT_BINARY_8)



struct atomisp_device;

struct atomisp_sub_device;

struct video_device;
@@ -155,35 +61,35 @@ void atomisp_css_rx_clear_irq_info(enum mipi_port_id port, 
				   unsigned int infos);



int atomisp_css_irq_enable(struct atomisp_device *isp,

			   enum atomisp_css_irq_info info, bool enable);

			   enum ia_css_irq_info info, bool enable);



int atomisp_q_video_buffer_to_css(struct atomisp_sub_device *asd,

				  struct videobuf_vmalloc_memory *vm_mem,

				  enum atomisp_input_stream_id stream_id,

				  enum atomisp_css_buffer_type css_buf_type,

				  enum atomisp_css_pipe_id css_pipe_id);

				  enum ia_css_buffer_type css_buf_type,

				  enum ia_css_pipe_id css_pipe_id);



int atomisp_q_s3a_buffer_to_css(struct atomisp_sub_device *asd,

				struct atomisp_s3a_buf *s3a_buf,

				enum atomisp_input_stream_id stream_id,

				enum atomisp_css_pipe_id css_pipe_id);

				enum ia_css_pipe_id css_pipe_id);



int atomisp_q_metadata_buffer_to_css(struct atomisp_sub_device *asd,

				     struct atomisp_metadata_buf *metadata_buf,

				     enum atomisp_input_stream_id stream_id,

				     enum atomisp_css_pipe_id css_pipe_id);

				     enum ia_css_pipe_id css_pipe_id);



int atomisp_q_dis_buffer_to_css(struct atomisp_sub_device *asd,

				struct atomisp_dis_buf *dis_buf,

				enum atomisp_input_stream_id stream_id,

				enum atomisp_css_pipe_id css_pipe_id);

				enum ia_css_pipe_id css_pipe_id);



void atomisp_css_mmu_invalidate_cache(void);



void atomisp_css_mmu_invalidate_tlb(void);



int atomisp_css_start(struct atomisp_sub_device *asd,

		      enum atomisp_css_pipe_id pipe_id, bool in_reset);

		      enum ia_css_pipe_id pipe_id, bool in_reset);



void atomisp_css_update_isp_params(struct atomisp_sub_device *asd);

void atomisp_css_update_isp_params_on_pipe(struct atomisp_sub_device *asd,
@@ -191,14 +97,14 @@ void atomisp_css_update_isp_params_on_pipe(struct atomisp_sub_device *asd, 


int atomisp_css_queue_buffer(struct atomisp_sub_device *asd,

			     enum atomisp_input_stream_id stream_id,

			     enum atomisp_css_pipe_id pipe_id,

			     enum atomisp_css_buffer_type buf_type,

			     enum ia_css_pipe_id pipe_id,

			     enum ia_css_buffer_type buf_type,

			     struct atomisp_css_buffer *isp_css_buffer);



int atomisp_css_dequeue_buffer(struct atomisp_sub_device *asd,

			       enum atomisp_input_stream_id stream_id,

			       enum atomisp_css_pipe_id pipe_id,

			       enum atomisp_css_buffer_type buf_type,

			       enum ia_css_pipe_id pipe_id,

			       enum ia_css_buffer_type buf_type,

			       struct atomisp_css_buffer *isp_css_buffer);



int atomisp_css_allocate_stat_buffers(struct atomisp_sub_device *asd,
@@ -217,7 +123,7 @@ void atomisp_css_free_metadata_buffer(struct atomisp_metadata_buf 
				      *metadata_buf);



int atomisp_css_get_grid_info(struct atomisp_sub_device *asd,

			      enum atomisp_css_pipe_id pipe_id,

			      enum ia_css_pipe_id pipe_id,

			      int source_pad);



int atomisp_alloc_3a_output_buf(struct atomisp_sub_device *asd);
@@ -287,7 +193,7 @@ void atomisp_css_input_set_binning_factor(struct atomisp_sub_device *asd, 


void atomisp_css_input_set_bayer_order(struct atomisp_sub_device *asd,

				       enum atomisp_input_stream_id stream_id,

				       enum atomisp_css_bayer_order bayer_order);

				       enum ia_css_bayer_order bayer_order);



void atomisp_css_input_set_format(struct atomisp_sub_device *asd,

				  enum atomisp_input_stream_id stream_id,
@@ -312,10 +218,10 @@ void atomisp_css_enable_raw_binning(struct atomisp_sub_device *asd, 
void atomisp_css_enable_dz(struct atomisp_sub_device *asd, bool enable);



void atomisp_css_capture_set_mode(struct atomisp_sub_device *asd,

				  enum atomisp_css_capture_mode mode);

				  enum ia_css_capture_mode mode);



void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,

				enum atomisp_css_input_mode mode);

				enum ia_css_input_mode mode);



void atomisp_css_capture_enable_online(struct atomisp_sub_device *asd,

				       unsigned short stream_index, bool enable);
@@ -341,24 +247,24 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd, 
				     unsigned int metadata_width,

				     unsigned int metadata_height);



int atomisp_css_frame_allocate(struct atomisp_css_frame **frame,

int atomisp_css_frame_allocate(struct ia_css_frame **frame,

			       unsigned int width, unsigned int height,

			       enum atomisp_css_frame_format format,

			       enum ia_css_frame_format format,

			       unsigned int padded_width,

			       unsigned int raw_bit_depth);



int atomisp_css_frame_allocate_from_info(struct atomisp_css_frame **frame,

	const struct atomisp_css_frame_info *info);

int atomisp_css_frame_allocate_from_info(struct ia_css_frame **frame,

	const struct ia_css_frame_info *info);



void atomisp_css_frame_free(struct atomisp_css_frame *frame);

void atomisp_css_frame_free(struct ia_css_frame *frame);



int atomisp_css_frame_map(struct atomisp_css_frame **frame,

			  const struct atomisp_css_frame_info *info,

int atomisp_css_frame_map(struct ia_css_frame **frame,

			  const struct ia_css_frame_info *info,

			  const void __user *data, uint16_t attribute,

			  void *context);



int atomisp_css_set_black_frame(struct atomisp_sub_device *asd,

				const struct atomisp_css_frame *raw_black_frame);

				const struct ia_css_frame *raw_black_frame);



int atomisp_css_allocate_continuous_frames(bool init_time,

	struct atomisp_sub_device *asd);
@@ -369,7 +275,7 @@ void atomisp_create_pipes_stream(struct atomisp_sub_device *asd); 
void atomisp_destroy_pipes_stream_force(struct atomisp_sub_device *asd);



int atomisp_css_stop(struct atomisp_sub_device *asd,

		     enum atomisp_css_pipe_id pipe_id, bool in_reset);

		     enum ia_css_pipe_id pipe_id, bool in_reset);



int atomisp_css_continuous_set_num_raw_frames(

    struct atomisp_sub_device *asd,
@@ -382,89 +288,89 @@ int atomisp_css_copy_configure_output(struct atomisp_sub_device *asd, 
				      unsigned int stream_index,

				      unsigned int width, unsigned int height,

				      unsigned int padded_width,

				      enum atomisp_css_frame_format format);

				      enum ia_css_frame_format format);



int atomisp_css_yuvpp_configure_output(struct atomisp_sub_device *asd,

				       unsigned int stream_index,

				       unsigned int width, unsigned int height,

				       unsigned int padded_width,

				       enum atomisp_css_frame_format format);

				       enum ia_css_frame_format format);



int atomisp_css_yuvpp_configure_viewfinder(

    struct atomisp_sub_device *asd,

    unsigned int stream_index,

    unsigned int width, unsigned int height,

    unsigned int min_width,

    enum atomisp_css_frame_format format);

    enum ia_css_frame_format format);



int atomisp_css_yuvpp_get_output_frame_info(

    struct atomisp_sub_device *asd,

    unsigned int stream_index,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_yuvpp_get_viewfinder_frame_info(

    struct atomisp_sub_device *asd,

    unsigned int stream_index,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_preview_configure_output(struct atomisp_sub_device *asd,

	unsigned int width, unsigned int height,

	unsigned int min_width,

	enum atomisp_css_frame_format format);

	enum ia_css_frame_format format);



int atomisp_css_capture_configure_output(struct atomisp_sub_device *asd,

	unsigned int width, unsigned int height,

	unsigned int min_width,

	enum atomisp_css_frame_format format);

	enum ia_css_frame_format format);



int atomisp_css_video_configure_output(struct atomisp_sub_device *asd,

				       unsigned int width, unsigned int height,

				       unsigned int min_width,

				       enum atomisp_css_frame_format format);

				       enum ia_css_frame_format format);



int atomisp_get_css_frame_info(struct atomisp_sub_device *asd,

			       u16 source_pad,

			       struct atomisp_css_frame_info *frame_info);

			       struct ia_css_frame_info *frame_info);



int atomisp_css_video_configure_viewfinder(struct atomisp_sub_device *asd,

	unsigned int width, unsigned int height,

	unsigned int min_width,

	enum atomisp_css_frame_format format);

	enum ia_css_frame_format format);



int atomisp_css_capture_configure_viewfinder(

    struct atomisp_sub_device *asd,

    unsigned int width, unsigned int height,

    unsigned int min_width,

    enum atomisp_css_frame_format format);

    enum ia_css_frame_format format);



int atomisp_css_video_get_viewfinder_frame_info(

    struct atomisp_sub_device *asd,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_capture_get_viewfinder_frame_info(

    struct atomisp_sub_device *asd,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_copy_get_output_frame_info(

    struct atomisp_sub_device *asd,

    unsigned int stream_index,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_capture_get_output_raw_frame_info(

    struct atomisp_sub_device *asd,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_preview_get_output_frame_info(

    struct atomisp_sub_device *asd,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_capture_get_output_frame_info(

    struct atomisp_sub_device *asd,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_video_get_output_frame_info(

    struct atomisp_sub_device *asd,

    struct atomisp_css_frame_info *info);

    struct ia_css_frame_info *info);



int atomisp_css_preview_configure_pp_input(

    struct atomisp_sub_device *asd,
@@ -495,51 +401,51 @@ bool atomisp_css_isp_has_started(void); 
void atomisp_css_request_flash(struct atomisp_sub_device *asd);



void atomisp_css_set_wb_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_wb_config *wb_config);

			       struct ia_css_wb_config *wb_config);



void atomisp_css_set_ob_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_ob_config *ob_config);

			       struct ia_css_ob_config *ob_config);



void atomisp_css_set_dp_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_dp_config *dp_config);

			       struct ia_css_dp_config *dp_config);



void atomisp_css_set_de_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_de_config *de_config);

			       struct ia_css_de_config *de_config);



void atomisp_css_set_dz_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_dz_config *dz_config);

			       struct ia_css_dz_config *dz_config);



void atomisp_css_set_default_de_config(struct atomisp_sub_device *asd);



void atomisp_css_set_ce_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_ce_config *ce_config);

			       struct ia_css_ce_config *ce_config);



void atomisp_css_set_nr_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_nr_config *nr_config);

			       struct ia_css_nr_config *nr_config);



void atomisp_css_set_ee_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_ee_config *ee_config);

			       struct ia_css_ee_config *ee_config);



void atomisp_css_set_tnr_config(struct atomisp_sub_device *asd,

				struct atomisp_css_tnr_config *tnr_config);

				struct ia_css_tnr_config *tnr_config);



void atomisp_css_set_cc_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_cc_config *cc_config);

			       struct ia_css_cc_config *cc_config);



void atomisp_css_set_macc_table(struct atomisp_sub_device *asd,

				struct atomisp_css_macc_table *macc_table);

				struct ia_css_macc_table *macc_table);



void atomisp_css_set_gamma_table(struct atomisp_sub_device *asd,

				 struct atomisp_css_gamma_table *gamma_table);

				 struct ia_css_gamma_table *gamma_table);



void atomisp_css_set_ctc_table(struct atomisp_sub_device *asd,

			       struct atomisp_css_ctc_table *ctc_table);

			       struct ia_css_ctc_table *ctc_table);



void atomisp_css_set_gc_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_gc_config *gc_config);

			       struct ia_css_gc_config *gc_config);



void atomisp_css_set_3a_config(struct atomisp_sub_device *asd,

			       struct atomisp_css_3a_config *s3a_config);

			       struct ia_css_3a_config *s3a_config);



void atomisp_css_video_set_dis_vector(struct atomisp_sub_device *asd,

				      struct atomisp_dis_vector *vector);
@@ -590,29 +496,29 @@ int atomisp_css_get_formats_config(struct atomisp_sub_device *asd, 
				   struct atomisp_formats_config *formats_config);



void atomisp_css_set_formats_config(struct atomisp_sub_device *asd,

				    struct atomisp_css_formats_config *formats_config);

				    struct ia_css_formats_config *formats_config);



int atomisp_css_get_zoom_factor(struct atomisp_sub_device *asd,

				unsigned int *zoom);



struct atomisp_css_shading_table *atomisp_css_shading_table_alloc(

struct ia_css_shading_table *atomisp_css_shading_table_alloc(

    unsigned int width, unsigned int height);



void atomisp_css_set_shading_table(struct atomisp_sub_device *asd,

				   struct atomisp_css_shading_table *table);

				   struct ia_css_shading_table *table);



void atomisp_css_shading_table_free(struct atomisp_css_shading_table *table);

void atomisp_css_shading_table_free(struct ia_css_shading_table *table);



struct atomisp_css_morph_table *atomisp_css_morph_table_allocate(

struct ia_css_morph_table *atomisp_css_morph_table_allocate(

    unsigned int width, unsigned int height);



void atomisp_css_set_morph_table(struct atomisp_sub_device *asd,

				 struct atomisp_css_morph_table *table);

				 struct ia_css_morph_table *table);



void atomisp_css_get_morph_table(struct atomisp_sub_device *asd,

				 struct atomisp_css_morph_table *table);

				 struct ia_css_morph_table *table);



void atomisp_css_morph_table_free(struct atomisp_css_morph_table *table);

void atomisp_css_morph_table_free(struct ia_css_morph_table *table);



void atomisp_css_set_cont_prev_start_time(struct atomisp_device *isp,

	unsigned int overlap);
@@ -631,20 +537,20 @@ int atomisp_css_stop_acc_pipe(struct atomisp_sub_device *asd); 
void atomisp_css_destroy_acc_pipe(struct atomisp_sub_device *asd);



int atomisp_css_load_acc_extension(struct atomisp_sub_device *asd,

				   struct atomisp_css_fw_info *fw,

				   enum atomisp_css_pipe_id pipe_id,

				   struct ia_css_fw_info *fw,

				   enum ia_css_pipe_id pipe_id,

				   unsigned int type);



void atomisp_css_unload_acc_extension(struct atomisp_sub_device *asd,

				      struct atomisp_css_fw_info *fw,

				      enum atomisp_css_pipe_id pipe_id);

				      struct ia_css_fw_info *fw,

				      enum ia_css_pipe_id pipe_id);



int atomisp_css_wait_acc_finish(struct atomisp_sub_device *asd);



void atomisp_css_acc_done(struct atomisp_sub_device *asd);



int atomisp_css_load_acc_binary(struct atomisp_sub_device *asd,

				struct atomisp_css_fw_info *fw,

				struct ia_css_fw_info *fw,

				unsigned int index);



void atomisp_css_unload_acc_binary(struct atomisp_sub_device *asd);