Skip to content

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

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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 633 additions and 818 deletions
drivers/staging/media/atomisp/pci/atomisp_acc.c
View file @ c01d5546
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
static const struct { static const struct {
unsigned int flag; unsigned int flag;
enum atomisp_css_pipe_id pipe_id; enum ia_css_pipe_id pipe_id;
} acc_flag_to_pipe[] = { } acc_flag_to_pipe[] = {
{ ATOMISP_ACC_FW_LOAD_FL_PREVIEW, CSS_PIPE_ID_PREVIEW }, { ATOMISP_ACC_FW_LOAD_FL_PREVIEW, IA_CSS_PIPE_ID_PREVIEW },
{ ATOMISP_ACC_FW_LOAD_FL_COPY, CSS_PIPE_ID_COPY }, { ATOMISP_ACC_FW_LOAD_FL_COPY, IA_CSS_PIPE_ID_COPY },
{ ATOMISP_ACC_FW_LOAD_FL_VIDEO, CSS_PIPE_ID_VIDEO }, { ATOMISP_ACC_FW_LOAD_FL_VIDEO, IA_CSS_PIPE_ID_VIDEO },
{ ATOMISP_ACC_FW_LOAD_FL_CAPTURE, CSS_PIPE_ID_CAPTURE }, { ATOMISP_ACC_FW_LOAD_FL_CAPTURE, IA_CSS_PIPE_ID_CAPTURE },
{ ATOMISP_ACC_FW_LOAD_FL_ACC, CSS_PIPE_ID_ACC } { ATOMISP_ACC_FW_LOAD_FL_ACC, IA_CSS_PIPE_ID_ACC }
}; };
/* /*
......
drivers/staging/media/atomisp/pci/atomisp_cmd.h
View file @ c01d5546
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ia_css.h" #include "ia_css.h"
struct atomisp_device; struct atomisp_device;
struct atomisp_css_frame; struct ia_css_frame;
#define MSI_ENABLE_BIT 16 #define MSI_ENABLE_BIT 16
#define INTR_DISABLE_BIT 10 #define INTR_DISABLE_BIT 10
...@@ -88,7 +88,7 @@ const struct atomisp_format_bridge *get_atomisp_format_bridge_from_mbus( ...@@ -88,7 +88,7 @@ const struct atomisp_format_bridge *get_atomisp_format_bridge_from_mbus(
u32 mbus_code); u32 mbus_code);
bool atomisp_is_mbuscode_raw(uint32_t code); bool atomisp_is_mbuscode_raw(uint32_t code);
int atomisp_get_frame_pgnr(struct atomisp_device *isp, 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); void atomisp_delayed_init_work(struct work_struct *work);
/* /*
...@@ -301,8 +301,8 @@ int atomisp_set_array_res(struct atomisp_sub_device *asd, ...@@ -301,8 +301,8 @@ int atomisp_set_array_res(struct atomisp_sub_device *asd,
* Function to calculate real zoom region for every pipe * Function to calculate real zoom region for every pipe
*/ */
int atomisp_calculate_real_zoom_region(struct atomisp_sub_device *asd, int atomisp_calculate_real_zoom_region(struct atomisp_sub_device *asd,
struct atomisp_css_dz_config *dz_config, struct ia_css_dz_config *dz_config,
enum atomisp_css_pipe_id css_pipe_id); enum ia_css_pipe_id css_pipe_id);
int atomisp_cp_general_isp_parameters(struct atomisp_sub_device *asd, int atomisp_cp_general_isp_parameters(struct atomisp_sub_device *asd,
struct atomisp_parameters *arg, struct atomisp_parameters *arg,
...@@ -372,8 +372,8 @@ int atomisp_freq_scaling(struct atomisp_device *vdev, ...@@ -372,8 +372,8 @@ int atomisp_freq_scaling(struct atomisp_device *vdev,
bool force); bool force);
void atomisp_buf_done(struct atomisp_sub_device *asd, int error, void atomisp_buf_done(struct atomisp_sub_device *asd, int error,
enum atomisp_css_buffer_type buf_type, enum ia_css_buffer_type buf_type,
enum atomisp_css_pipe_id css_pipe_id, enum ia_css_pipe_id css_pipe_id,
bool q_buffers, enum atomisp_input_stream_id stream_id); bool q_buffers, enum atomisp_input_stream_id stream_id);
void atomisp_css_flush(struct atomisp_device *isp); void atomisp_css_flush(struct atomisp_device *isp);
......
drivers/staging/media/atomisp/pci/atomisp_common.h
View file @ c01d5546
...@@ -51,7 +51,7 @@ struct atomisp_format_bridge { ...@@ -51,7 +51,7 @@ struct atomisp_format_bridge {
unsigned int pixelformat; unsigned int pixelformat;
unsigned int depth; unsigned int depth;
u32 mbus_code; 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 */ unsigned char description[32]; /* the same as struct v4l2_fmtdesc */
bool planar; bool planar;
}; };
......
drivers/staging/media/atomisp/pci/atomisp_compat_css20.h
View file @ c01d5546
...@@ -30,97 +30,6 @@ ...@@ -30,97 +30,6 @@
#define ATOMISP_CSS2_NUM_OFFLINE_INIT_CONTINUOUS_FRAMES_LOCK_EN 4 #define ATOMISP_CSS2_NUM_OFFLINE_INIT_CONTINUOUS_FRAMES_LOCK_EN 4
#define ATOMISP_CSS2_NUM_DVS_FRAME_DELAY 2 #define ATOMISP_CSS2_NUM_DVS_FRAME_DELAY 2
#define atomisp_css_pipe_id ia_css_pipe_id
#define atomisp_css_pipeline ia_css_pipe
#define atomisp_css_buffer_type ia_css_buffer_type
#define atomisp_css_dis_data ia_css_isp_dvs_statistics
#define atomisp_css_irq_info ia_css_irq_info
#define atomisp_css_isp_config ia_css_isp_config
#define atomisp_css_bayer_order ia_css_bayer_order
#define atomisp_css_capture_mode ia_css_capture_mode
#define atomisp_css_input_mode ia_css_input_mode
#define atomisp_css_frame ia_css_frame
#define atomisp_css_frame_format ia_css_frame_format
#define atomisp_css_frame_info ia_css_frame_info
#define atomisp_css_dp_config ia_css_dp_config
#define atomisp_css_wb_config ia_css_wb_config
#define atomisp_css_cc_config ia_css_cc_config
#define atomisp_css_nr_config ia_css_nr_config
#define atomisp_css_ee_config ia_css_ee_config
#define atomisp_css_ob_config ia_css_ob_config
#define atomisp_css_de_config ia_css_de_config
#define atomisp_css_dz_config ia_css_dz_config
#define atomisp_css_ce_config ia_css_ce_config
#define atomisp_css_gc_config ia_css_gc_config
#define atomisp_css_tnr_config ia_css_tnr_config
#define atomisp_css_cnr_config ia_css_cnr_config
#define atomisp_css_ctc_config ia_css_ctc_config
#define atomisp_css_3a_config ia_css_3a_config
#define atomisp_css_ecd_config ia_css_ecd_config
#define atomisp_css_ynr_config ia_css_ynr_config
#define atomisp_css_fc_config ia_css_fc_config
#define atomisp_css_aa_config ia_css_aa_config
#define atomisp_css_baa_config ia_css_aa_config
#define atomisp_css_anr_config ia_css_anr_config
#define atomisp_css_xnr_config ia_css_xnr_config
#define atomisp_css_macc_config ia_css_macc_config
#define atomisp_css_gamma_table ia_css_gamma_table
#define atomisp_css_ctc_table ia_css_ctc_table
#define atomisp_css_macc_table ia_css_macc_table
#define atomisp_css_xnr_table ia_css_xnr_table
#define atomisp_css_rgb_gamma_table ia_css_rgb_gamma_table
#define atomisp_css_anr_thres ia_css_anr_thres
#define atomisp_css_dvs_6axis ia_css_dvs_6axis_config
#define atomisp_css_grid_info ia_css_grid_info
#define atomisp_css_3a_grid_info ia_css_3a_grid_info
#define atomisp_css_dvs_grid_info ia_css_dvs_grid_info
#define atomisp_css_shading_table ia_css_shading_table
#define atomisp_css_morph_table ia_css_morph_table
#define atomisp_css_dvs_6axis_config ia_css_dvs_6axis_config
#define atomisp_css_fw_info ia_css_fw_info
#define atomisp_css_formats_config ia_css_formats_config
#define CSS_PIPE_ID_PREVIEW IA_CSS_PIPE_ID_PREVIEW
#define CSS_PIPE_ID_COPY IA_CSS_PIPE_ID_COPY
#define CSS_PIPE_ID_VIDEO IA_CSS_PIPE_ID_VIDEO
#define CSS_PIPE_ID_CAPTURE IA_CSS_PIPE_ID_CAPTURE
#define CSS_PIPE_ID_ACC IA_CSS_PIPE_ID_ACC
#define CSS_PIPE_ID_YUVPP IA_CSS_PIPE_ID_YUVPP
#define CSS_PIPE_ID_NUM IA_CSS_PIPE_ID_NUM
#define CSS_INPUT_MODE_SENSOR IA_CSS_INPUT_MODE_BUFFERED_SENSOR
#define CSS_INPUT_MODE_FIFO IA_CSS_INPUT_MODE_FIFO
#define CSS_INPUT_MODE_TPG IA_CSS_INPUT_MODE_TPG
#define CSS_INPUT_MODE_PRBS IA_CSS_INPUT_MODE_PRBS
#define CSS_INPUT_MODE_MEMORY IA_CSS_INPUT_MODE_MEMORY
#define CSS_IRQ_INFO_CSS_RECEIVER_ERROR IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR
#define CSS_IRQ_INFO_EVENTS_READY IA_CSS_IRQ_INFO_EVENTS_READY
#define CSS_IRQ_INFO_INPUT_SYSTEM_ERROR \
IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR
#define CSS_IRQ_INFO_IF_ERROR IA_CSS_IRQ_INFO_IF_ERROR
#define CSS_BUFFER_TYPE_NUM IA_CSS_BUFFER_TYPE_NUM
#define CSS_FRAME_FLASH_STATE_NONE IA_CSS_FRAME_FLASH_STATE_NONE
#define CSS_FRAME_FLASH_STATE_PARTIAL IA_CSS_FRAME_FLASH_STATE_PARTIAL
#define CSS_FRAME_FLASH_STATE_FULL IA_CSS_FRAME_FLASH_STATE_FULL
#define CSS_BAYER_ORDER_GRBG IA_CSS_BAYER_ORDER_GRBG
#define CSS_BAYER_ORDER_RGGB IA_CSS_BAYER_ORDER_RGGB
#define CSS_BAYER_ORDER_BGGR IA_CSS_BAYER_ORDER_BGGR
#define CSS_BAYER_ORDER_GBRG IA_CSS_BAYER_ORDER_GBRG
/*
* Hide IA_ naming difference in otherwise common CSS macros.
*/
#define CSS_ID(val) (IA_ ## val)
#define CSS_EVENT(val) (IA_CSS_EVENT_TYPE_ ## val)
#define CSS_FORMAT(val) (ATOMISP_INPUT_FORMAT_ ## val)
#define CSS_EVENT_PORT_EOF CSS_EVENT(PORT_EOF)
#define CSS_EVENT_FRAME_TAGGED CSS_EVENT(FRAME_TAGGED)
#define CSS_MIPI_FRAME_BUFFER_SIZE_1 0x60000 #define CSS_MIPI_FRAME_BUFFER_SIZE_1 0x60000
#define CSS_MIPI_FRAME_BUFFER_SIZE_2 0x80000 #define CSS_MIPI_FRAME_BUFFER_SIZE_2 0x80000
...@@ -181,7 +90,7 @@ struct atomisp_s3a_buf { ...@@ -181,7 +90,7 @@ struct atomisp_s3a_buf {
}; };
struct atomisp_dis_buf { struct atomisp_dis_buf {
struct atomisp_css_dis_data *dis_data; struct ia_css_isp_dvs_statistics *dis_data;
struct ia_css_isp_dvs_statistics_map *dvs_map; struct ia_css_isp_dvs_statistics_map *dvs_map;
struct list_head list; struct list_head list;
}; };
...@@ -191,60 +100,60 @@ struct atomisp_css_buffer { ...@@ -191,60 +100,60 @@ struct atomisp_css_buffer {
}; };
struct atomisp_css_event { struct atomisp_css_event {
enum atomisp_css_pipe_id pipe; enum ia_css_pipe_id pipe;
struct ia_css_event event; struct ia_css_event event;
}; };
void atomisp_css_set_macc_config(struct atomisp_sub_device *asd, void atomisp_css_set_macc_config(struct atomisp_sub_device *asd,
struct atomisp_css_macc_config *macc_config); struct ia_css_macc_config *macc_config);
void atomisp_css_set_ecd_config(struct atomisp_sub_device *asd, void atomisp_css_set_ecd_config(struct atomisp_sub_device *asd,
struct atomisp_css_ecd_config *ecd_config); struct ia_css_ecd_config *ecd_config);
void atomisp_css_set_ynr_config(struct atomisp_sub_device *asd, void atomisp_css_set_ynr_config(struct atomisp_sub_device *asd,
struct atomisp_css_ynr_config *ynr_config); struct ia_css_ynr_config *ynr_config);
void atomisp_css_set_fc_config(struct atomisp_sub_device *asd, void atomisp_css_set_fc_config(struct atomisp_sub_device *asd,
struct atomisp_css_fc_config *fc_config); struct ia_css_fc_config *fc_config);
void atomisp_css_set_aa_config(struct atomisp_sub_device *asd, void atomisp_css_set_aa_config(struct atomisp_sub_device *asd,
struct atomisp_css_aa_config *aa_config); struct ia_css_aa_config *aa_config);
void atomisp_css_set_baa_config(struct atomisp_sub_device *asd, void atomisp_css_set_baa_config(struct atomisp_sub_device *asd,
struct atomisp_css_baa_config *baa_config); struct ia_css_aa_config *baa_config);
void atomisp_css_set_anr_config(struct atomisp_sub_device *asd, void atomisp_css_set_anr_config(struct atomisp_sub_device *asd,
struct atomisp_css_anr_config *anr_config); struct ia_css_anr_config *anr_config);
void atomisp_css_set_xnr_config(struct atomisp_sub_device *asd, void atomisp_css_set_xnr_config(struct atomisp_sub_device *asd,
struct atomisp_css_xnr_config *xnr_config); struct ia_css_xnr_config *xnr_config);
void atomisp_css_set_cnr_config(struct atomisp_sub_device *asd, void atomisp_css_set_cnr_config(struct atomisp_sub_device *asd,
struct atomisp_css_cnr_config *cnr_config); struct ia_css_cnr_config *cnr_config);
void atomisp_css_set_ctc_config(struct atomisp_sub_device *asd, void atomisp_css_set_ctc_config(struct atomisp_sub_device *asd,
struct atomisp_css_ctc_config *ctc_config); struct ia_css_ctc_config *ctc_config);
void atomisp_css_set_yuv2rgb_cc_config(struct atomisp_sub_device *asd, void atomisp_css_set_yuv2rgb_cc_config(struct atomisp_sub_device *asd,
struct atomisp_css_cc_config *yuv2rgb_cc_config); struct ia_css_cc_config *yuv2rgb_cc_config);
void atomisp_css_set_rgb2yuv_cc_config(struct atomisp_sub_device *asd, void atomisp_css_set_rgb2yuv_cc_config(struct atomisp_sub_device *asd,
struct atomisp_css_cc_config *rgb2yuv_cc_config); struct ia_css_cc_config *rgb2yuv_cc_config);
void atomisp_css_set_xnr_table(struct atomisp_sub_device *asd, void atomisp_css_set_xnr_table(struct atomisp_sub_device *asd,
struct atomisp_css_xnr_table *xnr_table); struct ia_css_xnr_table *xnr_table);
void atomisp_css_set_r_gamma_table(struct atomisp_sub_device *asd, void atomisp_css_set_r_gamma_table(struct atomisp_sub_device *asd,
struct atomisp_css_rgb_gamma_table *r_gamma_table); struct ia_css_rgb_gamma_table *r_gamma_table);
void atomisp_css_set_g_gamma_table(struct atomisp_sub_device *asd, void atomisp_css_set_g_gamma_table(struct atomisp_sub_device *asd,
struct atomisp_css_rgb_gamma_table *g_gamma_table); struct ia_css_rgb_gamma_table *g_gamma_table);
void atomisp_css_set_b_gamma_table(struct atomisp_sub_device *asd, void atomisp_css_set_b_gamma_table(struct atomisp_sub_device *asd,
struct atomisp_css_rgb_gamma_table *b_gamma_table); struct ia_css_rgb_gamma_table *b_gamma_table);
void atomisp_css_set_anr_thres(struct atomisp_sub_device *asd, void atomisp_css_set_anr_thres(struct atomisp_sub_device *asd,
struct atomisp_css_anr_thres *anr_thres); struct ia_css_anr_thres *anr_thres);
int atomisp_css_check_firmware_version(struct atomisp_device *isp); int atomisp_css_check_firmware_version(struct atomisp_device *isp);
...@@ -253,7 +162,7 @@ int atomisp_css_load_firmware(struct atomisp_device *isp); ...@@ -253,7 +162,7 @@ int atomisp_css_load_firmware(struct atomisp_device *isp);
void atomisp_css_unload_firmware(struct atomisp_device *isp); void atomisp_css_unload_firmware(struct atomisp_device *isp);
void atomisp_css_set_dvs_6axis(struct atomisp_sub_device *asd, void atomisp_css_set_dvs_6axis(struct atomisp_sub_device *asd,
struct atomisp_css_dvs_6axis *dvs_6axis); struct ia_css_dvs_6axis_config *dvs_6axis);
unsigned int atomisp_css_debug_get_dtrace_level(void); unsigned int atomisp_css_debug_get_dtrace_level(void);
...@@ -267,11 +176,11 @@ void atomisp_css_set_isp_config_id(struct atomisp_sub_device *asd, ...@@ -267,11 +176,11 @@ void atomisp_css_set_isp_config_id(struct atomisp_sub_device *asd,
uint32_t isp_config_id); uint32_t isp_config_id);
void atomisp_css_set_isp_config_applied_frame(struct atomisp_sub_device *asd, void atomisp_css_set_isp_config_applied_frame(struct atomisp_sub_device *asd,
struct atomisp_css_frame *output_frame); struct ia_css_frame *output_frame);
int atomisp_get_css_dbgfunc(void); int atomisp_get_css_dbgfunc(void);
int atomisp_set_css_dbgfunc(struct atomisp_device *isp, int opt); int atomisp_set_css_dbgfunc(struct atomisp_device *isp, int opt);
struct atomisp_css_dvs_grid_info *atomisp_css_get_dvs_grid_info( struct ia_css_dvs_grid_info *atomisp_css_get_dvs_grid_info(
struct atomisp_css_grid_info *grid_info); struct ia_css_grid_info *grid_info);
#endif #endif
drivers/staging/media/atomisp/pci/atomisp_fops.h
View file @ c01d5546
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
int atomisp_q_video_buffers_to_css(struct atomisp_sub_device *asd, int atomisp_q_video_buffers_to_css(struct atomisp_sub_device *asd,
struct atomisp_video_pipe *pipe, struct atomisp_video_pipe *pipe,
enum atomisp_input_stream_id stream_id, enum atomisp_input_stream_id stream_id,
enum atomisp_css_buffer_type css_buf_type, enum ia_css_buffer_type css_buf_type,
enum atomisp_css_pipe_id css_pipe_id); enum ia_css_pipe_id css_pipe_id);
unsigned int atomisp_dev_users(struct atomisp_device *isp); unsigned int atomisp_dev_users(struct atomisp_device *isp);
unsigned int atomisp_sub_dev_users(struct atomisp_sub_device *asd); unsigned int atomisp_sub_dev_users(struct atomisp_sub_device *asd);
......
drivers/staging/media/atomisp/pci/atomisp_ioctl.h
View file @ c01d5546
...@@ -43,7 +43,7 @@ int __atomisp_reqbufs(struct file *file, void *fh, ...@@ -43,7 +43,7 @@ int __atomisp_reqbufs(struct file *file, void *fh,
int atomisp_reqbufs(struct file *file, void *fh, int atomisp_reqbufs(struct file *file, void *fh,
struct v4l2_requestbuffers *req); struct v4l2_requestbuffers *req);
enum atomisp_css_pipe_id atomisp_get_css_pipe_id(struct atomisp_sub_device enum ia_css_pipe_id atomisp_get_css_pipe_id(struct atomisp_sub_device
*asd); *asd);
void atomisp_videobuf_free_buf(struct videobuf_buffer *vb); void atomisp_videobuf_free_buf(struct videobuf_buffer *vb);
......
drivers/staging/media/atomisp/pci/atomisp_subdev.c
View file @ c01d5546
...@@ -30,26 +30,26 @@ ...@@ -30,26 +30,26 @@
#include "atomisp_internal.h" #include "atomisp_internal.h"
const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = { const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = {
{ MEDIA_BUS_FMT_SBGGR8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, CSS_BAYER_ORDER_BGGR, CSS_FORMAT_RAW_8 }, { MEDIA_BUS_FMT_SBGGR8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_BGGR, ATOMISP_INPUT_FORMAT_RAW_8 },
{ MEDIA_BUS_FMT_SGBRG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, CSS_BAYER_ORDER_GBRG, CSS_FORMAT_RAW_8 }, { MEDIA_BUS_FMT_SGBRG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_GBRG, ATOMISP_INPUT_FORMAT_RAW_8 },
{ MEDIA_BUS_FMT_SGRBG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, CSS_BAYER_ORDER_GRBG, CSS_FORMAT_RAW_8 }, { MEDIA_BUS_FMT_SGRBG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_GRBG, ATOMISP_INPUT_FORMAT_RAW_8 },
{ MEDIA_BUS_FMT_SRGGB8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, CSS_BAYER_ORDER_RGGB, CSS_FORMAT_RAW_8 }, { MEDIA_BUS_FMT_SRGGB8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_RGGB, ATOMISP_INPUT_FORMAT_RAW_8 },
{ MEDIA_BUS_FMT_SBGGR10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, CSS_BAYER_ORDER_BGGR, CSS_FORMAT_RAW_10 }, { MEDIA_BUS_FMT_SBGGR10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_BGGR, ATOMISP_INPUT_FORMAT_RAW_10 },
{ MEDIA_BUS_FMT_SGBRG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, CSS_BAYER_ORDER_GBRG, CSS_FORMAT_RAW_10 }, { MEDIA_BUS_FMT_SGBRG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_GBRG, ATOMISP_INPUT_FORMAT_RAW_10 },
{ MEDIA_BUS_FMT_SGRBG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, CSS_BAYER_ORDER_GRBG, CSS_FORMAT_RAW_10 }, { MEDIA_BUS_FMT_SGRBG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_GRBG, ATOMISP_INPUT_FORMAT_RAW_10 },
{ MEDIA_BUS_FMT_SRGGB10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, CSS_BAYER_ORDER_RGGB, CSS_FORMAT_RAW_10 }, { MEDIA_BUS_FMT_SRGGB10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_RGGB, ATOMISP_INPUT_FORMAT_RAW_10 },
{ MEDIA_BUS_FMT_SBGGR12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_BGGR, CSS_FORMAT_RAW_12 }, { MEDIA_BUS_FMT_SBGGR12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_BGGR, ATOMISP_INPUT_FORMAT_RAW_12 },
{ MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GBRG, CSS_FORMAT_RAW_12 }, { MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_GBRG, ATOMISP_INPUT_FORMAT_RAW_12 },
{ MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GRBG, CSS_FORMAT_RAW_12 }, { MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_GRBG, ATOMISP_INPUT_FORMAT_RAW_12 },
{ MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_RGGB, CSS_FORMAT_RAW_12 }, { MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_RGGB, ATOMISP_INPUT_FORMAT_RAW_12 },
{ MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 }, { MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },
{ MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 }, { MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },
{ MEDIA_BUS_FMT_JPEG_1X8, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 }, { MEDIA_BUS_FMT_JPEG_1X8, 8, 8, IA_CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },
{ V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, CSS_FRAME_FORMAT_NV12, 0, CSS_FRAME_FORMAT_NV12 }, { V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, IA_CSS_FRAME_FORMAT_NV12, 0, IA_CSS_FRAME_FORMAT_NV12 },
{ V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, CSS_FRAME_FORMAT_NV21, 0, CSS_FRAME_FORMAT_NV21 }, { V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, IA_CSS_FRAME_FORMAT_NV21, 0, IA_CSS_FRAME_FORMAT_NV21 },
{ V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY }, { V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY },
#if 0 #if 0
{ V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 }, { V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, IA_CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },
#endif #endif
/* no valid V4L2 MBUS code for metadata format, so leave it 0. */ /* no valid V4L2 MBUS code for metadata format, so leave it 0. */
{ 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, ATOMISP_INPUT_FORMAT_EMBEDDED }, { 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, ATOMISP_INPUT_FORMAT_EMBEDDED },
......
drivers/staging/media/atomisp/pci/atomisp_subdev.h
View file @ c01d5546
...@@ -59,7 +59,7 @@ struct atomisp_in_fmt_conv { ...@@ -59,7 +59,7 @@ struct atomisp_in_fmt_conv {
u8 bpp; /* bits per pixel */ u8 bpp; /* bits per pixel */
u8 depth; /* uncompressed */ u8 depth; /* uncompressed */
enum atomisp_input_format atomisp_in_fmt; enum atomisp_input_format atomisp_in_fmt;
enum atomisp_css_bayer_order bayer_order; enum ia_css_bayer_order bayer_order;
enum atomisp_input_format css_stream_fmt; enum atomisp_input_format css_stream_fmt;
}; };
...@@ -215,8 +215,8 @@ struct atomisp_subdev_params { ...@@ -215,8 +215,8 @@ struct atomisp_subdev_params {
unsigned int histogram_elenum; unsigned int histogram_elenum;
/* Current grid info */ /* Current grid info */
struct atomisp_css_grid_info curr_grid_info; struct ia_css_grid_info curr_grid_info;
enum atomisp_css_pipe_id s3a_enabled_pipe; enum ia_css_pipe_id s3a_enabled_pipe;
int s3a_output_bytes; int s3a_output_bytes;
...@@ -225,7 +225,7 @@ struct atomisp_subdev_params { ...@@ -225,7 +225,7 @@ struct atomisp_subdev_params {
struct ia_css_dz_config dz_config; /** Digital Zoom */ struct ia_css_dz_config dz_config; /** Digital Zoom */
struct ia_css_capture_config capture_config; struct ia_css_capture_config capture_config;
struct atomisp_css_isp_config config; struct ia_css_isp_config config;
/* current configurations */ /* current configurations */
struct atomisp_css_params css_param; struct atomisp_css_params css_param;
...@@ -240,7 +240,7 @@ struct atomisp_subdev_params { ...@@ -240,7 +240,7 @@ struct atomisp_subdev_params {
u32 metadata_width_size; u32 metadata_width_size;
struct ia_css_dvs2_statistics *dvs_stat; struct ia_css_dvs2_statistics *dvs_stat;
struct atomisp_css_dvs_6axis *dvs_6axis; struct ia_css_dvs_6axis_config *dvs_6axis;
u32 exp_id; u32 exp_id;
int dvs_hor_coef_bytes; int dvs_hor_coef_bytes;
int dvs_ver_coef_bytes; int dvs_ver_coef_bytes;
...@@ -265,7 +265,7 @@ struct atomisp_css_params_with_list { ...@@ -265,7 +265,7 @@ struct atomisp_css_params_with_list {
}; };
struct atomisp_acc_fw { struct atomisp_acc_fw {
struct atomisp_css_fw_info *fw; struct ia_css_fw_info *fw;
unsigned int handle; unsigned int handle;
unsigned int flags; unsigned int flags;
unsigned int type; unsigned int type;
...@@ -323,7 +323,7 @@ struct atomisp_sub_device { ...@@ -323,7 +323,7 @@ struct atomisp_sub_device {
struct { struct {
struct list_head fw; struct list_head fw;
struct list_head memory_maps; struct list_head memory_maps;
struct atomisp_css_pipeline *pipeline; struct ia_css_pipe *pipeline;
bool extension_mode; bool extension_mode;
struct ida ida; struct ida ida;
struct completion acc_done; struct completion acc_done;
...@@ -335,11 +335,11 @@ struct atomisp_sub_device { ...@@ -335,11 +335,11 @@ struct atomisp_sub_device {
struct atomisp_stream_env stream_env[ATOMISP_INPUT_STREAM_NUM]; struct atomisp_stream_env stream_env[ATOMISP_INPUT_STREAM_NUM];
struct v4l2_pix_format dvs_envelop; struct v4l2_pix_format dvs_envelop;
unsigned int s3a_bufs_in_css[CSS_PIPE_ID_NUM]; unsigned int s3a_bufs_in_css[IA_CSS_PIPE_ID_NUM];
unsigned int dis_bufs_in_css; unsigned int dis_bufs_in_css;
unsigned int metadata_bufs_in_css unsigned int metadata_bufs_in_css
[ATOMISP_INPUT_STREAM_NUM][CSS_PIPE_ID_NUM]; [ATOMISP_INPUT_STREAM_NUM][IA_CSS_PIPE_ID_NUM];
/* The list of free and available metadata buffers for CSS */ /* The list of free and available metadata buffers for CSS */
struct list_head metadata[ATOMISP_METADATA_TYPE_NUM]; struct list_head metadata[ATOMISP_METADATA_TYPE_NUM];
/* The list of metadata buffers which have been en-queued to CSS */ /* The list of metadata buffers which have been en-queued to CSS */
...@@ -358,8 +358,8 @@ struct atomisp_sub_device { ...@@ -358,8 +358,8 @@ struct atomisp_sub_device {
struct list_head dis_stats_in_css; struct list_head dis_stats_in_css;
spinlock_t dis_stats_lock; spinlock_t dis_stats_lock;
struct atomisp_css_frame *vf_frame; /* TODO: needed? */ struct ia_css_frame *vf_frame; /* TODO: needed? */
struct atomisp_css_frame *raw_output_frame; struct ia_css_frame *raw_output_frame;
enum atomisp_frame_status frame_status[VIDEO_MAX_FRAME]; enum atomisp_frame_status frame_status[VIDEO_MAX_FRAME];
/* This field specifies which camera (v4l2 input) is selected. */ /* This field specifies which camera (v4l2 input) is selected. */
......
drivers/staging/media/atomisp/pci/atomisp_tables.h
View file @ c01d5546
...@@ -22,25 +22,25 @@ ...@@ -22,25 +22,25 @@
#include "sh_css_params.h" #include "sh_css_params.h"
/*Sepia image effect table*/ /*Sepia image effect table*/
static struct atomisp_css_cc_config sepia_cc_config = { static struct ia_css_cc_config sepia_cc_config = {
.fraction_bits = 8, .fraction_bits = 8,
.matrix = {141, 18, 68, -40, -5, -19, 35, 4, 16}, .matrix = {141, 18, 68, -40, -5, -19, 35, 4, 16},
}; };
/*Negative image effect table*/ /*Negative image effect table*/
static struct atomisp_css_cc_config nega_cc_config = { static struct ia_css_cc_config nega_cc_config = {
.fraction_bits = 8, .fraction_bits = 8,
.matrix = {255, 29, 120, 0, 374, 342, 0, 672, -301}, .matrix = {255, 29, 120, 0, 374, 342, 0, 672, -301},
}; };
/*Mono image effect table*/ /*Mono image effect table*/
static struct atomisp_css_cc_config mono_cc_config = { static struct ia_css_cc_config mono_cc_config = {
.fraction_bits = 8, .fraction_bits = 8,
.matrix = {255, 29, 120, 0, 0, 0, 0, 0, 0}, .matrix = {255, 29, 120, 0, 0, 0, 0, 0, 0},
}; };
/*Skin whiten image effect table*/ /*Skin whiten image effect table*/
static struct atomisp_css_macc_table skin_low_macc_table = { static struct ia_css_macc_table skin_low_macc_table = {
.data = { .data = {
8192, 0, 0, 8192, 8192, 0, 0, 8192,
8192, 0, 0, 8192, 8192, 0, 0, 8192,
...@@ -61,7 +61,7 @@ static struct atomisp_css_macc_table skin_low_macc_table = { ...@@ -61,7 +61,7 @@ static struct atomisp_css_macc_table skin_low_macc_table = {
} }
}; };
static struct atomisp_css_macc_table skin_medium_macc_table = { static struct ia_css_macc_table skin_medium_macc_table = {
.data = { .data = {
8192, 0, 0, 8192, 8192, 0, 0, 8192,
8192, 0, 0, 8192, 8192, 0, 0, 8192,
...@@ -82,7 +82,7 @@ static struct atomisp_css_macc_table skin_medium_macc_table = { ...@@ -82,7 +82,7 @@ static struct atomisp_css_macc_table skin_medium_macc_table = {
} }
}; };
static struct atomisp_css_macc_table skin_high_macc_table = { static struct ia_css_macc_table skin_high_macc_table = {
.data = { .data = {
8192, 0, 0, 8192, 8192, 0, 0, 8192,
8192, 0, 0, 8192, 8192, 0, 0, 8192,
...@@ -104,7 +104,7 @@ static struct atomisp_css_macc_table skin_high_macc_table = { ...@@ -104,7 +104,7 @@ static struct atomisp_css_macc_table skin_high_macc_table = {
}; };
/*Blue enhencement image effect table*/ /*Blue enhencement image effect table*/
static struct atomisp_css_macc_table blue_macc_table = { static struct ia_css_macc_table blue_macc_table = {
.data = { .data = {
9728, -3072, 0, 8192, 9728, -3072, 0, 8192,
8192, 0, 0, 8192, 8192, 0, 0, 8192,
...@@ -126,7 +126,7 @@ static struct atomisp_css_macc_table blue_macc_table = { ...@@ -126,7 +126,7 @@ static struct atomisp_css_macc_table blue_macc_table = {
}; };
/*Green enhencement image effect table*/ /*Green enhencement image effect table*/
static struct atomisp_css_macc_table green_macc_table = { static struct ia_css_macc_table green_macc_table = {
.data = { .data = {
8192, 0, 0, 8192, 8192, 0, 0, 8192,
8192, 0, 0, 8192, 8192, 0, 0, 8192,
...@@ -147,7 +147,7 @@ static struct atomisp_css_macc_table green_macc_table = { ...@@ -147,7 +147,7 @@ static struct atomisp_css_macc_table green_macc_table = {
} }
}; };
static struct atomisp_css_ctc_table vivid_ctc_table = { static struct ia_css_ctc_table vivid_ctc_table = {
.data.vamem_2 = { .data.vamem_2 = {
0, 384, 837, 957, 1011, 1062, 1083, 1080, 0, 384, 837, 957, 1011, 1062, 1083, 1080,
1078, 1077, 1053, 1039, 1012, 992, 969, 951, 1078, 1077, 1053, 1039, 1012, 992, 969, 951,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7