* [PATCH 0/3] Add MFCv8 support
@ 2014-04-23 12:57 Arun Kumar K
2014-04-23 12:57 ` [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers Arun Kumar K
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Arun Kumar K @ 2014-04-23 12:57 UTC (permalink / raw)
To: linux-media, linux-samsung-soc
Cc: k.debski, s.nawrocki, posciak, avnd.kiran, arunkk.samsung
This patchset adds MFCv8 support to the s5p-mfc driver.
MFCv8 has the same operation sequence as that of v6+, but
there is some shuffling of the registers happened. So to
re-use the exisiting code, register access uses context
variables instead of macros.
The patchset modifies opr_v6 file to use register variables
and is tested on mfc v6, v7 and v8 based boards.
The patchset is based on the following set of patches
posted for MFC which are currently under review:
[media] s5p-mfc: Add support for resolution change event
v4l: Add resolution change event.
[media] s5p-mfc: Don't allocate codec buffers on STREAMON.
[media] s5p-mfc: Extract open/close MFC instance commands.
[media] s5p-mfc: Fixes for decode REQBUFS.
[media] s5p-mfc: Copy timestamps only when a frame is produced.
[media] s5p-mfc: add init buffer cmd to MFCV6
[media] s5p-mfc: Don't try to resubmit VP8 bitstream buffer for decode.
[media] s5p-mfc: Add a control for IVF format for VP8 encoder
Arun Kumar K (1):
[media] s5p-mfc: Rename IS_MFCV7 macro
Kiran AVND (2):
[media] s5p-mfc: Add variants to access mfc registers
[media] s5p-mfc: Core support to add v8 decoder
.../devicetree/bindings/media/s5p-mfc.txt | 3 +-
drivers/media/platform/s5p-mfc/regs-mfc-v8.h | 93 +++
drivers/media/platform/s5p-mfc/s5p_mfc.c | 31 +
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 7 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 +
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 792 +++++++++++++-------
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
10 files changed, 926 insertions(+), 273 deletions(-)
create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v8.h
--
1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-04-23 12:57 [PATCH 0/3] Add MFCv8 support Arun Kumar K
@ 2014-04-23 12:57 ` Arun Kumar K
2014-05-08 16:31 ` Kamil Debski
2014-05-13 10:32 ` Kamil Debski
2014-04-23 12:57 ` [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder Arun Kumar K
2014-04-23 12:57 ` [PATCH 3/3] [media] s5p-mfc: Rename IS_MFCV7 macro Arun Kumar K
2 siblings, 2 replies; 16+ messages in thread
From: Arun Kumar K @ 2014-04-23 12:57 UTC (permalink / raw)
To: linux-media, linux-samsung-soc
Cc: k.debski, s.nawrocki, posciak, avnd.kiran, arunkk.samsung
From: Kiran AVND <avnd.kiran@samsung.com>
This patch is needed in preparation to add MFC V8
where the register offsets are changed w.r.t MFC V6/V7.
This patch adds variants of MFC V6 and V7 while
accessing MFC registers. Registers are kept in mfc context
and are initialized to a particular MFC variant during probe,
which is used instead of macros.
This avoids duplication of the code for MFC variants
V6 & V7, and reduces the if_else checks while accessing
registers of different MFC variants.
Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
Signed-off-by: Pawel Osciak <posciak@chromium.org>
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697 +++++++++++++++--------
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
6 files changed, 710 insertions(+), 256 deletions(-)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 4f9d37a..07ebac8 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1223,6 +1223,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
/* Initialize HW ops and commands based on MFC version */
s5p_mfc_init_hw_ops(dev);
s5p_mfc_init_hw_cmds(dev);
+ s5p_mfc_init_regs(dev);
pr_debug("%s--\n", __func__);
return 0;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index f5404a6..48a14b5 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -332,6 +332,7 @@ struct s5p_mfc_dev {
struct s5p_mfc_hw_ops *mfc_ops;
struct s5p_mfc_hw_cmds *mfc_cmds;
int ver;
+ const struct s5p_mfc_regs *mfc_regs;
};
/**
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
index 3c01c33..c9a2274 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
@@ -31,6 +31,12 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
dev->mfc_ops = s5p_mfc_ops;
}
+void s5p_mfc_init_regs(struct s5p_mfc_dev *dev)
+{
+ if (IS_MFCV6_PLUS(dev))
+ dev->mfc_regs = s5p_mfc_init_regs_v6_plus(dev);
+}
+
int s5p_mfc_alloc_priv_buf(struct device *dev,
struct s5p_mfc_priv_buf *b)
{
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
index 754c540..7a7ad32 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
@@ -17,6 +17,259 @@
#include "s5p_mfc_common.h"
+struct s5p_mfc_regs {
+
+ /* codec common registers */
+ void *risc_on;
+ void *risc2host_int;
+ void *host2risc_int;
+ void *risc_base_address;
+ void *mfc_reset;
+ void *host2risc_command;
+ void *risc2host_command;
+ void *mfc_bus_reset_ctrl;
+ void *firmware_version;
+ void *instance_id;
+ void *codec_type;
+ void *context_mem_addr;
+ void *context_mem_size;
+ void *pixel_format;
+ void *metadata_enable;
+ void *mfc_version;
+ void *dbg_info_enable;
+ void *dbg_buffer_addr;
+ void *dbg_buffer_size;
+ void *hed_control;
+ void *mfc_timeout_value;
+ void *hed_shared_mem_addr;
+ void *dis_shared_mem_addr;/* only v7 */
+ void *ret_instance_id;
+ void *error_code;
+ void *dbg_buffer_output_size;
+ void *metadata_status;
+ void *metadata_addr_mb_info;
+ void *metadata_size_mb_info;
+ void *dbg_info_stage_counter;
+
+ /* decoder registers */
+ void *d_crc_ctrl;
+ void *d_dec_options;
+ void *d_display_delay;
+ void *d_set_frame_width;
+ void *d_set_frame_height;
+ void *d_sei_enable;
+ void *d_min_num_dpb;
+ void *d_min_first_plane_dpb_size;
+ void *d_min_second_plane_dpb_size;
+ void *d_min_third_plane_dpb_size;/* only v8 */
+ void *d_min_num_mv;
+ void *d_mvc_num_views;
+ void *d_min_num_dis;/* only v7 */
+ void *d_min_first_dis_size;/* only v7 */
+ void *d_min_second_dis_size;/* only v7 */
+ void *d_min_third_dis_size;/* only v7 */
+ void *d_post_filter_luma_dpb0;/* v7 and v8 */
+ void *d_post_filter_luma_dpb1;/* v7 and v8 */
+ void *d_post_filter_luma_dpb2;/* only v7 */
+ void *d_post_filter_chroma_dpb0;/* v7 and v8 */
+ void *d_post_filter_chroma_dpb1;/* v7 and v8 */
+ void *d_post_filter_chroma_dpb2;/* only v7 */
+ void *d_num_dpb;
+ void *d_num_mv;
+ void *d_init_buffer_options;
+ void *d_first_plane_dpb_stride_size;/* only v8 */
+ void *d_second_plane_dpb_stride_size;/* only v8 */
+ void *d_third_plane_dpb_stride_size;/* only v8 */
+ void *d_first_plane_dpb_size;
+ void *d_second_plane_dpb_size;
+ void *d_third_plane_dpb_size;/* only v8 */
+ void *d_mv_buffer_size;
+ void *d_first_plane_dpb;
+ void *d_second_plane_dpb;
+ void *d_third_plane_dpb;
+ void *d_mv_buffer;
+ void *d_scratch_buffer_addr;
+ void *d_scratch_buffer_size;
+ void *d_metadata_buffer_addr;
+ void *d_metadata_buffer_size;
+ void *d_nal_start_options;/* v7 and v8 */
+ void *d_cpb_buffer_addr;
+ void *d_cpb_buffer_size;
+ void *d_available_dpb_flag_upper;
+ void *d_available_dpb_flag_lower;
+ void *d_cpb_buffer_offset;
+ void *d_slice_if_enable;
+ void *d_picture_tag;
+ void *d_stream_data_size;
+ void *d_dynamic_dpb_flag_upper;/* v7 and v8 */
+ void *d_dynamic_dpb_flag_lower;/* v7 and v8 */
+ void *d_display_frame_width;
+ void *d_display_frame_height;
+ void *d_display_status;
+ void *d_display_first_plane_addr;
+ void *d_display_second_plane_addr;
+ void *d_display_third_plane_addr;/* only v8 */
+ void *d_display_frame_type;
+ void *d_display_crop_info1;
+ void *d_display_crop_info2;
+ void *d_display_picture_profile;
+ void *d_display_luma_crc;/* v7 and v8 */
+ void *d_display_chroma0_crc;/* v7 and v8 */
+ void *d_display_chroma1_crc;/* only v8 */
+ void *d_display_luma_crc_top;/* only v6 */
+ void *d_display_chroma_crc_top;/* only v6 */
+ void *d_display_luma_crc_bot;/* only v6 */
+ void *d_display_chroma_crc_bot;/* only v6 */
+ void *d_display_aspect_ratio;
+ void *d_display_extended_ar;
+ void *d_decoded_frame_width;
+ void *d_decoded_frame_height;
+ void *d_decoded_status;
+ void *d_decoded_first_plane_addr;
+ void *d_decoded_second_plane_addr;
+ void *d_decoded_third_plane_addr;/* only v8 */
+ void *d_decoded_frame_type;
+ void *d_decoded_crop_info1;
+ void *d_decoded_crop_info2;
+ void *d_decoded_picture_profile;
+ void *d_decoded_nal_size;
+ void *d_decoded_luma_crc;
+ void *d_decoded_chroma0_crc;
+ void *d_decoded_chroma1_crc;/* only v8 */
+ void *d_ret_picture_tag_top;
+ void *d_ret_picture_tag_bot;
+ void *d_ret_picture_time_top;
+ void *d_ret_picture_time_bot;
+ void *d_chroma_format;
+ void *d_vc1_info;/* v7 and v8 */
+ void *d_mpeg4_info;
+ void *d_h264_info;
+ void *d_metadata_addr_concealed_mb;
+ void *d_metadata_size_concealed_mb;
+ void *d_metadata_addr_vc1_param;
+ void *d_metadata_size_vc1_param;
+ void *d_metadata_addr_sei_nal;
+ void *d_metadata_size_sei_nal;
+ void *d_metadata_addr_vui;
+ void *d_metadata_size_vui;
+ void *d_metadata_addr_mvcvui;/* v7 and v8 */
+ void *d_metadata_size_mvcvui;/* v7 and v8 */
+ void *d_mvc_view_id;
+ void *d_frame_pack_sei_avail;
+ void *d_frame_pack_arrgment_id;
+ void *d_frame_pack_sei_info;
+ void *d_frame_pack_grid_pos;
+ void *d_display_recovery_sei_info;/* v7 and v8 */
+ void *d_decoded_recovery_sei_info;/* v7 and v8 */
+ void *d_display_first_addr;/* only v7 */
+ void *d_display_second_addr;/* only v7 */
+ void *d_display_third_addr;/* only v7 */
+ void *d_decoded_first_addr;/* only v7 */
+ void *d_decoded_second_addr;/* only v7 */
+ void *d_decoded_third_addr;/* only v7 */
+ void *d_used_dpb_flag_upper;/* v7 and v8 */
+ void *d_used_dpb_flag_lower;/* v7 and v8 */
+
+ /* encoder registers */
+ void *e_frame_width;
+ void *e_frame_height;
+ void *e_cropped_frame_width;
+ void *e_cropped_frame_height;
+ void *e_frame_crop_offset;
+ void *e_enc_options;
+ void *e_picture_profile;
+ void *e_vbv_buffer_size;
+ void *e_vbv_init_delay;
+ void *e_fixed_picture_qp;
+ void *e_rc_config;
+ void *e_rc_qp_bound;
+ void *e_rc_qp_bound_pb;/* v7 and v8 */
+ void *e_rc_mode;
+ void *e_mb_rc_config;
+ void *e_padding_ctrl;
+ void *e_air_threshold;
+ void *e_mv_hor_range;
+ void *e_mv_ver_range;
+ void *e_num_dpb;
+ void *e_luma_dpb;
+ void *e_chroma_dpb;
+ void *e_me_buffer;
+ void *e_scratch_buffer_addr;
+ void *e_scratch_buffer_size;
+ void *e_tmv_buffer0;
+ void *e_tmv_buffer1;
+ void *e_ir_buffer_addr;/* v7 and v8 */
+ void *e_source_first_plane_addr;
+ void *e_source_second_plane_addr;
+ void *e_source_third_plane_addr;/* v7 and v8 */
+ void *e_source_first_plane_stride;/* v7 and v8 */
+ void *e_source_second_plane_stride;/* v7 and v8 */
+ void *e_source_third_plane_stride;/* v7 and v8 */
+ void *e_stream_buffer_addr;
+ void *e_stream_buffer_size;
+ void *e_roi_buffer_addr;
+ void *e_param_change;
+ void *e_ir_size;
+ void *e_gop_config;
+ void *e_mslice_mode;
+ void *e_mslice_size_mb;
+ void *e_mslice_size_bits;
+ void *e_frame_insertion;
+ void *e_rc_frame_rate;
+ void *e_rc_bit_rate;
+ void *e_rc_roi_ctrl;
+ void *e_picture_tag;
+ void *e_bit_count_enable;
+ void *e_max_bit_count;
+ void *e_min_bit_count;
+ void *e_metadata_buffer_addr;
+ void *e_metadata_buffer_size;
+ void *e_encoded_source_first_plane_addr;
+ void *e_encoded_source_second_plane_addr;
+ void *e_encoded_source_third_plane_addr;/* v7 and v8 */
+ void *e_stream_size;
+ void *e_slice_type;
+ void *e_picture_count;
+ void *e_ret_picture_tag;
+ void *e_stream_buffer_write_pointer; /* only v6 */
+ void *e_recon_luma_dpb_addr;
+ void *e_recon_chroma_dpb_addr;
+ void *e_metadata_addr_enc_slice;
+ void *e_metadata_size_enc_slice;
+ void *e_mpeg4_options;
+ void *e_mpeg4_hec_period;
+ void *e_aspect_ratio;
+ void *e_extended_sar;
+ void *e_h264_options;
+ void *e_h264_options_2;/* v7 and v8 */
+ void *e_h264_lf_alpha_offset;
+ void *e_h264_lf_beta_offset;
+ void *e_h264_i_period;
+ void *e_h264_fmo_slice_grp_map_type;
+ void *e_h264_fmo_num_slice_grp_minus1;
+ void *e_h264_fmo_slice_grp_change_dir;
+ void *e_h264_fmo_slice_grp_change_rate_minus1;
+ void *e_h264_fmo_run_length_minus1_0;
+ void *e_h264_aso_slice_order_0;
+ void *e_h264_chroma_qp_offset;
+ void *e_h264_num_t_layer;
+ void *e_h264_hierarchical_qp_layer0;
+ void *e_h264_frame_packing_sei_info;
+ void *e_h264_nal_control;/* v7 and v8 */
+ void *e_mvc_frame_qp_view1;
+ void *e_mvc_rc_bit_rate_view1;
+ void *e_mvc_rc_qbound_view1;
+ void *e_mvc_rc_mode_view1;
+ void *e_mvc_inter_view_prediction_on;
+ void *e_vp8_options;/* v7 and v8 */
+ void *e_vp8_filter_options;/* v7 and v8 */
+ void *e_vp8_golden_frame_option;/* v7 and v8 */
+ void *e_vp8_num_t_layer;/* v7 and v8 */
+ void *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
+ void *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
+ void *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
+};
+
struct s5p_mfc_hw_ops {
int (*alloc_dec_temp_buffers)(struct s5p_mfc_ctx *ctx);
void (*release_dec_desc_buffer)(struct s5p_mfc_ctx *ctx);
@@ -80,6 +333,7 @@ struct s5p_mfc_hw_ops {
};
void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
+void s5p_mfc_init_regs(struct s5p_mfc_dev *dev);
int s5p_mfc_alloc_priv_buf(struct device *dev,
struct s5p_mfc_priv_buf *b);
void s5p_mfc_release_priv_buf(struct device *dev,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 356cfe5..65b8d20 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -44,10 +44,10 @@
} while (0)
#endif /* S5P_MFC_DEBUG_REGWRITE */
-#define READL(offset) readl(dev->regs_base + (offset))
-#define WRITEL(data, offset) writel((data), dev->regs_base + (offset))
-#define OFFSETA(x) (((x) - dev->port_a) >> S5P_FIMV_MEM_OFFSET)
-#define OFFSETB(x) (((x) - dev->port_b) >> S5P_FIMV_MEM_OFFSET)
+#define READL(reg) \
+ (WARN_ON_ONCE(!(reg)) ? 0 : readl(reg))
+#define WRITEL(data, reg) \
+ (WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))
/* Allocate temporary buffers for decoding */
static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx)
@@ -367,16 +367,17 @@ static int s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
unsigned int strm_size)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
mfc_debug_enter();
mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n"
"buf_size: 0x%08x (%d)\n",
ctx->inst_no, buf_addr, strm_size, strm_size);
- WRITEL(strm_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
- WRITEL(buf_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
- WRITEL(buf_size->cpb, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
- WRITEL(start_num_byte, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
+ WRITEL(strm_size, mfc_regs->d_stream_data_size);
+ WRITEL(buf_addr, mfc_regs->d_cpb_buffer_addr);
+ WRITEL(buf_size->cpb, mfc_regs->d_cpb_buffer_size);
+ WRITEL(start_num_byte, mfc_regs->d_cpb_buffer_offset);
mfc_debug_leave();
return 0;
@@ -388,6 +389,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
unsigned int frame_size, i;
unsigned int frame_size_ch, frame_size_mv;
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
size_t buf_addr1;
int buf_size1;
int align_gap;
@@ -399,19 +401,19 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
mfc_debug(2, "Setting display delay to %d\n", ctx->display_delay);
- WRITEL(ctx->total_dpb_count, S5P_FIMV_D_NUM_DPB_V6);
- WRITEL(ctx->luma_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
- WRITEL(ctx->chroma_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
+ WRITEL(ctx->total_dpb_count, mfc_regs->d_num_dpb);
+ WRITEL(ctx->luma_size, mfc_regs->d_first_plane_dpb_size);
+ WRITEL(ctx->chroma_size, mfc_regs->d_second_plane_dpb_size);
- WRITEL(buf_addr1, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
- WRITEL(ctx->scratch_buf_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
+ WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
+ WRITEL(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
buf_addr1 += ctx->scratch_buf_size;
buf_size1 -= ctx->scratch_buf_size;
if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||
ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){
- WRITEL(ctx->mv_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
- WRITEL(ctx->mv_count, S5P_FIMV_D_NUM_MV_V6);
+ WRITEL(ctx->mv_size, mfc_regs->d_mv_buffer_size);
+ WRITEL(ctx->mv_count, mfc_regs->d_num_mv);
}
frame_size = ctx->luma_size;
@@ -425,11 +427,11 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
mfc_debug(2, "Luma %d: %x\n", i,
ctx->dst_bufs[i].cookie.raw.luma);
WRITEL(ctx->dst_bufs[i].cookie.raw.luma,
- S5P_FIMV_D_LUMA_DPB_V6 + i * 4);
+ mfc_regs->d_first_plane_dpb + i * 4);
mfc_debug(2, "\tChroma %d: %x\n", i,
ctx->dst_bufs[i].cookie.raw.chroma);
WRITEL(ctx->dst_bufs[i].cookie.raw.chroma,
- S5P_FIMV_D_CHROMA_DPB_V6 + i * 4);
+ mfc_regs->d_second_plane_dpb + i * 4);
}
if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {
@@ -442,7 +444,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
mfc_debug(2, "\tBuf1: %x, size: %d\n",
buf_addr1, buf_size1);
- WRITEL(buf_addr1, S5P_FIMV_D_MV_BUFFER_V6 + i * 4);
+ WRITEL(buf_addr1, mfc_regs->d_mv_buffer + i * 4);
buf_addr1 += frame_size_mv;
buf_size1 -= frame_size_mv;
}
@@ -455,7 +457,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
return -ENOMEM;
}
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
S5P_FIMV_CH_INIT_BUFS_V6, NULL);
@@ -468,9 +470,10 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
unsigned long addr, unsigned int size)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
- WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align */
- WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
+ WRITEL(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */
+ WRITEL(size, mfc_regs->e_stream_buffer_size);
mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",
addr, size);
@@ -482,14 +485,10 @@ static void s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
unsigned long y_addr, unsigned long c_addr)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
- if (IS_MFCV7(dev)) {
- WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
- WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
- } else {
- WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
- WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
- }
+ WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
+ WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);
mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);
@@ -499,18 +498,14 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
unsigned long *y_addr, unsigned long *c_addr)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
unsigned long enc_recon_y_addr, enc_recon_c_addr;
- if (IS_MFCV7(dev)) {
- *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
- *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
- } else {
- *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
- *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
- }
+ *y_addr = READL(mfc_regs->e_encoded_source_first_plane_addr);
+ *c_addr = READL(mfc_regs->e_encoded_source_second_plane_addr);
- enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
- enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
+ enc_recon_y_addr = READL(mfc_regs->e_recon_luma_dpb_addr);
+ enc_recon_c_addr = READL(mfc_regs->e_recon_chroma_dpb_addr);
mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);
mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);
@@ -520,6 +515,7 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
size_t buf_addr1;
int i, buf_size1;
@@ -531,24 +527,24 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
for (i = 0; i < ctx->pb_count; i++) {
- WRITEL(buf_addr1, S5P_FIMV_E_LUMA_DPB_V6 + (4 * i));
+ WRITEL(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
buf_addr1 += ctx->luma_dpb_size;
- WRITEL(buf_addr1, S5P_FIMV_E_CHROMA_DPB_V6 + (4 * i));
+ WRITEL(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i));
buf_addr1 += ctx->chroma_dpb_size;
- WRITEL(buf_addr1, S5P_FIMV_E_ME_BUFFER_V6 + (4 * i));
+ WRITEL(buf_addr1, mfc_regs->e_me_buffer + (4 * i));
buf_addr1 += ctx->me_buffer_size;
buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size +
ctx->me_buffer_size);
}
- WRITEL(buf_addr1, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
- WRITEL(ctx->scratch_buf_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
+ WRITEL(buf_addr1, mfc_regs->e_scratch_buffer_addr);
+ WRITEL(ctx->scratch_buf_size, mfc_regs->e_scratch_buffer_size);
buf_addr1 += ctx->scratch_buf_size;
buf_size1 -= ctx->scratch_buf_size;
- WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER0_V6);
+ WRITEL(buf_addr1, mfc_regs->e_tmv_buffer0);
buf_addr1 += ctx->tmv_buffer_size >> 1;
- WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER1_V6);
+ WRITEL(buf_addr1, mfc_regs->e_tmv_buffer1);
buf_addr1 += ctx->tmv_buffer_size >> 1;
buf_size1 -= ctx->tmv_buffer_size;
@@ -559,7 +555,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
return -ENOMEM;
}
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
S5P_FIMV_CH_INIT_BUFS_V6, NULL);
@@ -571,18 +567,19 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
/* multi-slice control */
/* multi-slice MB number or bit size */
- WRITEL(ctx->slice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
+ WRITEL(ctx->slice_mode, mfc_regs->e_mslice_mode);
if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
- WRITEL(ctx->slice_size.mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
+ WRITEL(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
} else if (ctx->slice_mode ==
V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
- WRITEL(ctx->slice_size.bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
+ WRITEL(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
} else {
- WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
- WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
+ WRITEL(0x0, mfc_regs->e_mslice_size_mb);
+ WRITEL(0x0, mfc_regs->e_mslice_size_bits);
}
return 0;
@@ -591,27 +588,28 @@ static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_enc_params *p = &ctx->enc_params;
unsigned int reg = 0;
mfc_debug_enter();
/* width */
- WRITEL(ctx->img_width, S5P_FIMV_E_FRAME_WIDTH_V6); /* 16 align */
+ WRITEL(ctx->img_width, mfc_regs->e_frame_width); /* 16 align */
/* height */
- WRITEL(ctx->img_height, S5P_FIMV_E_FRAME_HEIGHT_V6); /* 16 align */
+ WRITEL(ctx->img_height, mfc_regs->e_frame_height); /* 16 align */
/* cropped width */
- WRITEL(ctx->img_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
+ WRITEL(ctx->img_width, mfc_regs->e_cropped_frame_width);
/* cropped height */
- WRITEL(ctx->img_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
+ WRITEL(ctx->img_height, mfc_regs->e_cropped_frame_height);
/* cropped offset */
- WRITEL(0x0, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
+ WRITEL(0x0, mfc_regs->e_frame_crop_offset);
/* pictype : IDR period */
reg = 0;
reg |= p->gop_size & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_gop_config);
/* multi-slice control */
/* multi-slice MB number or bit size */
@@ -619,65 +617,65 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
reg = 0;
if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
reg |= (0x1 << 3);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
ctx->slice_size.mb = p->slice_mb;
} else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
reg |= (0x1 << 3);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
ctx->slice_size.bits = p->slice_bit;
} else {
reg &= ~(0x1 << 3);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
}
s5p_mfc_set_slice_mode(ctx);
/* cyclic intra refresh */
- WRITEL(p->intra_refresh_mb, S5P_FIMV_E_IR_SIZE_V6);
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(p->intra_refresh_mb, mfc_regs->e_ir_size);
+ reg = READL(mfc_regs->e_enc_options);
if (p->intra_refresh_mb == 0)
reg &= ~(0x1 << 4);
else
reg |= (0x1 << 4);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* 'NON_REFERENCE_STORE_ENABLE' for debugging */
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ reg = READL(mfc_regs->e_enc_options);
reg &= ~(0x1 << 9);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* memory structure cur. frame */
if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12M) {
/* 0: Linear, 1: 2D tiled*/
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ reg = READL(mfc_regs->e_enc_options);
reg &= ~(0x1 << 7);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* 0: NV12(CbCr), 1: NV21(CrCb) */
- WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
+ WRITEL(0x0, mfc_regs->pixel_format);
} else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV21M) {
/* 0: Linear, 1: 2D tiled*/
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ reg = READL(mfc_regs->e_enc_options);
reg &= ~(0x1 << 7);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* 0: NV12(CbCr), 1: NV21(CrCb) */
- WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
+ WRITEL(0x1, mfc_regs->pixel_format);
} else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16) {
/* 0: Linear, 1: 2D tiled*/
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ reg = READL(mfc_regs->e_enc_options);
reg |= (0x1 << 7);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* 0: NV12(CbCr), 1: NV21(CrCb) */
- WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
+ WRITEL(0x0, mfc_regs->pixel_format);
}
/* memory structure recon. frame */
/* 0: Linear, 1: 2D tiled */
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ reg = READL(mfc_regs->e_enc_options);
reg |= (0x1 << 8);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* padding control & value */
- WRITEL(0x0, S5P_FIMV_E_PADDING_CTRL_V6);
+ WRITEL(0x0, mfc_regs->e_padding_ctrl);
if (p->pad) {
reg = 0;
/** enable */
@@ -688,64 +686,64 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
reg |= ((p->pad_cb & 0xFF) << 8);
/** y value */
reg |= p->pad_luma & 0xFF;
- WRITEL(reg, S5P_FIMV_E_PADDING_CTRL_V6);
+ WRITEL(reg, mfc_regs->e_padding_ctrl);
}
/* rate control config. */
reg = 0;
/* frame-level rate control */
reg |= ((p->rc_frame & 0x1) << 9);
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* bit rate */
if (p->rc_frame)
WRITEL(p->rc_bitrate,
- S5P_FIMV_E_RC_BIT_RATE_V6);
+ mfc_regs->e_rc_bit_rate);
else
- WRITEL(1, S5P_FIMV_E_RC_BIT_RATE_V6);
+ WRITEL(1, mfc_regs->e_rc_bit_rate);
/* reaction coefficient */
if (p->rc_frame) {
if (p->rc_reaction_coeff < TIGHT_CBR_MAX) /* tight CBR */
- WRITEL(1, S5P_FIMV_E_RC_RPARAM_V6);
+ WRITEL(1, mfc_regs->e_rc_mode);
else /* loose CBR */
- WRITEL(2, S5P_FIMV_E_RC_RPARAM_V6);
+ WRITEL(2, mfc_regs->e_rc_mode);
}
/* seq header ctrl */
- reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
+ reg = READL(mfc_regs->e_enc_options);
reg &= ~(0x1 << 2);
reg |= ((p->seq_hdr_mode & 0x1) << 2);
/* frame skip mode */
reg &= ~(0x3);
reg |= (p->frame_skip_mode & 0x3);
- WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_enc_options);
/* 'DROP_CONTROL_ENABLE', disable */
- reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
+ reg = READL(mfc_regs->e_rc_config);
reg &= ~(0x1 << 10);
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* setting for MV range [16, 256] */
reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
- WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6);
+ WRITEL(reg, mfc_regs->e_mv_hor_range);
reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
- WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6);
+ WRITEL(reg, mfc_regs->e_mv_ver_range);
- WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6);
- WRITEL(0x0, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
- WRITEL(0x0, S5P_FIMV_E_PARAM_CHANGE_V6);
- WRITEL(0x0, S5P_FIMV_E_RC_ROI_CTRL_V6);
- WRITEL(0x0, S5P_FIMV_E_PICTURE_TAG_V6);
+ WRITEL(0x0, mfc_regs->e_frame_insertion);
+ WRITEL(0x0, mfc_regs->e_roi_buffer_addr);
+ WRITEL(0x0, mfc_regs->e_param_change);
+ WRITEL(0x0, mfc_regs->e_rc_roi_ctrl);
+ WRITEL(0x0, mfc_regs->e_picture_tag);
- WRITEL(0x0, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
- WRITEL(0x0, S5P_FIMV_E_MAX_BIT_COUNT_V6);
- WRITEL(0x0, S5P_FIMV_E_MIN_BIT_COUNT_V6);
+ WRITEL(0x0, mfc_regs->e_bit_count_enable);
+ WRITEL(0x0, mfc_regs->e_max_bit_count);
+ WRITEL(0x0, mfc_regs->e_min_bit_count);
- WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
- WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
+ WRITEL(0x0, mfc_regs->e_metadata_buffer_addr);
+ WRITEL(0x0, mfc_regs->e_metadata_buffer_size);
mfc_debug_leave();
@@ -755,6 +753,7 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_enc_params *p = &ctx->enc_params;
struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
unsigned int reg = 0;
@@ -765,10 +764,10 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
s5p_mfc_set_enc_params(ctx);
/* pictype : number of B */
- reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
+ reg = READL(mfc_regs->e_gop_config);
reg &= ~(0x3 << 16);
reg |= ((p->num_b_frame & 0x3) << 16);
- WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_gop_config);
/* profile & level */
reg = 0;
@@ -776,18 +775,19 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg |= ((p_h264->level & 0xFF) << 8);
/** profile - 0 ~ 3 */
reg |= p_h264->profile & 0x3F;
- WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
+ WRITEL(reg, mfc_regs->e_picture_profile);
/* rate control config. */
- reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
+ reg = READL(mfc_regs->e_rc_config);
/** macroblock level rate control */
reg &= ~(0x1 << 8);
reg |= ((p->rc_mb & 0x1) << 8);
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
+
/** frame QP */
reg &= ~(0x3F);
reg |= p_h264->rc_frame_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* max & min value of QP */
reg = 0;
@@ -795,16 +795,16 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg |= ((p_h264->rc_max_qp & 0x3F) << 8);
/** min QP */
reg |= p_h264->rc_min_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
+ WRITEL(reg, mfc_regs->e_rc_qp_bound);
/* other QPs */
- WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
if (!p->rc_frame && !p->rc_mb) {
reg = 0;
reg |= ((p_h264->rc_b_frame_qp & 0x3F) << 16);
reg |= ((p_h264->rc_p_frame_qp & 0x3F) << 8);
reg |= p_h264->rc_frame_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(reg, mfc_regs->e_fixed_picture_qp);
}
/* frame rate */
@@ -812,38 +812,38 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg = 0;
reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
reg |= p->rc_framerate_denom & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
+ WRITEL(reg, mfc_regs->e_rc_frame_rate);
}
/* vbv buffer size */
if (p->frame_skip_mode ==
V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
WRITEL(p_h264->cpb_size & 0xFFFF,
- S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
+ mfc_regs->e_vbv_buffer_size);
if (p->rc_frame)
- WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
+ WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
}
/* interlace */
reg = 0;
reg |= ((p_h264->interlace & 0x1) << 3);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* height */
if (p_h264->interlace) {
WRITEL(ctx->img_height >> 1,
- S5P_FIMV_E_FRAME_HEIGHT_V6); /* 32 align */
+ mfc_regs->e_frame_height); /* 32 align */
/* cropped height */
WRITEL(ctx->img_height >> 1,
- S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
+ mfc_regs->e_cropped_frame_height);
}
/* loop filter ctrl */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ reg = READL(mfc_regs->e_h264_options);
reg &= ~(0x3 << 1);
reg |= ((p_h264->loop_filter_mode & 0x3) << 1);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* loopfilter alpha offset */
if (p_h264->loop_filter_alpha < 0) {
@@ -853,7 +853,7 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg = 0x00;
reg |= (p_h264->loop_filter_alpha & 0xF);
}
- WRITEL(reg, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
+ WRITEL(reg, mfc_regs->e_h264_lf_alpha_offset);
/* loopfilter beta offset */
if (p_h264->loop_filter_beta < 0) {
@@ -863,28 +863,28 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg = 0x00;
reg |= (p_h264->loop_filter_beta & 0xF);
}
- WRITEL(reg, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
+ WRITEL(reg, mfc_regs->e_h264_lf_beta_offset);
/* entropy coding mode */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ reg = READL(mfc_regs->e_h264_options);
reg &= ~(0x1);
reg |= p_h264->entropy_mode & 0x1;
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* number of ref. picture */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ reg = READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 7);
reg |= (((p_h264->num_ref_pic_4p - 1) & 0x1) << 7);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* 8x8 transform enable */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ reg = READL(mfc_regs->e_h264_options);
reg &= ~(0x3 << 12);
reg |= ((p_h264->_8x8_transform & 0x3) << 12);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* macroblock adaptive scaling features */
- WRITEL(0x0, S5P_FIMV_E_MB_RC_CONFIG_V6);
+ WRITEL(0x0, mfc_regs->e_mb_rc_config);
if (p->rc_mb) {
reg = 0;
/** dark region */
@@ -895,92 +895,95 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg |= ((p_h264->rc_mb_static & 0x1) << 1);
/** high activity region */
reg |= p_h264->rc_mb_activity & 0x1;
- WRITEL(reg, S5P_FIMV_E_MB_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_mb_rc_config);
}
/* aspect ratio VUI */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 5);
reg |= ((p_h264->vui_sar & 0x1) << 5);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
- WRITEL(0x0, S5P_FIMV_E_ASPECT_RATIO_V6);
- WRITEL(0x0, S5P_FIMV_E_EXTENDED_SAR_V6);
+ WRITEL(0x0, mfc_regs->e_aspect_ratio);
+ WRITEL(0x0, mfc_regs->e_extended_sar);
if (p_h264->vui_sar) {
/* aspect ration IDC */
reg = 0;
reg |= p_h264->vui_sar_idc & 0xFF;
- WRITEL(reg, S5P_FIMV_E_ASPECT_RATIO_V6);
+ WRITEL(reg, mfc_regs->e_aspect_ratio);
if (p_h264->vui_sar_idc == 0xFF) {
/* extended SAR */
reg = 0;
reg |= (p_h264->vui_ext_sar_width & 0xFFFF) << 16;
reg |= p_h264->vui_ext_sar_height & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_EXTENDED_SAR_V6);
+ WRITEL(reg, mfc_regs->e_extended_sar);
}
}
/* intra picture period for H.264 open GOP */
/* control */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 4);
reg |= ((p_h264->open_gop & 0x1) << 4);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
+
/* value */
- WRITEL(0x0, S5P_FIMV_E_H264_I_PERIOD_V6);
+ WRITEL(0x0, mfc_regs->e_h264_i_period);
if (p_h264->open_gop) {
reg = 0;
reg |= p_h264->open_gop_size & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_H264_I_PERIOD_V6);
+ WRITEL(reg, mfc_regs->e_h264_i_period);
}
/* 'WEIGHTED_BI_PREDICTION' for B is disable */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x3 << 9);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 14);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* ASO */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 6);
reg |= ((p_h264->aso & 0x1) << 6);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
/* hier qp enable */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 8);
reg |= ((p_h264->open_gop & 0x1) << 8);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
reg = 0;
if (p_h264->hier_qp && p_h264->hier_qp_layer) {
reg |= (p_h264->hier_qp_type & 0x1) << 0x3;
reg |= p_h264->hier_qp_layer & 0x7;
- WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
+ WRITEL(reg, mfc_regs->e_h264_num_t_layer);
/* QP value for each layer */
- for (i = 0; i < (p_h264->hier_qp_layer & 0x7); i++)
+ for (i = 0; i < p_h264->hier_qp_layer &&
+ i < ARRAY_SIZE(p_h264->hier_qp_layer_qp); i++) {
WRITEL(p_h264->hier_qp_layer_qp[i],
- S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6 +
- i * 4);
+ mfc_regs->e_h264_hierarchical_qp_layer0
+ + i * 4);
+ }
}
/* number of coding layer should be zero when hierarchical is disable */
- WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
+ WRITEL(reg, mfc_regs->e_h264_num_t_layer);
/* frame packing SEI generation */
- reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
+ READL(mfc_regs->e_h264_options);
reg &= ~(0x1 << 25);
reg |= ((p_h264->sei_frame_packing & 0x1) << 25);
- WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->e_h264_options);
if (p_h264->sei_frame_packing) {
reg = 0;
/** current frame0 flag */
reg |= ((p_h264->sei_fp_curr_frame_0 & 0x1) << 2);
/** arrangement type */
reg |= p_h264->sei_fp_arrangement_type & 0x3;
- WRITEL(reg, S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
+ WRITEL(reg, mfc_regs->e_h264_frame_packing_sei_info);
}
if (p_h264->fmo) {
@@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
if (p_h264->fmo_slice_grp > 4)
p_h264->fmo_slice_grp = 4;
- for (i = 0; i < (p_h264->fmo_slice_grp & 0xF); i++)
+ for (i = 0; i < ARRAY_SIZE(p_h264->fmo_run_len)
+ && i < p_h264->fmo_slice_grp; i++) {
WRITEL(p_h264->fmo_run_len[i] - 1,
- S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6 +
- i * 4);
+ mfc_regs->e_h264_fmo_run_length_minus1_0
+ + i * 4);
+ }
break;
case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES:
if (p_h264->fmo_slice_grp > 4)
@@ -1002,10 +1007,10 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
if (p_h264->fmo_slice_grp > 2)
p_h264->fmo_slice_grp = 2;
WRITEL(p_h264->fmo_chg_dir & 0x1,
- S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
+ mfc_regs->e_h264_fmo_slice_grp_change_dir);
/* the valid range is 0 ~ number of macroblocks -1 */
WRITEL(p_h264->fmo_chg_rate,
- S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
+ mfc_regs->e_h264_fmo_slice_grp_change_rate_minus1);
break;
default:
mfc_err("Unsupported map type for FMO: %d\n",
@@ -1016,11 +1021,11 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
}
WRITEL(p_h264->fmo_map_type,
- S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
+ mfc_regs->e_h264_fmo_slice_grp_map_type);
WRITEL(p_h264->fmo_slice_grp - 1,
- S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
+ mfc_regs->e_h264_fmo_num_slice_grp_minus1);
} else {
- WRITEL(0, S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
+ WRITEL(0, mfc_regs->e_h264_fmo_num_slice_grp_minus1);
}
mfc_debug_leave();
@@ -1031,6 +1036,7 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_enc_params *p = &ctx->enc_params;
struct s5p_mfc_mpeg4_enc_params *p_mpeg4 = &p->codec.mpeg4;
unsigned int reg = 0;
@@ -1040,10 +1046,10 @@ static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
s5p_mfc_set_enc_params(ctx);
/* pictype : number of B */
- reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
+ reg = READL(mfc_regs->e_gop_config);
reg &= ~(0x3 << 16);
reg |= ((p->num_b_frame & 0x3) << 16);
- WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_gop_config);
/* profile & level */
reg = 0;
@@ -1051,18 +1057,19 @@ static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
reg |= ((p_mpeg4->level & 0xFF) << 8);
/** profile - 0 ~ 1 */
reg |= p_mpeg4->profile & 0x3F;
- WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
+ WRITEL(reg, mfc_regs->e_picture_profile);
/* rate control config. */
- reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
+ reg = READL(mfc_regs->e_rc_config);
/** macroblock level rate control */
reg &= ~(0x1 << 8);
reg |= ((p->rc_mb & 0x1) << 8);
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
+
/** frame QP */
reg &= ~(0x3F);
reg |= p_mpeg4->rc_frame_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* max & min value of QP */
reg = 0;
@@ -1070,16 +1077,16 @@ static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
reg |= ((p_mpeg4->rc_max_qp & 0x3F) << 8);
/** min QP */
reg |= p_mpeg4->rc_min_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
+ WRITEL(reg, mfc_regs->e_rc_qp_bound);
/* other QPs */
- WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
if (!p->rc_frame && !p->rc_mb) {
reg = 0;
reg |= ((p_mpeg4->rc_b_frame_qp & 0x3F) << 16);
reg |= ((p_mpeg4->rc_p_frame_qp & 0x3F) << 8);
reg |= p_mpeg4->rc_frame_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(reg, mfc_regs->e_fixed_picture_qp);
}
/* frame rate */
@@ -1087,21 +1094,21 @@ static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
reg = 0;
reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
reg |= p->rc_framerate_denom & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
+ WRITEL(reg, mfc_regs->e_rc_frame_rate);
}
/* vbv buffer size */
if (p->frame_skip_mode ==
V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
- WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
+ WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
if (p->rc_frame)
- WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
+ WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
}
/* Disable HEC */
- WRITEL(0x0, S5P_FIMV_E_MPEG4_OPTIONS_V6);
- WRITEL(0x0, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
+ WRITEL(0x0, mfc_regs->e_mpeg4_options);
+ WRITEL(0x0, mfc_regs->e_mpeg4_hec_period);
mfc_debug_leave();
@@ -1111,6 +1118,7 @@ static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_enc_params *p = &ctx->enc_params;
struct s5p_mfc_mpeg4_enc_params *p_h263 = &p->codec.mpeg4;
unsigned int reg = 0;
@@ -1123,18 +1131,19 @@ static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
reg = 0;
/** profile */
reg |= (0x1 << 4);
- WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
+ WRITEL(reg, mfc_regs->e_picture_profile);
/* rate control config. */
- reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
+ reg = READL(mfc_regs->e_rc_config);
/** macroblock level rate control */
reg &= ~(0x1 << 8);
reg |= ((p->rc_mb & 0x1) << 8);
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
+
/** frame QP */
reg &= ~(0x3F);
reg |= p_h263->rc_frame_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* max & min value of QP */
reg = 0;
@@ -1142,16 +1151,16 @@ static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
reg |= ((p_h263->rc_max_qp & 0x3F) << 8);
/** min QP */
reg |= p_h263->rc_min_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
+ WRITEL(reg, mfc_regs->e_rc_qp_bound);
/* other QPs */
- WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
if (!p->rc_frame && !p->rc_mb) {
reg = 0;
reg |= ((p_h263->rc_b_frame_qp & 0x3F) << 16);
reg |= ((p_h263->rc_p_frame_qp & 0x3F) << 8);
reg |= p_h263->rc_frame_qp & 0x3F;
- WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(reg, mfc_regs->e_fixed_picture_qp);
}
/* frame rate */
@@ -1159,16 +1168,16 @@ static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
reg = 0;
reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
reg |= p->rc_framerate_denom & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
+ WRITEL(reg, mfc_regs->e_rc_frame_rate);
}
/* vbv buffer size */
if (p->frame_skip_mode ==
V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
- WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
+ WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
if (p->rc_frame)
- WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
+ WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
}
mfc_debug_leave();
@@ -1179,6 +1188,7 @@ static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_enc_params *p = &ctx->enc_params;
struct s5p_mfc_vp8_enc_params *p_vp8 = &p->codec.vp8;
unsigned int reg = 0;
@@ -1189,57 +1199,57 @@ static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
s5p_mfc_set_enc_params(ctx);
/* pictype : number of B */
- reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
+ reg = READL(mfc_regs->e_gop_config);
reg &= ~(0x3 << 16);
reg |= ((p->num_b_frame & 0x3) << 16);
- WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_gop_config);
/* profile - 0 ~ 3 */
reg = p_vp8->profile & 0x3;
- WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
+ WRITEL(reg, mfc_regs->e_picture_profile);
/* rate control config. */
- reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
+ reg = READL(mfc_regs->e_rc_config);
/** macroblock level rate control */
reg &= ~(0x1 << 8);
reg |= ((p->rc_mb & 0x1) << 8);
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* frame rate */
if (p->rc_frame && p->rc_framerate_num && p->rc_framerate_denom) {
reg = 0;
reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
reg |= p->rc_framerate_denom & 0xFFFF;
- WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
+ WRITEL(reg, mfc_regs->e_rc_frame_rate);
}
/* frame QP */
reg &= ~(0x7F);
reg |= p_vp8->rc_frame_qp & 0x7F;
- WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
+ WRITEL(reg, mfc_regs->e_rc_config);
/* other QPs */
- WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
if (!p->rc_frame && !p->rc_mb) {
reg = 0;
reg |= ((p_vp8->rc_p_frame_qp & 0x7F) << 8);
reg |= p_vp8->rc_frame_qp & 0x7F;
- WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ WRITEL(reg, mfc_regs->e_fixed_picture_qp);
}
/* max QP */
reg = ((p_vp8->rc_max_qp & 0x7F) << 8);
/* min QP */
reg |= p_vp8->rc_min_qp & 0x7F;
- WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
+ WRITEL(reg, mfc_regs->e_rc_qp_bound);
/* vbv buffer size */
if (p->frame_skip_mode ==
V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
- WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
+ WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
if (p->rc_frame)
- WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
+ WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
}
/* VP8 specific params */
@@ -1263,7 +1273,7 @@ static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
}
reg |= (val & 0xF) << 3;
reg |= (p_vp8->num_ref & 0x2);
- WRITEL(reg, S5P_FIMV_E_VP8_OPTIONS_V7);
+ WRITEL(reg, mfc_regs->e_vp8_options);
mfc_debug_leave();
@@ -1297,6 +1307,7 @@ static bool s5p_mfc_is_v6_new(struct s5p_mfc_dev *dev)
static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
unsigned int reg = 0;
int fmo_aso_ctrl = 0;
@@ -1304,9 +1315,9 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
mfc_debug(2, "InstNo: %d/%d\n", ctx->inst_no,
S5P_FIMV_CH_SEQ_HEADER_V6);
mfc_debug(2, "BUFs: %08x %08x %08x\n",
- READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
- READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
- READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6));
+ READL(mfc_regs->d_cpb_buffer_addr),
+ READL(mfc_regs->d_cpb_buffer_addr),
+ READL(mfc_regs->d_cpb_buffer_addr));
/* FMO_ASO_CTRL - 0: Enable, 1: Disable */
reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6);
@@ -1317,11 +1328,11 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
* set to negative value. */
if (ctx->display_delay >= 0) {
reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6);
- WRITEL(ctx->display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
+ WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
}
if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
- WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->d_dec_options);
reg = 0;
}
@@ -1336,21 +1347,21 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
- WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->d_init_buffer_options);
else
- WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
+ WRITEL(reg, mfc_regs->d_dec_options);
/* 0: NV12(CbCr), 1: NV21(CrCb) */
if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV21M)
- WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
+ WRITEL(0x1, mfc_regs->pixel_format);
else
- WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
+ WRITEL(0x0, mfc_regs->pixel_format);
/* sei parse */
- WRITEL(ctx->sei_fp_parse & 0x1, S5P_FIMV_D_SEI_ENABLE_V6);
+ WRITEL(ctx->sei_fp_parse & 0x1, mfc_regs->d_sei_enable);
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
@@ -1361,11 +1372,12 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int flush)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
if (flush) {
dev->curr_ctx = ctx->num;
s5p_mfc_clean_ctx_int_flags(ctx);
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
}
@@ -1376,11 +1388,12 @@ static int s5p_mfc_decode_one_frame_v6(struct s5p_mfc_ctx *ctx,
enum s5p_mfc_decode_arg last_frame)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
- WRITEL(ctx->dec_dst_flag, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
- WRITEL(ctx->slice_interface & 0x1, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
+ WRITEL(ctx->dec_dst_flag, mfc_regs->d_available_dpb_flag_lower);
+ WRITEL(ctx->slice_interface & 0x1, mfc_regs->d_slice_if_enable);
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
/* Issue different commands to instance basing on whether it
* is the last frame or not. */
switch (last_frame) {
@@ -1404,6 +1417,7 @@ static int s5p_mfc_decode_one_frame_v6(struct s5p_mfc_ctx *ctx,
static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
if (ctx->codec_mode == S5P_MFC_CODEC_H264_ENC)
s5p_mfc_set_enc_params_h264(ctx);
@@ -1419,13 +1433,13 @@ static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
return -EINVAL;
}
- /* Set stride lengths */
+ /* Set stride lengths for v7 & above */
if (IS_MFCV7(dev)) {
- WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
- WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
+ WRITEL(ctx->img_width, mfc_regs->e_source_first_plane_stride);
+ WRITEL(ctx->img_width, mfc_regs->e_source_second_plane_stride);
}
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
@@ -1435,14 +1449,16 @@ static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
struct s5p_mfc_enc_params *p = &ctx->enc_params;
struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
int i;
if (p_h264->aso) {
- for (i = 0; i < 8; i++)
+ for (i = 0; i < ARRAY_SIZE(p_h264->aso_slice_order); i++) {
WRITEL(p_h264->aso_slice_order[i],
- S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6 + i * 4);
+ mfc_regs->e_h264_aso_slice_order_0 + i * 4);
+ }
}
return 0;
}
@@ -1451,6 +1467,7 @@ static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
{
struct s5p_mfc_dev *dev = ctx->dev;
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
mfc_debug(2, "++\n");
@@ -1461,7 +1478,7 @@ static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
s5p_mfc_set_slice_mode(ctx);
- WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
+ WRITEL(ctx->inst_no, mfc_regs->instance_id);
s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
S5P_FIMV_CH_FRAME_START_V6, NULL);
@@ -1836,28 +1853,26 @@ static void s5p_mfc_cleanup_queue_v6(struct list_head *lh, struct vb2_queue *vq)
static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
{
- mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
- mfc_write(dev, 0, S5P_FIMV_RISC2HOST_INT_V6);
+ const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
+ WRITEL(0, mfc_regs->risc2host_command);
+ WRITEL(0, mfc_regs->risc2host_int);
}
static void s5p_mfc_write_info_v6(struct s5p_mfc_ctx *ctx, unsigned int data,
unsigned int ofs)
{
- struct s5p_mfc_dev *dev = ctx->dev;
-
s5p_mfc_clock_on();
- WRITEL(data, ofs);
+ WRITEL(data, (void *)ofs);
s5p_mfc_clock_off();
}
static unsigned int
s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
{
- struct s5p_mfc_dev *dev = ctx->dev;
int ret;
s5p_mfc_clock_on();
- ret = READL(ofs);
+ ret = READL((void *)ofs);
s5p_mfc_clock_off();
return ret;
@@ -1865,50 +1880,51 @@ s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
static int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
+ return READL(dev->mfc_regs->d_display_first_plane_addr);
}
static int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
+ return READL(dev->mfc_regs->d_decoded_first_plane_addr);
}
static int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DISPLAY_STATUS_V6);
+ return READL(dev->mfc_regs->d_display_status);
}
static int s5p_mfc_get_dec_status_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DECODED_STATUS_V6);
+ return READL(dev->mfc_regs->d_decoded_status);
}
static int s5p_mfc_get_dec_frame_type_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DECODED_FRAME_TYPE_V6) &
+ return READL(dev->mfc_regs->d_decoded_frame_type) &
S5P_FIMV_DECODE_FRAME_MASK_V6;
}
static int s5p_mfc_get_disp_frame_type_v6(struct s5p_mfc_ctx *ctx)
{
- return mfc_read(ctx->dev, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6) &
+ struct s5p_mfc_dev *dev = ctx->dev;
+ return READL(dev->mfc_regs->d_display_frame_type) &
S5P_FIMV_DECODE_FRAME_MASK_V6;
}
static int s5p_mfc_get_consumed_stream_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
+ return READL(dev->mfc_regs->d_decoded_nal_size);
}
static int s5p_mfc_get_int_reason_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_RISC2HOST_CMD_V6) &
+ return READL(dev->mfc_regs->risc2host_command) &
S5P_FIMV_RISC2HOST_CMD_MASK;
}
static int s5p_mfc_get_int_err_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_ERROR_CODE_V6);
+ return READL(dev->mfc_regs->error_code);
}
static int s5p_mfc_err_dec_v6(unsigned int err)
@@ -1923,82 +1939,263 @@ static int s5p_mfc_err_dspl_v6(unsigned int err)
static int s5p_mfc_get_img_width_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
+ return READL(dev->mfc_regs->d_display_frame_width);
}
static int s5p_mfc_get_img_height_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
+ return READL(dev->mfc_regs->d_display_frame_height);
}
static int s5p_mfc_get_dpb_count_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_MIN_NUM_DPB_V6);
+ return READL(dev->mfc_regs->d_min_num_dpb);
}
static int s5p_mfc_get_mv_count_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_MIN_NUM_MV_V6);
+ return READL(dev->mfc_regs->d_min_num_mv);
}
static int s5p_mfc_get_inst_no_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_RET_INSTANCE_ID_V6);
+ return READL(dev->mfc_regs->ret_instance_id);
}
static int s5p_mfc_get_enc_dpb_count_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_E_NUM_DPB_V6);
+ return READL(dev->mfc_regs->e_num_dpb);
}
static int s5p_mfc_get_enc_strm_size_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_E_STREAM_SIZE_V6);
+ return READL(dev->mfc_regs->e_stream_size);
}
static int s5p_mfc_get_enc_slice_type_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_E_SLICE_TYPE_V6);
+ return READL(dev->mfc_regs->e_slice_type);
}
static int s5p_mfc_get_enc_pic_count_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_E_PICTURE_COUNT_V6);
+ return READL(dev->mfc_regs->e_picture_count);
}
static int s5p_mfc_get_sei_avail_status_v6(struct s5p_mfc_ctx *ctx)
{
- return mfc_read(ctx->dev, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
+ struct s5p_mfc_dev *dev = ctx->dev;
+ return READL(dev->mfc_regs->d_frame_pack_sei_avail);
}
static int s5p_mfc_get_mvc_num_views_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
+ return READL(dev->mfc_regs->d_mvc_num_views);
}
static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_MVC_VIEW_ID_V6);
+ return READL(dev->mfc_regs->d_mvc_view_id);
}
static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx *ctx)
{
- return s5p_mfc_read_info_v6(ctx, PIC_TIME_TOP_V6);
+ return s5p_mfc_read_info_v6(ctx,
+ (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top);
}
static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx *ctx)
{
- return s5p_mfc_read_info_v6(ctx, PIC_TIME_BOT_V6);
+ return s5p_mfc_read_info_v6(ctx,
+ (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot);
}
static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx)
{
- return s5p_mfc_read_info_v6(ctx, CROP_INFO_H_V6);
+ return s5p_mfc_read_info_v6(ctx,
+ (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
}
static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
{
- return s5p_mfc_read_info_v6(ctx, CROP_INFO_V_V6);
+ return s5p_mfc_read_info_v6(ctx,
+ (unsigned int) ctx->dev->mfc_regs->d_display_crop_info2);
+}
+
+static struct s5p_mfc_regs mfc_regs;
+
+/* Initialize registers for MFC v6 onwards */
+const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev)
+{
+ memset(&mfc_regs, 0, sizeof(mfc_regs));
+
+#define S5P_MFC_REG_ADDR(dev, reg) ((dev)->regs_base + (reg))
+#define R(m, r) mfc_regs.m = S5P_MFC_REG_ADDR(dev, r)
+ /* codec common registers */
+ R(risc_on, S5P_FIMV_RISC_ON_V6);
+ R(risc2host_int, S5P_FIMV_RISC2HOST_INT_V6);
+ R(host2risc_int, S5P_FIMV_HOST2RISC_INT_V6);
+ R(risc_base_address, S5P_FIMV_RISC_BASE_ADDRESS_V6);
+ R(mfc_reset, S5P_FIMV_MFC_RESET_V6);
+ R(host2risc_command, S5P_FIMV_HOST2RISC_CMD_V6);
+ R(risc2host_command, S5P_FIMV_RISC2HOST_CMD_V6);
+ R(firmware_version, S5P_FIMV_FW_VERSION_V6);
+ R(instance_id, S5P_FIMV_INSTANCE_ID_V6);
+ R(codec_type, S5P_FIMV_CODEC_TYPE_V6);
+ R(context_mem_addr, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
+ R(context_mem_size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
+ R(pixel_format, S5P_FIMV_PIXEL_FORMAT_V6);
+ R(ret_instance_id, S5P_FIMV_RET_INSTANCE_ID_V6);
+ R(error_code, S5P_FIMV_ERROR_CODE_V6);
+
+ /* decoder registers */
+ R(d_crc_ctrl, S5P_FIMV_D_CRC_CTRL_V6);
+ R(d_dec_options, S5P_FIMV_D_DEC_OPTIONS_V6);
+ R(d_display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
+ R(d_sei_enable, S5P_FIMV_D_SEI_ENABLE_V6);
+ R(d_min_num_dpb, S5P_FIMV_D_MIN_NUM_DPB_V6);
+ R(d_min_num_mv, S5P_FIMV_D_MIN_NUM_MV_V6);
+ R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
+ R(d_num_dpb, S5P_FIMV_D_NUM_DPB_V6);
+ R(d_num_mv, S5P_FIMV_D_NUM_MV_V6);
+ R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
+ R(d_first_plane_dpb_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
+ R(d_second_plane_dpb_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
+ R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
+ R(d_first_plane_dpb, S5P_FIMV_D_LUMA_DPB_V6);
+ R(d_second_plane_dpb, S5P_FIMV_D_CHROMA_DPB_V6);
+ R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V6);
+ R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
+ R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
+ R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
+ R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
+ R(d_available_dpb_flag_lower, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
+ R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
+ R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
+ R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
+ R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
+ R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
+ R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V6);
+ R(d_display_first_plane_addr, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
+ R(d_display_second_plane_addr, S5P_FIMV_D_DISPLAY_CHROMA_ADDR_V6);
+ R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6);
+ R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V6);
+ R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V6);
+ R(d_display_aspect_ratio, S5P_FIMV_D_DISPLAY_ASPECT_RATIO_V6);
+ R(d_display_extended_ar, S5P_FIMV_D_DISPLAY_EXTENDED_AR_V6);
+ R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V6);
+ R(d_decoded_first_plane_addr, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
+ R(d_decoded_second_plane_addr, S5P_FIMV_D_DECODED_CHROMA_ADDR_V6);
+ R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V6);
+ R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
+ R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6);
+ R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6);
+ R(d_h264_info, S5P_FIMV_D_H264_INFO_V6);
+ R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V6);
+ R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
+
+ /* encoder registers */
+ R(e_frame_width, S5P_FIMV_E_FRAME_WIDTH_V6);
+ R(e_frame_height, S5P_FIMV_E_FRAME_HEIGHT_V6);
+ R(e_cropped_frame_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
+ R(e_cropped_frame_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
+ R(e_frame_crop_offset, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
+ R(e_enc_options, S5P_FIMV_E_ENC_OPTIONS_V6);
+ R(e_picture_profile, S5P_FIMV_E_PICTURE_PROFILE_V6);
+ R(e_vbv_buffer_size, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
+ R(e_vbv_init_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
+ R(e_fixed_picture_qp, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
+ R(e_rc_config, S5P_FIMV_E_RC_CONFIG_V6);
+ R(e_rc_qp_bound, S5P_FIMV_E_RC_QP_BOUND_V6);
+ R(e_rc_mode, S5P_FIMV_E_RC_RPARAM_V6);
+ R(e_mb_rc_config, S5P_FIMV_E_MB_RC_CONFIG_V6);
+ R(e_padding_ctrl, S5P_FIMV_E_PADDING_CTRL_V6);
+ R(e_mv_hor_range, S5P_FIMV_E_MV_HOR_RANGE_V6);
+ R(e_mv_ver_range, S5P_FIMV_E_MV_VER_RANGE_V6);
+ R(e_num_dpb, S5P_FIMV_E_NUM_DPB_V6);
+ R(e_luma_dpb, S5P_FIMV_E_LUMA_DPB_V6);
+ R(e_chroma_dpb, S5P_FIMV_E_CHROMA_DPB_V6);
+ R(e_me_buffer, S5P_FIMV_E_ME_BUFFER_V6);
+ R(e_scratch_buffer_addr, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
+ R(e_scratch_buffer_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
+ R(e_tmv_buffer0, S5P_FIMV_E_TMV_BUFFER0_V6);
+ R(e_tmv_buffer1, S5P_FIMV_E_TMV_BUFFER1_V6);
+ R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
+ R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
+ R(e_stream_buffer_addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6);
+ R(e_stream_buffer_size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
+ R(e_roi_buffer_addr, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
+ R(e_param_change, S5P_FIMV_E_PARAM_CHANGE_V6);
+ R(e_ir_size, S5P_FIMV_E_IR_SIZE_V6);
+ R(e_gop_config, S5P_FIMV_E_GOP_CONFIG_V6);
+ R(e_mslice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
+ R(e_mslice_size_mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
+ R(e_mslice_size_bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
+ R(e_frame_insertion, S5P_FIMV_E_FRAME_INSERTION_V6);
+ R(e_rc_frame_rate, S5P_FIMV_E_RC_FRAME_RATE_V6);
+ R(e_rc_bit_rate, S5P_FIMV_E_RC_BIT_RATE_V6);
+ R(e_rc_roi_ctrl, S5P_FIMV_E_RC_ROI_CTRL_V6);
+ R(e_picture_tag, S5P_FIMV_E_PICTURE_TAG_V6);
+ R(e_bit_count_enable, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
+ R(e_max_bit_count, S5P_FIMV_E_MAX_BIT_COUNT_V6);
+ R(e_min_bit_count, S5P_FIMV_E_MIN_BIT_COUNT_V6);
+ R(e_metadata_buffer_addr, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
+ R(e_metadata_buffer_size, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
+ R(e_encoded_source_first_plane_addr,
+ S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
+ R(e_encoded_source_second_plane_addr,
+ S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
+ R(e_stream_size, S5P_FIMV_E_STREAM_SIZE_V6);
+ R(e_slice_type, S5P_FIMV_E_SLICE_TYPE_V6);
+ R(e_picture_count, S5P_FIMV_E_PICTURE_COUNT_V6);
+ R(e_ret_picture_tag, S5P_FIMV_E_RET_PICTURE_TAG_V6);
+ R(e_recon_luma_dpb_addr, S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
+ R(e_recon_chroma_dpb_addr, S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
+ R(e_mpeg4_options, S5P_FIMV_E_MPEG4_OPTIONS_V6);
+ R(e_mpeg4_hec_period, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
+ R(e_aspect_ratio, S5P_FIMV_E_ASPECT_RATIO_V6);
+ R(e_extended_sar, S5P_FIMV_E_EXTENDED_SAR_V6);
+ R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V6);
+ R(e_h264_lf_alpha_offset, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
+ R(e_h264_lf_beta_offset, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
+ R(e_h264_i_period, S5P_FIMV_E_H264_I_PERIOD_V6);
+ R(e_h264_fmo_slice_grp_map_type,
+ S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
+ R(e_h264_fmo_num_slice_grp_minus1,
+ S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
+ R(e_h264_fmo_slice_grp_change_dir,
+ S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
+ R(e_h264_fmo_slice_grp_change_rate_minus1,
+ S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
+ R(e_h264_fmo_run_length_minus1_0,
+ S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6);
+ R(e_h264_aso_slice_order_0, S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6);
+ R(e_h264_num_t_layer, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
+ R(e_h264_hierarchical_qp_layer0,
+ S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6);
+ R(e_h264_frame_packing_sei_info,
+ S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
+
+ if (!IS_MFCV7(dev))
+ goto done;
+
+ /* Initialize registers used in MFC v7 */
+ R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
+ R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
+ R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
+ R(e_source_first_plane_stride, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
+ R(e_source_second_plane_stride, S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
+ R(e_source_third_plane_stride, S5P_FIMV_E_SOURCE_THIRD_STRIDE_V7);
+ R(e_encoded_source_first_plane_addr,
+ S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
+ R(e_encoded_source_second_plane_addr,
+ S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
+ R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
+
+done:
+ return &mfc_regs;
+#undef S5P_MFC_REG_ADDR
+#undef R
}
/* Initialize opr function pointers for MFC v6 */
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
index ab164ef..8055848 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
@@ -40,11 +40,6 @@
#define FRAME_DELTA_H264_H263 1
#define TIGHT_CBR_MAX 10
-/* Definitions for shared memory compatibility */
-#define PIC_TIME_TOP_V6 S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6
-#define PIC_TIME_BOT_V6 S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6
-#define CROP_INFO_H_V6 S5P_FIMV_D_DISPLAY_CROP_INFO1_V6
-#define CROP_INFO_V_V6 S5P_FIMV_D_DISPLAY_CROP_INFO2_V6
-
struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
+const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev);
#endif /* S5P_MFC_OPR_V6_H_ */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder
2014-04-23 12:57 [PATCH 0/3] Add MFCv8 support Arun Kumar K
2014-04-23 12:57 ` [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers Arun Kumar K
@ 2014-04-23 12:57 ` Arun Kumar K
2014-04-29 17:15 ` Sachin Kamat
2014-04-23 12:57 ` [PATCH 3/3] [media] s5p-mfc: Rename IS_MFCV7 macro Arun Kumar K
2 siblings, 1 reply; 16+ messages in thread
From: Arun Kumar K @ 2014-04-23 12:57 UTC (permalink / raw)
To: linux-media, linux-samsung-soc
Cc: k.debski, s.nawrocki, posciak, avnd.kiran, arunkk.samsung
From: Kiran AVND <avnd.kiran@samsung.com>
This patch adds variant data and core support for
V8 decoder. This patch also adds the register definition
file for new firmware version v8 for MFC.
Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
Signed-off-by: Pawel Osciak <posciak@chromium.org>
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
.../devicetree/bindings/media/s5p-mfc.txt | 3 +-
drivers/media/platform/s5p-mfc/regs-mfc-v8.h | 93 ++++++++++++++++++++
drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 +
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 85 ++++++++++++++++--
6 files changed, 209 insertions(+), 10 deletions(-)
create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v8.h
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index f418168..3e3c5f3 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -10,7 +10,8 @@ Required properties:
- compatible : value should be either one among the following
(a) "samsung,mfc-v5" for MFC v5 present in Exynos4 SoCs
(b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs
- (b) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC
+ (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC
+ (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC
- reg : Physical base address of the IP registers and length of memory
mapped region.
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/platform/s5p-mfc/regs-mfc-v8.h
new file mode 100644
index 0000000..747907c
--- /dev/null
+++ b/drivers/media/platform/s5p-mfc/regs-mfc-v8.h
@@ -0,0 +1,93 @@
+/*
+ * Register definition file for Samsung MFC V8.x Interface (FIMV) driver
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _REGS_MFC_V8_H
+#define _REGS_MFC_V8_H
+
+#include "regs-mfc-v7.h"
+
+/* Additional registers for v8 */
+#define S5P_FIMV_D_MVC_NUM_VIEWS_V8 0xf104
+#define S5P_FIMV_D_FIRST_PLANE_DPB_SIZE_V8 0xf144
+#define S5P_FIMV_D_SECOND_PLANE_DPB_SIZE_V8 0xf148
+#define S5P_FIMV_D_MV_BUFFER_SIZE_V8 0xf150
+
+#define S5P_FIMV_D_FIRST_PLANE_DPB_STRIDE_SIZE_V8 0xf138
+#define S5P_FIMV_D_SECOND_PLANE_DPB_STRIDE_SIZE_V8 0xf13c
+
+#define S5P_FIMV_D_FIRST_PLANE_DPB_V8 0xf160
+#define S5P_FIMV_D_SECOND_PLANE_DPB_V8 0xf260
+#define S5P_FIMV_D_MV_BUFFER_V8 0xf460
+
+#define S5P_FIMV_D_NUM_MV_V8 0xf134
+#define S5P_FIMV_D_INIT_BUFFER_OPTIONS_V8 0xf154
+
+#define S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V8 0xf560
+#define S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V8 0xf564
+
+#define S5P_FIMV_D_CPB_BUFFER_ADDR_V8 0xf5b0
+#define S5P_FIMV_D_CPB_BUFFER_SIZE_V8 0xf5b4
+#define S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V8 0xf5bc
+#define S5P_FIMV_D_CPB_BUFFER_OFFSET_V8 0xf5c0
+#define S5P_FIMV_D_SLICE_IF_ENABLE_V8 0xf5c4
+#define S5P_FIMV_D_STREAM_DATA_SIZE_V8 0xf5d0
+
+/* Display information register */
+#define S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V8 0xf600
+#define S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V8 0xf604
+
+/* Display status */
+#define S5P_FIMV_D_DISPLAY_STATUS_V8 0xf608
+
+#define S5P_FIMV_D_DISPLAY_FIRST_PLANE_ADDR_V8 0xf60c
+#define S5P_FIMV_D_DISPLAY_SECOND_PLANE_ADDR_V8 0xf610
+
+#define S5P_FIMV_D_DISPLAY_FRAME_TYPE_V8 0xf618
+#define S5P_FIMV_D_DISPLAY_CROP_INFO1_V8 0xf61c
+#define S5P_FIMV_D_DISPLAY_CROP_INFO2_V8 0xf620
+#define S5P_FIMV_D_DISPLAY_PICTURE_PROFILE_V8 0xf624
+
+/* Decoded picture information register */
+#define S5P_FIMV_D_DECODED_STATUS_V8 0xf644
+#define S5P_FIMV_D_DECODED_FIRST_PLANE_ADDR_V8 0xf648
+#define S5P_FIMV_D_DECODED_SECOND_PLANE_ADDR_V8 0xf64c
+#define S5P_FIMV_D_DECODED_THIRD_PLANE_ADDR_V8 0xf650
+#define S5P_FIMV_D_DECODED_FRAME_TYPE_V8 0xf654
+#define S5P_FIMV_D_DECODED_NAL_SIZE_V8 0xf664
+
+/* Returned value register for specific setting */
+#define S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8 0xf674
+#define S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8 0xf678
+#define S5P_FIMV_D_MVC_VIEW_ID_V8 0xf6d8
+
+/* SEI related information */
+#define S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8 0xf6dc
+
+/* MFCv8 Context buffer sizes */
+#define MFC_CTX_BUF_SIZE_V8 (30 * SZ_1K) /* 30KB */
+#define MFC_H264_DEC_CTX_BUF_SIZE_V8 (2 * SZ_1M) /* 2MB */
+#define MFC_OTHER_DEC_CTX_BUF_SIZE_V8 (20 * SZ_1K) /* 20KB */
+
+/* Buffer size defines */
+#define S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V8(w, h) (((w) * 704) + 2176)
+#define S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V8(w, h) \
+ (((w) * 576 + (h) * 128) + 4128)
+
+/* BUffer alignment defines */
+#define S5P_FIMV_D_ALIGN_PLANE_SIZE_V8 64
+
+/* MFCv8 variant defines */
+#define MAX_FW_SIZE_V8 (SZ_1M) /* 1MB */
+#define MAX_CPB_SIZE_V8 (3 * SZ_1M) /* 3MB */
+#define MFC_VERSION_V8 0x80
+#define MFC_NUM_PORTS_V8 1
+
+#endif /*_REGS_MFC_V8_H*/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 07ebac8..a12410f 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1435,6 +1435,30 @@ static struct s5p_mfc_variant mfc_drvdata_v7 = {
.fw_name = "s5p-mfc-v7.fw",
};
+struct s5p_mfc_buf_size_v6 mfc_buf_size_v8 = {
+ .dev_ctx = MFC_CTX_BUF_SIZE_V8,
+ .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V8,
+ .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V8,
+};
+
+struct s5p_mfc_buf_size buf_size_v8 = {
+ .fw = MAX_FW_SIZE_V8,
+ .cpb = MAX_CPB_SIZE_V8,
+ .priv = &mfc_buf_size_v8,
+};
+
+struct s5p_mfc_buf_align mfc_buf_align_v8 = {
+ .base = 0,
+};
+
+static struct s5p_mfc_variant mfc_drvdata_v8 = {
+ .version = MFC_VERSION_V8,
+ .port_num = MFC_NUM_PORTS_V8,
+ .buf_size = &buf_size_v8,
+ .buf_align = &mfc_buf_align_v8,
+ .fw_name = "s5p-mfc-v8.fw",
+};
+
static struct platform_device_id mfc_driver_ids[] = {
{
.name = "s5p-mfc",
@@ -1448,6 +1472,9 @@ static struct platform_device_id mfc_driver_ids[] = {
}, {
.name = "s5p-mfc-v7",
.driver_data = (unsigned long)&mfc_drvdata_v7,
+ }, {
+ .name = "s5p-mfc-v8",
+ .driver_data = (unsigned long)&mfc_drvdata_v8,
},
{},
};
@@ -1463,6 +1490,9 @@ static const struct of_device_id exynos_mfc_match[] = {
}, {
.compatible = "samsung,mfc-v7",
.data = &mfc_drvdata_v7,
+ }, {
+ .compatible = "samsung,mfc-v8",
+ .data = &mfc_drvdata_v8,
},
{},
};
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 48a14b5..f0e63f5 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -23,8 +23,7 @@
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-core.h>
#include "regs-mfc.h"
-#include "regs-mfc-v6.h"
-#include "regs-mfc-v7.h"
+#include "regs-mfc-v8.h"
/* Definitions related to MFC memory */
@@ -705,5 +704,6 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
#define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1 : 0)
#define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0)
#define IS_MFCV7(dev) (dev->variant->version >= 0x70 ? 1 : 0)
+#define IS_MFCV8(dev) (dev->variant->version >= 0x80 ? 1 : 0)
#endif /* S5P_MFC_COMMON_H_ */
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 069d354..ad0a47e 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -403,6 +403,10 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
(fmt->fourcc == V4L2_PIX_FMT_NV12MT)) {
mfc_err("Not supported format.\n");
return -EINVAL;
+ } else if (IS_MFCV8(dev) &&
+ (fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16)) {
+ mfc_err("Not supported format.\n");
+ return -EINVAL;
} else if (!IS_MFCV6_PLUS(dev) &&
(fmt->fourcc != V4L2_PIX_FMT_NV12MT)) {
mfc_err("Not supported format.\n");
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 65b8d20..4324f2e 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -103,8 +103,14 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
switch (ctx->codec_mode) {
case S5P_MFC_CODEC_H264_DEC:
case S5P_MFC_CODEC_H264_MVC_DEC:
- ctx->scratch_buf_size =
- S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V6(
+ if (IS_MFCV8(dev))
+ ctx->scratch_buf_size =
+ S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V8(
+ mb_width,
+ mb_height);
+ else
+ ctx->scratch_buf_size =
+ S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V6(
mb_width,
mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
@@ -154,10 +160,16 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
ctx->bank1.size = ctx->scratch_buf_size;
break;
case S5P_MFC_CODEC_VP8_DEC:
- ctx->scratch_buf_size =
- S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V6(
- mb_width,
- mb_height);
+ if (IS_MFCV8(dev))
+ ctx->scratch_buf_size =
+ S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V8(
+ mb_width,
+ mb_height);
+ else
+ ctx->scratch_buf_size =
+ S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V6(
+ mb_width,
+ mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1.size = ctx->scratch_buf_size;
@@ -333,6 +345,12 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx)
ctx->luma_size = calc_plane(ctx->img_width, ctx->img_height);
ctx->chroma_size = calc_plane(ctx->img_width, (ctx->img_height >> 1));
+ if (IS_MFCV8(ctx->dev)) {
+ /* MFCv8 needs additional 64 bytes for luma,chroma dpb*/
+ ctx->luma_size += S5P_FIMV_D_ALIGN_PLANE_SIZE_V8;
+ ctx->chroma_size += S5P_FIMV_D_ALIGN_PLANE_SIZE_V8;
+ }
+
if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {
ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V6(ctx->img_width,
@@ -407,6 +425,14 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
WRITEL(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
+
+ if (IS_MFCV8(dev)) {
+ WRITEL(ctx->img_width,
+ mfc_regs->d_first_plane_dpb_stride_size);
+ WRITEL(ctx->img_width,
+ mfc_regs->d_second_plane_dpb_stride_size);
+ }
+
buf_addr1 += ctx->scratch_buf_size;
buf_size1 -= ctx->scratch_buf_size;
@@ -2179,7 +2205,7 @@ const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev)
if (!IS_MFCV7(dev))
goto done;
- /* Initialize registers used in MFC v7 */
+ /* Initialize registers used in MFC v7+ */
R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
@@ -2192,6 +2218,51 @@ const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev)
S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
+ if (!IS_MFCV8(dev))
+ goto done;
+
+ /* Initialize registers used in MFC v8 only.
+ * Also, over-write the registers which have
+ * a different offset for MFC v8. */
+ R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V8);
+ R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V8);
+ R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V8);
+ R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V8);
+ R(d_first_plane_dpb_size, S5P_FIMV_D_FIRST_PLANE_DPB_SIZE_V8);
+ R(d_second_plane_dpb_size, S5P_FIMV_D_SECOND_PLANE_DPB_SIZE_V8);
+ R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V8);
+ R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V8);
+ R(d_first_plane_dpb_stride_size,
+ S5P_FIMV_D_FIRST_PLANE_DPB_STRIDE_SIZE_V8);
+ R(d_second_plane_dpb_stride_size,
+ S5P_FIMV_D_SECOND_PLANE_DPB_STRIDE_SIZE_V8);
+ R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V8);
+ R(d_num_mv, S5P_FIMV_D_NUM_MV_V8);
+ R(d_first_plane_dpb, S5P_FIMV_D_FIRST_PLANE_DPB_V8);
+ R(d_second_plane_dpb, S5P_FIMV_D_SECOND_PLANE_DPB_V8);
+ R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V8);
+ R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V8);
+ R(d_available_dpb_flag_lower, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V8);
+ R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V8);
+ R(d_display_first_plane_addr, S5P_FIMV_D_DISPLAY_FIRST_PLANE_ADDR_V8);
+ R(d_display_second_plane_addr, S5P_FIMV_D_DISPLAY_SECOND_PLANE_ADDR_V8);
+ R(d_decoded_first_plane_addr, S5P_FIMV_D_DECODED_FIRST_PLANE_ADDR_V8);
+ R(d_decoded_second_plane_addr, S5P_FIMV_D_DECODED_SECOND_PLANE_ADDR_V8);
+ R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V8);
+ R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V8);
+ R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V8);
+ R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V8);
+ R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V8);
+ R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V8);
+ R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V8);
+ R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8);
+ R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V8);
+ R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V8);
+ R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8);
+ R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8);
+ R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V8);
+ R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V8);
+
done:
return &mfc_regs;
#undef S5P_MFC_REG_ADDR
--
1.7.9.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/3] [media] s5p-mfc: Rename IS_MFCV7 macro
2014-04-23 12:57 [PATCH 0/3] Add MFCv8 support Arun Kumar K
2014-04-23 12:57 ` [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers Arun Kumar K
2014-04-23 12:57 ` [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder Arun Kumar K
@ 2014-04-23 12:57 ` Arun Kumar K
2 siblings, 0 replies; 16+ messages in thread
From: Arun Kumar K @ 2014-04-23 12:57 UTC (permalink / raw)
To: linux-media, linux-samsung-soc
Cc: k.debski, s.nawrocki, posciak, avnd.kiran, arunkk.samsung
With the inclusion of MFCv8 which reuses the v7 code,
the macro IS_MFCV7 is modified to IS_MFCV7_PLUS.
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index f0e63f5..d64b680 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -703,7 +703,7 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
(dev->variant->port_num ? 1 : 0) : 0) : 0)
#define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1 : 0)
#define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0)
-#define IS_MFCV7(dev) (dev->variant->version >= 0x70 ? 1 : 0)
+#define IS_MFCV7_PLUS(dev) (dev->variant->version >= 0x70 ? 1 : 0)
#define IS_MFCV8(dev) (dev->variant->version >= 0x80 ? 1 : 0)
#endif /* S5P_MFC_COMMON_H_ */
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index f8c7053..a9a23e1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1045,7 +1045,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
return -EINVAL;
}
- if (!IS_MFCV7(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
+ if (!IS_MFCV7_PLUS(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
mfc_err("VP8 is supported only in MFC v7\n");
return -EINVAL;
}
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 4324f2e..d0705b1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -120,7 +120,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
(ctx->mv_count * ctx->mv_size);
break;
case S5P_MFC_CODEC_MPEG4_DEC:
- if (IS_MFCV7(dev)) {
+ if (IS_MFCV7_PLUS(dev)) {
ctx->scratch_buf_size =
S5P_FIMV_SCRATCH_BUF_SIZE_MPEG4_DEC_V7(
mb_width,
@@ -373,7 +373,7 @@ static void s5p_mfc_enc_calc_src_size_v6(struct s5p_mfc_ctx *ctx)
ctx->chroma_size = ALIGN((mb_width * mb_height) * 128, 256);
/* MFCv7 needs pad bytes for Luma and Chroma */
- if (IS_MFCV7(ctx->dev)) {
+ if (IS_MFCV7_PLUS(ctx->dev)) {
ctx->luma_size += MFC_LUMA_PAD_BYTES_V7;
ctx->chroma_size += MFC_CHROMA_PAD_BYTES_V7;
}
@@ -1312,7 +1312,7 @@ static bool s5p_mfc_is_v6_new(struct s5p_mfc_dev *dev)
unsigned long cur_fw, v6_new_fw;
unsigned int y, m, d;
- if (IS_MFCV7(dev))
+ if (IS_MFCV7_PLUS(dev))
return false;
y = bcd2bin((dev->ver >> 16) & 0xFF) + 2000;
@@ -1357,7 +1357,7 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
}
- if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
+ if (IS_MFCV7_PLUS(dev) || s5p_mfc_is_v6_new(dev)) {
WRITEL(reg, mfc_regs->d_dec_options);
reg = 0;
}
@@ -1372,7 +1372,7 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16)
reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
- if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
+ if (IS_MFCV7_PLUS(dev) || s5p_mfc_is_v6_new(dev))
WRITEL(reg, mfc_regs->d_init_buffer_options);
else
WRITEL(reg, mfc_regs->d_dec_options);
@@ -1460,7 +1460,7 @@ static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
}
/* Set stride lengths for v7 & above */
- if (IS_MFCV7(dev)) {
+ if (IS_MFCV7_PLUS(dev)) {
WRITEL(ctx->img_width, mfc_regs->e_source_first_plane_stride);
WRITEL(ctx->img_width, mfc_regs->e_source_second_plane_stride);
}
@@ -2202,7 +2202,7 @@ const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev)
R(e_h264_frame_packing_sei_info,
S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
- if (!IS_MFCV7(dev))
+ if (!IS_MFCV7_PLUS(dev))
goto done;
/* Initialize registers used in MFC v7+ */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder
2014-04-23 12:57 ` [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder Arun Kumar K
@ 2014-04-29 17:15 ` Sachin Kamat
2014-04-30 5:45 ` Arun Kumar K
0 siblings, 1 reply; 16+ messages in thread
From: Sachin Kamat @ 2014-04-29 17:15 UTC (permalink / raw)
To: Arun Kumar K
Cc: linux-media, linux-samsung-soc, Kamil Debski, Sylwester Nawrocki,
Pawel Osciak, Kiran Avnd, Arun Kumar
Hi Arun,
On 23 April 2014 18:27, Arun Kumar K <arun.kk@samsung.com> wrote:
> From: Kiran AVND <avnd.kiran@samsung.com>
>
> This patch adds variant data and core support for
> V8 decoder. This patch also adds the register definition
> file for new firmware version v8 for MFC.
>
> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
> Signed-off-by: Pawel Osciak <posciak@chromium.org>
> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> ---
<...>
> +
> +/* Returned value register for specific setting */
> +#define S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8 0xf674
> +#define S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8 0xf678
> +#define S5P_FIMV_D_MVC_VIEW_ID_V8 0xf6d8
> +
> +/* SEI related information */
> +#define S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8 0xf6dc
> +
> +/* MFCv8 Context buffer sizes */
> +#define MFC_CTX_BUF_SIZE_V8 (30 * SZ_1K) /* 30KB */
Please include header file for size macros.
<...>
> };
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> index 48a14b5..f0e63f5 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> @@ -23,8 +23,7 @@
> #include <media/v4l2-ioctl.h>
> #include <media/videobuf2-core.h>
> #include "regs-mfc.h"
> -#include "regs-mfc-v6.h"
> -#include "regs-mfc-v7.h"
> +#include "regs-mfc-v8.h"
>
> /* Definitions related to MFC memory */
>
> @@ -705,5 +704,6 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
> #define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1 : 0)
> #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0)
> #define IS_MFCV7(dev) (dev->variant->version >= 0x70 ? 1 : 0)
Is MFC v8 superset of MFC v7?
> +#define IS_MFCV8(dev) (dev->variant->version >= 0x80 ? 1 : 0)
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder
2014-04-29 17:15 ` Sachin Kamat
@ 2014-04-30 5:45 ` Arun Kumar K
2014-04-30 5:49 ` Sachin Kamat
0 siblings, 1 reply; 16+ messages in thread
From: Arun Kumar K @ 2014-04-30 5:45 UTC (permalink / raw)
To: Sachin Kamat, Arun Kumar K
Cc: linux-media, linux-samsung-soc, Kamil Debski, Sylwester Nawrocki,
Pawel Osciak, Kiran Avnd
Hi Sachin,
Thank you for the review.
On 04/29/14 22:45, Sachin Kamat wrote:
> Hi Arun,
>
> On 23 April 2014 18:27, Arun Kumar K <arun.kk@samsung.com> wrote:
>> From: Kiran AVND <avnd.kiran@samsung.com>
>>
>> This patch adds variant data and core support for
>> V8 decoder. This patch also adds the register definition
>> file for new firmware version v8 for MFC.
>>
>> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
>> Signed-off-by: Pawel Osciak <posciak@chromium.org>
>> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
>> ---
> <...>
>> +
>> +/* Returned value register for specific setting */
>> +#define S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8 0xf674
>> +#define S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8 0xf678
>> +#define S5P_FIMV_D_MVC_VIEW_ID_V8 0xf6d8
>> +
>> +/* SEI related information */
>> +#define S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8 0xf6dc
>> +
>> +/* MFCv8 Context buffer sizes */
>> +#define MFC_CTX_BUF_SIZE_V8 (30 * SZ_1K) /* 30KB */
>
> Please include header file for size macros.
>
The file linux/sizes.h is included in regs-mfc-v6.h which
inturn gets included in this file. Isnt that fine?
> <...>
>> };
>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>> index 48a14b5..f0e63f5 100644
>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>> @@ -23,8 +23,7 @@
>> #include <media/v4l2-ioctl.h>
>> #include <media/videobuf2-core.h>
>> #include "regs-mfc.h"
>> -#include "regs-mfc-v6.h"
>> -#include "regs-mfc-v7.h"
>> +#include "regs-mfc-v8.h"
>>
>> /* Definitions related to MFC memory */
>>
>> @@ -705,5 +704,6 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
>> #define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1 : 0)
>> #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0)
>> #define IS_MFCV7(dev) (dev->variant->version >= 0x70 ? 1 : 0)
>
> Is MFC v8 superset of MFC v7?
>
Yes it is a superset.
So the last patch in this series renames IS_MFCV7 to IS_MFCV7_PLUS.
Regards
Arun
>> +#define IS_MFCV8(dev) (dev->variant->version >= 0x80 ? 1 : 0)
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder
2014-04-30 5:45 ` Arun Kumar K
@ 2014-04-30 5:49 ` Sachin Kamat
2014-04-30 5:52 ` Arun Kumar K
0 siblings, 1 reply; 16+ messages in thread
From: Sachin Kamat @ 2014-04-30 5:49 UTC (permalink / raw)
To: Arun Kumar K
Cc: Arun Kumar K, linux-media, linux-samsung-soc, Kamil Debski,
Sylwester Nawrocki, Pawel Osciak, Kiran Avnd
Hi Arun,
On 30 April 2014 11:15, Arun Kumar K <arunkk.samsung@gmail.com> wrote:
> Hi Sachin,
>
> Thank you for the review.
>
>
> On 04/29/14 22:45, Sachin Kamat wrote:
>>
>> Hi Arun,
>>
>> On 23 April 2014 18:27, Arun Kumar K <arun.kk@samsung.com> wrote:
>>>
>>> From: Kiran AVND <avnd.kiran@samsung.com>
>>>
>>> This patch adds variant data and core support for
>>> V8 decoder. This patch also adds the register definition
>>> file for new firmware version v8 for MFC.
>>>
>>> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
>>> Signed-off-by: Pawel Osciak <posciak@chromium.org>
>>> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
>>> ---
>>
>> <...>
>>>
>>> +
>>> +/* Returned value register for specific setting */
>>> +#define S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8 0xf674
>>> +#define S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8 0xf678
>>> +#define S5P_FIMV_D_MVC_VIEW_ID_V8 0xf6d8
>>> +
>>> +/* SEI related information */
>>> +#define S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8 0xf6dc
>>> +
>>> +/* MFCv8 Context buffer sizes */
>>> +#define MFC_CTX_BUF_SIZE_V8 (30 * SZ_1K) /* 30KB */
>>
>>
>> Please include header file for size macros.
>>
>
> The file linux/sizes.h is included in regs-mfc-v6.h which
> inturn gets included in this file. Isnt that fine?
Direct inclusions are encouraged. Please add it in this file.
>
>
>> <...>
>>>
>>> };
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> index 48a14b5..f0e63f5 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> @@ -23,8 +23,7 @@
>>> #include <media/v4l2-ioctl.h>
>>> #include <media/videobuf2-core.h>
>>> #include "regs-mfc.h"
>>> -#include "regs-mfc-v6.h"
>>> -#include "regs-mfc-v7.h"
>>> +#include "regs-mfc-v8.h"
>>>
>>> /* Definitions related to MFC memory */
>>>
>>> @@ -705,5 +704,6 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
>>> #define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1
>>> : 0)
>>> #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0)
>>> #define IS_MFCV7(dev) (dev->variant->version >= 0x70 ? 1 : 0)
>>
>>
>> Is MFC v8 superset of MFC v7?
>>
>
> Yes it is a superset.
> So the last patch in this series renames IS_MFCV7 to IS_MFCV7_PLUS.
Shouldn't that be done first in that case?
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder
2014-04-30 5:49 ` Sachin Kamat
@ 2014-04-30 5:52 ` Arun Kumar K
0 siblings, 0 replies; 16+ messages in thread
From: Arun Kumar K @ 2014-04-30 5:52 UTC (permalink / raw)
To: Sachin Kamat
Cc: linux-media, linux-samsung-soc, Kamil Debski, Sylwester Nawrocki,
Pawel Osciak, Kiran Avnd
Hi Sachin,
On Wed, Apr 30, 2014 at 11:19 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Hi Arun,
>
> On 30 April 2014 11:15, Arun Kumar K <arunkk.samsung@gmail.com> wrote:
>> Hi Sachin,
>>
>> Thank you for the review.
>>
>>
>> On 04/29/14 22:45, Sachin Kamat wrote:
>>>
>>> Hi Arun,
>>>
>>> On 23 April 2014 18:27, Arun Kumar K <arun.kk@samsung.com> wrote:
>>>>
>>>> From: Kiran AVND <avnd.kiran@samsung.com>
>>>>
>>>> This patch adds variant data and core support for
>>>> V8 decoder. This patch also adds the register definition
>>>> file for new firmware version v8 for MFC.
>>>>
>>>> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
>>>> Signed-off-by: Pawel Osciak <posciak@chromium.org>
>>>> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
>>>> ---
>>>
>>> <...>
>>>>
>>>> +
>>>> +/* Returned value register for specific setting */
>>>> +#define S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8 0xf674
>>>> +#define S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8 0xf678
>>>> +#define S5P_FIMV_D_MVC_VIEW_ID_V8 0xf6d8
>>>> +
>>>> +/* SEI related information */
>>>> +#define S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8 0xf6dc
>>>> +
>>>> +/* MFCv8 Context buffer sizes */
>>>> +#define MFC_CTX_BUF_SIZE_V8 (30 * SZ_1K) /* 30KB */
>>>
>>>
>>> Please include header file for size macros.
>>>
>>
>> The file linux/sizes.h is included in regs-mfc-v6.h which
>> inturn gets included in this file. Isnt that fine?
>
> Direct inclusions are encouraged. Please add it in this file.
>
Ok will add it.
>>
>>
>>> <...>
>>>>
>>>> };
>>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>>> index 48a14b5..f0e63f5 100644
>>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>>> @@ -23,8 +23,7 @@
>>>> #include <media/v4l2-ioctl.h>
>>>> #include <media/videobuf2-core.h>
>>>> #include "regs-mfc.h"
>>>> -#include "regs-mfc-v6.h"
>>>> -#include "regs-mfc-v7.h"
>>>> +#include "regs-mfc-v8.h"
>>>>
>>>> /* Definitions related to MFC memory */
>>>>
>>>> @@ -705,5 +704,6 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
>>>> #define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1
>>>> : 0)
>>>> #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0)
>>>> #define IS_MFCV7(dev) (dev->variant->version >= 0x70 ? 1 : 0)
>>>
>>>
>>> Is MFC v8 superset of MFC v7?
>>>
>>
>> Yes it is a superset.
>> So the last patch in this series renames IS_MFCV7 to IS_MFCV7_PLUS.
>
> Shouldn't that be done first in that case?
>
Adding variants to access MFC registers patch actually removes lot of
such IS_MFCV7 checks from opr_v6.c file. Thats why I put that patch as the
last in the series to have minimal changes as possible.
Regards
Arun
^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-04-23 12:57 ` [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers Arun Kumar K
@ 2014-05-08 16:31 ` Kamil Debski
2014-05-09 1:00 ` Pawel Osciak
2014-05-13 10:32 ` Kamil Debski
1 sibling, 1 reply; 16+ messages in thread
From: Kamil Debski @ 2014-05-08 16:31 UTC (permalink / raw)
To: 'Arun Kumar K', linux-media, linux-samsung-soc
Cc: Sylwester Nawrocki, posciak, avnd.kiran, arunkk.samsung
Hi Arun,
I think that this driver is getting too complicated now.
First there are separate files for MFC versions, but in addition there are
many
IF_MFCVx in there. I am curious how many additional lines it would take to
add s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.*.
I get the point that this approach may result in less lines added, but
having a callback specific for version use register pointers specific for
another version makes the code look unreadable and difficult to maintain.
Please give your opinion on another way to add support for v8.
s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.* ?
Best wishes,
--
Kamil Debski
Samsung R&D Institute Poland
> From: Arun Kumar K [mailto:arunkk.samsung@gmail.com] On Behalf Of Arun
> Kumar K
> Sent: Wednesday, April 23, 2014 2:58 PM
> To: linux-media@vger.kernel.org; linux-samsung-soc@vger.kernel.org
> Cc: k.debski@samsung.com; s.nawrocki@samsung.com; posciak@chromium.org;
> avnd.kiran@samsung.com; arunkk.samsung@gmail.com
> Subject: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc
> registers
>
> From: Kiran AVND <avnd.kiran@samsung.com>
>
> This patch is needed in preparation to add MFC V8
> where the register offsets are changed w.r.t MFC V6/V7.
>
> This patch adds variants of MFC V6 and V7 while
> accessing MFC registers. Registers are kept in mfc context
> and are initialized to a particular MFC variant during probe,
> which is used instead of macros.
>
> This avoids duplication of the code for MFC variants
> V6 & V7, and reduces the if_else checks while accessing
> registers of different MFC variants.
>
> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
> Signed-off-by: Pawel Osciak <posciak@chromium.org>
> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> ---
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
> drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697
> +++++++++++++++--------
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
> 6 files changed, 710 insertions(+), 256 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index 4f9d37a..07ebac8 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -1223,6 +1223,7 @@ static int s5p_mfc_probe(struct platform_device
> *pdev)
> /* Initialize HW ops and commands based on MFC version */
> s5p_mfc_init_hw_ops(dev);
> s5p_mfc_init_hw_cmds(dev);
> + s5p_mfc_init_regs(dev);
>
> pr_debug("%s--\n", __func__);
> return 0;
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> index f5404a6..48a14b5 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> @@ -332,6 +332,7 @@ struct s5p_mfc_dev {
> struct s5p_mfc_hw_ops *mfc_ops;
> struct s5p_mfc_hw_cmds *mfc_cmds;
> int ver;
> + const struct s5p_mfc_regs *mfc_regs;
> };
>
> /**
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> index 3c01c33..c9a2274 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> @@ -31,6 +31,12 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
> dev->mfc_ops = s5p_mfc_ops;
> }
>
> +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev)
> +{
> + if (IS_MFCV6_PLUS(dev))
> + dev->mfc_regs = s5p_mfc_init_regs_v6_plus(dev);
> +}
> +
> int s5p_mfc_alloc_priv_buf(struct device *dev,
> struct s5p_mfc_priv_buf *b)
> {
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> index 754c540..7a7ad32 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> @@ -17,6 +17,259 @@
>
> #include "s5p_mfc_common.h"
>
> +struct s5p_mfc_regs {
> +
> + /* codec common registers */
> + void *risc_on;
> + void *risc2host_int;
> + void *host2risc_int;
> + void *risc_base_address;
> + void *mfc_reset;
> + void *host2risc_command;
> + void *risc2host_command;
> + void *mfc_bus_reset_ctrl;
> + void *firmware_version;
> + void *instance_id;
> + void *codec_type;
> + void *context_mem_addr;
> + void *context_mem_size;
> + void *pixel_format;
> + void *metadata_enable;
> + void *mfc_version;
> + void *dbg_info_enable;
> + void *dbg_buffer_addr;
> + void *dbg_buffer_size;
> + void *hed_control;
> + void *mfc_timeout_value;
> + void *hed_shared_mem_addr;
> + void *dis_shared_mem_addr;/* only v7 */
> + void *ret_instance_id;
> + void *error_code;
> + void *dbg_buffer_output_size;
> + void *metadata_status;
> + void *metadata_addr_mb_info;
> + void *metadata_size_mb_info;
> + void *dbg_info_stage_counter;
> +
> + /* decoder registers */
> + void *d_crc_ctrl;
> + void *d_dec_options;
> + void *d_display_delay;
> + void *d_set_frame_width;
> + void *d_set_frame_height;
> + void *d_sei_enable;
> + void *d_min_num_dpb;
> + void *d_min_first_plane_dpb_size;
> + void *d_min_second_plane_dpb_size;
> + void *d_min_third_plane_dpb_size;/* only v8 */
> + void *d_min_num_mv;
> + void *d_mvc_num_views;
> + void *d_min_num_dis;/* only v7 */
> + void *d_min_first_dis_size;/* only v7 */
> + void *d_min_second_dis_size;/* only v7 */
> + void *d_min_third_dis_size;/* only v7 */
> + void *d_post_filter_luma_dpb0;/* v7 and v8 */
> + void *d_post_filter_luma_dpb1;/* v7 and v8 */
> + void *d_post_filter_luma_dpb2;/* only v7 */
> + void *d_post_filter_chroma_dpb0;/* v7 and v8 */
> + void *d_post_filter_chroma_dpb1;/* v7 and v8 */
> + void *d_post_filter_chroma_dpb2;/* only v7 */
> + void *d_num_dpb;
> + void *d_num_mv;
> + void *d_init_buffer_options;
> + void *d_first_plane_dpb_stride_size;/* only v8 */
> + void *d_second_plane_dpb_stride_size;/* only v8 */
> + void *d_third_plane_dpb_stride_size;/* only v8 */
> + void *d_first_plane_dpb_size;
> + void *d_second_plane_dpb_size;
> + void *d_third_plane_dpb_size;/* only v8 */
> + void *d_mv_buffer_size;
> + void *d_first_plane_dpb;
> + void *d_second_plane_dpb;
> + void *d_third_plane_dpb;
> + void *d_mv_buffer;
> + void *d_scratch_buffer_addr;
> + void *d_scratch_buffer_size;
> + void *d_metadata_buffer_addr;
> + void *d_metadata_buffer_size;
> + void *d_nal_start_options;/* v7 and v8 */
> + void *d_cpb_buffer_addr;
> + void *d_cpb_buffer_size;
> + void *d_available_dpb_flag_upper;
> + void *d_available_dpb_flag_lower;
> + void *d_cpb_buffer_offset;
> + void *d_slice_if_enable;
> + void *d_picture_tag;
> + void *d_stream_data_size;
> + void *d_dynamic_dpb_flag_upper;/* v7 and v8 */
> + void *d_dynamic_dpb_flag_lower;/* v7 and v8 */
> + void *d_display_frame_width;
> + void *d_display_frame_height;
> + void *d_display_status;
> + void *d_display_first_plane_addr;
> + void *d_display_second_plane_addr;
> + void *d_display_third_plane_addr;/* only v8 */
> + void *d_display_frame_type;
> + void *d_display_crop_info1;
> + void *d_display_crop_info2;
> + void *d_display_picture_profile;
> + void *d_display_luma_crc;/* v7 and v8 */
> + void *d_display_chroma0_crc;/* v7 and v8 */
> + void *d_display_chroma1_crc;/* only v8 */
> + void *d_display_luma_crc_top;/* only v6 */
> + void *d_display_chroma_crc_top;/* only v6 */
> + void *d_display_luma_crc_bot;/* only v6 */
> + void *d_display_chroma_crc_bot;/* only v6 */
> + void *d_display_aspect_ratio;
> + void *d_display_extended_ar;
> + void *d_decoded_frame_width;
> + void *d_decoded_frame_height;
> + void *d_decoded_status;
> + void *d_decoded_first_plane_addr;
> + void *d_decoded_second_plane_addr;
> + void *d_decoded_third_plane_addr;/* only v8 */
> + void *d_decoded_frame_type;
> + void *d_decoded_crop_info1;
> + void *d_decoded_crop_info2;
> + void *d_decoded_picture_profile;
> + void *d_decoded_nal_size;
> + void *d_decoded_luma_crc;
> + void *d_decoded_chroma0_crc;
> + void *d_decoded_chroma1_crc;/* only v8 */
> + void *d_ret_picture_tag_top;
> + void *d_ret_picture_tag_bot;
> + void *d_ret_picture_time_top;
> + void *d_ret_picture_time_bot;
> + void *d_chroma_format;
> + void *d_vc1_info;/* v7 and v8 */
> + void *d_mpeg4_info;
> + void *d_h264_info;
> + void *d_metadata_addr_concealed_mb;
> + void *d_metadata_size_concealed_mb;
> + void *d_metadata_addr_vc1_param;
> + void *d_metadata_size_vc1_param;
> + void *d_metadata_addr_sei_nal;
> + void *d_metadata_size_sei_nal;
> + void *d_metadata_addr_vui;
> + void *d_metadata_size_vui;
> + void *d_metadata_addr_mvcvui;/* v7 and v8 */
> + void *d_metadata_size_mvcvui;/* v7 and v8 */
> + void *d_mvc_view_id;
> + void *d_frame_pack_sei_avail;
> + void *d_frame_pack_arrgment_id;
> + void *d_frame_pack_sei_info;
> + void *d_frame_pack_grid_pos;
> + void *d_display_recovery_sei_info;/* v7 and v8 */
> + void *d_decoded_recovery_sei_info;/* v7 and v8 */
> + void *d_display_first_addr;/* only v7 */
> + void *d_display_second_addr;/* only v7 */
> + void *d_display_third_addr;/* only v7 */
> + void *d_decoded_first_addr;/* only v7 */
> + void *d_decoded_second_addr;/* only v7 */
> + void *d_decoded_third_addr;/* only v7 */
> + void *d_used_dpb_flag_upper;/* v7 and v8 */
> + void *d_used_dpb_flag_lower;/* v7 and v8 */
> +
> + /* encoder registers */
> + void *e_frame_width;
> + void *e_frame_height;
> + void *e_cropped_frame_width;
> + void *e_cropped_frame_height;
> + void *e_frame_crop_offset;
> + void *e_enc_options;
> + void *e_picture_profile;
> + void *e_vbv_buffer_size;
> + void *e_vbv_init_delay;
> + void *e_fixed_picture_qp;
> + void *e_rc_config;
> + void *e_rc_qp_bound;
> + void *e_rc_qp_bound_pb;/* v7 and v8 */
> + void *e_rc_mode;
> + void *e_mb_rc_config;
> + void *e_padding_ctrl;
> + void *e_air_threshold;
> + void *e_mv_hor_range;
> + void *e_mv_ver_range;
> + void *e_num_dpb;
> + void *e_luma_dpb;
> + void *e_chroma_dpb;
> + void *e_me_buffer;
> + void *e_scratch_buffer_addr;
> + void *e_scratch_buffer_size;
> + void *e_tmv_buffer0;
> + void *e_tmv_buffer1;
> + void *e_ir_buffer_addr;/* v7 and v8 */
> + void *e_source_first_plane_addr;
> + void *e_source_second_plane_addr;
> + void *e_source_third_plane_addr;/* v7 and v8 */
> + void *e_source_first_plane_stride;/* v7 and v8 */
> + void *e_source_second_plane_stride;/* v7 and v8 */
> + void *e_source_third_plane_stride;/* v7 and v8 */
> + void *e_stream_buffer_addr;
> + void *e_stream_buffer_size;
> + void *e_roi_buffer_addr;
> + void *e_param_change;
> + void *e_ir_size;
> + void *e_gop_config;
> + void *e_mslice_mode;
> + void *e_mslice_size_mb;
> + void *e_mslice_size_bits;
> + void *e_frame_insertion;
> + void *e_rc_frame_rate;
> + void *e_rc_bit_rate;
> + void *e_rc_roi_ctrl;
> + void *e_picture_tag;
> + void *e_bit_count_enable;
> + void *e_max_bit_count;
> + void *e_min_bit_count;
> + void *e_metadata_buffer_addr;
> + void *e_metadata_buffer_size;
> + void *e_encoded_source_first_plane_addr;
> + void *e_encoded_source_second_plane_addr;
> + void *e_encoded_source_third_plane_addr;/* v7 and v8 */
> + void *e_stream_size;
> + void *e_slice_type;
> + void *e_picture_count;
> + void *e_ret_picture_tag;
> + void *e_stream_buffer_write_pointer; /* only v6 */
> + void *e_recon_luma_dpb_addr;
> + void *e_recon_chroma_dpb_addr;
> + void *e_metadata_addr_enc_slice;
> + void *e_metadata_size_enc_slice;
> + void *e_mpeg4_options;
> + void *e_mpeg4_hec_period;
> + void *e_aspect_ratio;
> + void *e_extended_sar;
> + void *e_h264_options;
> + void *e_h264_options_2;/* v7 and v8 */
> + void *e_h264_lf_alpha_offset;
> + void *e_h264_lf_beta_offset;
> + void *e_h264_i_period;
> + void *e_h264_fmo_slice_grp_map_type;
> + void *e_h264_fmo_num_slice_grp_minus1;
> + void *e_h264_fmo_slice_grp_change_dir;
> + void *e_h264_fmo_slice_grp_change_rate_minus1;
> + void *e_h264_fmo_run_length_minus1_0;
> + void *e_h264_aso_slice_order_0;
> + void *e_h264_chroma_qp_offset;
> + void *e_h264_num_t_layer;
> + void *e_h264_hierarchical_qp_layer0;
> + void *e_h264_frame_packing_sei_info;
> + void *e_h264_nal_control;/* v7 and v8 */
> + void *e_mvc_frame_qp_view1;
> + void *e_mvc_rc_bit_rate_view1;
> + void *e_mvc_rc_qbound_view1;
> + void *e_mvc_rc_mode_view1;
> + void *e_mvc_inter_view_prediction_on;
> + void *e_vp8_options;/* v7 and v8 */
> + void *e_vp8_filter_options;/* v7 and v8 */
> + void *e_vp8_golden_frame_option;/* v7 and v8 */
> + void *e_vp8_num_t_layer;/* v7 and v8 */
> + void *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
> + void *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
> + void *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
> +};
> +
> struct s5p_mfc_hw_ops {
> int (*alloc_dec_temp_buffers)(struct s5p_mfc_ctx *ctx);
> void (*release_dec_desc_buffer)(struct s5p_mfc_ctx *ctx);
> @@ -80,6 +333,7 @@ struct s5p_mfc_hw_ops {
> };
>
> void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
> +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev);
> int s5p_mfc_alloc_priv_buf(struct device *dev,
> struct s5p_mfc_priv_buf *b);
> void s5p_mfc_release_priv_buf(struct device *dev,
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> index 356cfe5..65b8d20 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> @@ -44,10 +44,10 @@
> } while (0)
> #endif /* S5P_MFC_DEBUG_REGWRITE */
>
> -#define READL(offset) readl(dev->regs_base + (offset))
> -#define WRITEL(data, offset) writel((data), dev->regs_base + (offset))
> -#define OFFSETA(x) (((x) - dev->port_a) >>
> S5P_FIMV_MEM_OFFSET)
> -#define OFFSETB(x) (((x) - dev->port_b) >>
> S5P_FIMV_MEM_OFFSET)
> +#define READL(reg) \
> + (WARN_ON_ONCE(!(reg)) ? 0 : readl(reg))
> +#define WRITEL(data, reg) \
> + (WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))
>
> /* Allocate temporary buffers for decoding */
> static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx)
> @@ -367,16 +367,17 @@ static int
> s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
> unsigned int strm_size)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
>
> mfc_debug_enter();
> mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n"
> "buf_size: 0x%08x (%d)\n",
> ctx->inst_no, buf_addr, strm_size, strm_size);
> - WRITEL(strm_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> - WRITEL(buf_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> - WRITEL(buf_size->cpb, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> - WRITEL(start_num_byte, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> + WRITEL(strm_size, mfc_regs->d_stream_data_size);
> + WRITEL(buf_addr, mfc_regs->d_cpb_buffer_addr);
> + WRITEL(buf_size->cpb, mfc_regs->d_cpb_buffer_size);
> + WRITEL(start_num_byte, mfc_regs->d_cpb_buffer_offset);
>
> mfc_debug_leave();
> return 0;
> @@ -388,6 +389,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> unsigned int frame_size, i;
> unsigned int frame_size_ch, frame_size_mv;
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> size_t buf_addr1;
> int buf_size1;
> int align_gap;
> @@ -399,19 +401,19 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
> mfc_debug(2, "Setting display delay to %d\n", ctx->display_delay);
>
> - WRITEL(ctx->total_dpb_count, S5P_FIMV_D_NUM_DPB_V6);
> - WRITEL(ctx->luma_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> - WRITEL(ctx->chroma_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> + WRITEL(ctx->total_dpb_count, mfc_regs->d_num_dpb);
> + WRITEL(ctx->luma_size, mfc_regs->d_first_plane_dpb_size);
> + WRITEL(ctx->chroma_size, mfc_regs->d_second_plane_dpb_size);
>
> - WRITEL(buf_addr1, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> - WRITEL(ctx->scratch_buf_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> + WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
> + WRITEL(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
> buf_addr1 += ctx->scratch_buf_size;
> buf_size1 -= ctx->scratch_buf_size;
>
> if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||
> ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){
> - WRITEL(ctx->mv_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> - WRITEL(ctx->mv_count, S5P_FIMV_D_NUM_MV_V6);
> + WRITEL(ctx->mv_size, mfc_regs->d_mv_buffer_size);
> + WRITEL(ctx->mv_count, mfc_regs->d_num_mv);
> }
>
> frame_size = ctx->luma_size;
> @@ -425,11 +427,11 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "Luma %d: %x\n", i,
> ctx->dst_bufs[i].cookie.raw.luma);
> WRITEL(ctx->dst_bufs[i].cookie.raw.luma,
> - S5P_FIMV_D_LUMA_DPB_V6 + i * 4);
> + mfc_regs->d_first_plane_dpb + i * 4);
> mfc_debug(2, "\tChroma %d: %x\n", i,
> ctx->dst_bufs[i].cookie.raw.chroma);
> WRITEL(ctx->dst_bufs[i].cookie.raw.chroma,
> - S5P_FIMV_D_CHROMA_DPB_V6 + i * 4);
> + mfc_regs->d_second_plane_dpb + i * 4);
> }
> if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
> ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {
> @@ -442,7 +444,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
>
> mfc_debug(2, "\tBuf1: %x, size: %d\n",
> buf_addr1, buf_size1);
> - WRITEL(buf_addr1, S5P_FIMV_D_MV_BUFFER_V6 + i * 4);
> + WRITEL(buf_addr1, mfc_regs->d_mv_buffer + i * 4);
> buf_addr1 += frame_size_mv;
> buf_size1 -= frame_size_mv;
> }
> @@ -455,7 +457,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> return -ENOMEM;
> }
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_INIT_BUFS_V6, NULL);
>
> @@ -468,9 +470,10 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct
> s5p_mfc_ctx *ctx,
> unsigned long addr, unsigned int size)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> - WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align */
> - WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> + WRITEL(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */
> + WRITEL(size, mfc_regs->e_stream_buffer_size);
>
> mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",
> addr, size);
> @@ -482,14 +485,10 @@ static void
> s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> unsigned long y_addr, unsigned long c_addr)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> - if (IS_MFCV7(dev)) {
> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> - } else {
> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> - }
> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>
> mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);
> mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);
> @@ -499,18 +498,14 @@ static void
> s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> unsigned long *y_addr, unsigned long *c_addr)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> unsigned long enc_recon_y_addr, enc_recon_c_addr;
>
> - if (IS_MFCV7(dev)) {
> - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> - } else {
> - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> - }
> + *y_addr = READL(mfc_regs->e_encoded_source_first_plane_addr);
> + *c_addr = READL(mfc_regs->e_encoded_source_second_plane_addr);
>
> - enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> - enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> + enc_recon_y_addr = READL(mfc_regs->e_recon_luma_dpb_addr);
> + enc_recon_c_addr = READL(mfc_regs->e_recon_chroma_dpb_addr);
>
> mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);
> mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);
> @@ -520,6 +515,7 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx,
> static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> size_t buf_addr1;
> int i, buf_size1;
>
> @@ -531,24 +527,24 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
>
> for (i = 0; i < ctx->pb_count; i++) {
> - WRITEL(buf_addr1, S5P_FIMV_E_LUMA_DPB_V6 + (4 * i));
> + WRITEL(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
> buf_addr1 += ctx->luma_dpb_size;
> - WRITEL(buf_addr1, S5P_FIMV_E_CHROMA_DPB_V6 + (4 * i));
> + WRITEL(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i));
> buf_addr1 += ctx->chroma_dpb_size;
> - WRITEL(buf_addr1, S5P_FIMV_E_ME_BUFFER_V6 + (4 * i));
> + WRITEL(buf_addr1, mfc_regs->e_me_buffer + (4 * i));
> buf_addr1 += ctx->me_buffer_size;
> buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size +
> ctx->me_buffer_size);
> }
>
> - WRITEL(buf_addr1, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> - WRITEL(ctx->scratch_buf_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> + WRITEL(buf_addr1, mfc_regs->e_scratch_buffer_addr);
> + WRITEL(ctx->scratch_buf_size, mfc_regs->e_scratch_buffer_size);
> buf_addr1 += ctx->scratch_buf_size;
> buf_size1 -= ctx->scratch_buf_size;
>
> - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER0_V6);
> + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer0);
> buf_addr1 += ctx->tmv_buffer_size >> 1;
> - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER1_V6);
> + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer1);
> buf_addr1 += ctx->tmv_buffer_size >> 1;
> buf_size1 -= ctx->tmv_buffer_size;
>
> @@ -559,7 +555,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> return -ENOMEM;
> }
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_INIT_BUFS_V6, NULL);
>
> @@ -571,18 +567,19 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> /* multi-slice control */
> /* multi-slice MB number or bit size */
> - WRITEL(ctx->slice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> + WRITEL(ctx->slice_mode, mfc_regs->e_mslice_mode);
> if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
> - WRITEL(ctx->slice_size.mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> + WRITEL(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
> } else if (ctx->slice_mode ==
> V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> - WRITEL(ctx->slice_size.bits,
> S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> + WRITEL(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
> } else {
> - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> + WRITEL(0x0, mfc_regs->e_mslice_size_mb);
> + WRITEL(0x0, mfc_regs->e_mslice_size_bits);
> }
>
> return 0;
> @@ -591,27 +588,28 @@ static int s5p_mfc_set_slice_mode(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> unsigned int reg = 0;
>
> mfc_debug_enter();
>
> /* width */
> - WRITEL(ctx->img_width, S5P_FIMV_E_FRAME_WIDTH_V6); /* 16 align */
> + WRITEL(ctx->img_width, mfc_regs->e_frame_width); /* 16 align */
> /* height */
> - WRITEL(ctx->img_height, S5P_FIMV_E_FRAME_HEIGHT_V6); /* 16 align
> */
> + WRITEL(ctx->img_height, mfc_regs->e_frame_height); /* 16 align */
>
> /* cropped width */
> - WRITEL(ctx->img_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> + WRITEL(ctx->img_width, mfc_regs->e_cropped_frame_width);
> /* cropped height */
> - WRITEL(ctx->img_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> + WRITEL(ctx->img_height, mfc_regs->e_cropped_frame_height);
> /* cropped offset */
> - WRITEL(0x0, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> + WRITEL(0x0, mfc_regs->e_frame_crop_offset);
>
> /* pictype : IDR period */
> reg = 0;
> reg |= p->gop_size & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* multi-slice control */
> /* multi-slice MB number or bit size */
> @@ -619,65 +617,65 @@ static int s5p_mfc_set_enc_params(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
> reg |= (0x1 << 3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> ctx->slice_size.mb = p->slice_mb;
> } else if (p->slice_mode ==
> V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> reg |= (0x1 << 3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> ctx->slice_size.bits = p->slice_bit;
> } else {
> reg &= ~(0x1 << 3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> }
>
> s5p_mfc_set_slice_mode(ctx);
>
> /* cyclic intra refresh */
> - WRITEL(p->intra_refresh_mb, S5P_FIMV_E_IR_SIZE_V6);
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(p->intra_refresh_mb, mfc_regs->e_ir_size);
> + reg = READL(mfc_regs->e_enc_options);
> if (p->intra_refresh_mb == 0)
> reg &= ~(0x1 << 4);
> else
> reg |= (0x1 << 4);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* 'NON_REFERENCE_STORE_ENABLE' for debugging */
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 9);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* memory structure cur. frame */
> if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12M) {
> /* 0: Linear, 1: 2D tiled*/
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 7);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x0, mfc_regs->pixel_format);
> } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV21M) {
> /* 0: Linear, 1: 2D tiled*/
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 7);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x1, mfc_regs->pixel_format);
> } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16) {
> /* 0: Linear, 1: 2D tiled*/
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg |= (0x1 << 7);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x0, mfc_regs->pixel_format);
> }
>
> /* memory structure recon. frame */
> /* 0: Linear, 1: 2D tiled */
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg |= (0x1 << 8);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* padding control & value */
> - WRITEL(0x0, S5P_FIMV_E_PADDING_CTRL_V6);
> + WRITEL(0x0, mfc_regs->e_padding_ctrl);
> if (p->pad) {
> reg = 0;
> /** enable */
> @@ -688,64 +686,64 @@ static int s5p_mfc_set_enc_params(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p->pad_cb & 0xFF) << 8);
> /** y value */
> reg |= p->pad_luma & 0xFF;
> - WRITEL(reg, S5P_FIMV_E_PADDING_CTRL_V6);
> + WRITEL(reg, mfc_regs->e_padding_ctrl);
> }
>
> /* rate control config. */
> reg = 0;
> /* frame-level rate control */
> reg |= ((p->rc_frame & 0x1) << 9);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* bit rate */
> if (p->rc_frame)
> WRITEL(p->rc_bitrate,
> - S5P_FIMV_E_RC_BIT_RATE_V6);
> + mfc_regs->e_rc_bit_rate);
> else
> - WRITEL(1, S5P_FIMV_E_RC_BIT_RATE_V6);
> + WRITEL(1, mfc_regs->e_rc_bit_rate);
>
> /* reaction coefficient */
> if (p->rc_frame) {
> if (p->rc_reaction_coeff < TIGHT_CBR_MAX) /* tight CBR */
> - WRITEL(1, S5P_FIMV_E_RC_RPARAM_V6);
> + WRITEL(1, mfc_regs->e_rc_mode);
> else /* loose CBR */
> - WRITEL(2, S5P_FIMV_E_RC_RPARAM_V6);
> + WRITEL(2, mfc_regs->e_rc_mode);
> }
>
> /* seq header ctrl */
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 2);
> reg |= ((p->seq_hdr_mode & 0x1) << 2);
>
> /* frame skip mode */
> reg &= ~(0x3);
> reg |= (p->frame_skip_mode & 0x3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* 'DROP_CONTROL_ENABLE', disable */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> reg &= ~(0x1 << 10);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* setting for MV range [16, 256] */
> reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> - WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6);
> + WRITEL(reg, mfc_regs->e_mv_hor_range);
>
> reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> - WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6);
> + WRITEL(reg, mfc_regs->e_mv_ver_range);
>
> - WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6);
> - WRITEL(0x0, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> - WRITEL(0x0, S5P_FIMV_E_PARAM_CHANGE_V6);
> - WRITEL(0x0, S5P_FIMV_E_RC_ROI_CTRL_V6);
> - WRITEL(0x0, S5P_FIMV_E_PICTURE_TAG_V6);
> + WRITEL(0x0, mfc_regs->e_frame_insertion);
> + WRITEL(0x0, mfc_regs->e_roi_buffer_addr);
> + WRITEL(0x0, mfc_regs->e_param_change);
> + WRITEL(0x0, mfc_regs->e_rc_roi_ctrl);
> + WRITEL(0x0, mfc_regs->e_picture_tag);
>
> - WRITEL(0x0, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> - WRITEL(0x0, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> - WRITEL(0x0, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> + WRITEL(0x0, mfc_regs->e_bit_count_enable);
> + WRITEL(0x0, mfc_regs->e_max_bit_count);
> + WRITEL(0x0, mfc_regs->e_min_bit_count);
>
> - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> + WRITEL(0x0, mfc_regs->e_metadata_buffer_addr);
> + WRITEL(0x0, mfc_regs->e_metadata_buffer_size);
>
> mfc_debug_leave();
>
> @@ -755,6 +753,7 @@ static int s5p_mfc_set_enc_params(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> unsigned int reg = 0;
> @@ -765,10 +764,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params(ctx);
>
> /* pictype : number of B */
> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> + reg = READL(mfc_regs->e_gop_config);
> reg &= ~(0x3 << 16);
> reg |= ((p->num_b_frame & 0x3) << 16);
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* profile & level */
> reg = 0;
> @@ -776,18 +775,19 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h264->level & 0xFF) << 8);
> /** profile - 0 ~ 3 */
> reg |= p_h264->profile & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
> +
> /** frame QP */
> reg &= ~(0x3F);
> reg |= p_h264->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* max & min value of QP */
> reg = 0;
> @@ -795,16 +795,16 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h264->rc_max_qp & 0x3F) << 8);
> /** min QP */
> reg |= p_h264->rc_min_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_h264->rc_b_frame_qp & 0x3F) << 16);
> reg |= ((p_h264->rc_p_frame_qp & 0x3F) << 8);
> reg |= p_h264->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* frame rate */
> @@ -812,38 +812,38 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> WRITEL(p_h264->cpb_size & 0xFFFF,
> - S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> /* interlace */
> reg = 0;
> reg |= ((p_h264->interlace & 0x1) << 3);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* height */
> if (p_h264->interlace) {
> WRITEL(ctx->img_height >> 1,
> - S5P_FIMV_E_FRAME_HEIGHT_V6); /* 32 align */
> + mfc_regs->e_frame_height); /* 32 align */
> /* cropped height */
> WRITEL(ctx->img_height >> 1,
> - S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> + mfc_regs->e_cropped_frame_height);
> }
>
> /* loop filter ctrl */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x3 << 1);
> reg |= ((p_h264->loop_filter_mode & 0x3) << 1);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* loopfilter alpha offset */
> if (p_h264->loop_filter_alpha < 0) {
> @@ -853,7 +853,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg = 0x00;
> reg |= (p_h264->loop_filter_alpha & 0xF);
> }
> - WRITEL(reg, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> + WRITEL(reg, mfc_regs->e_h264_lf_alpha_offset);
>
> /* loopfilter beta offset */
> if (p_h264->loop_filter_beta < 0) {
> @@ -863,28 +863,28 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg = 0x00;
> reg |= (p_h264->loop_filter_beta & 0xF);
> }
> - WRITEL(reg, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> + WRITEL(reg, mfc_regs->e_h264_lf_beta_offset);
>
> /* entropy coding mode */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x1);
> reg |= p_h264->entropy_mode & 0x1;
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* number of ref. picture */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 7);
> reg |= (((p_h264->num_ref_pic_4p - 1) & 0x1) << 7);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* 8x8 transform enable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x3 << 12);
> reg |= ((p_h264->_8x8_transform & 0x3) << 12);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* macroblock adaptive scaling features */
> - WRITEL(0x0, S5P_FIMV_E_MB_RC_CONFIG_V6);
> + WRITEL(0x0, mfc_regs->e_mb_rc_config);
> if (p->rc_mb) {
> reg = 0;
> /** dark region */
> @@ -895,92 +895,95 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h264->rc_mb_static & 0x1) << 1);
> /** high activity region */
> reg |= p_h264->rc_mb_activity & 0x1;
> - WRITEL(reg, S5P_FIMV_E_MB_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_mb_rc_config);
> }
>
> /* aspect ratio VUI */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 5);
> reg |= ((p_h264->vui_sar & 0x1) << 5);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> - WRITEL(0x0, S5P_FIMV_E_ASPECT_RATIO_V6);
> - WRITEL(0x0, S5P_FIMV_E_EXTENDED_SAR_V6);
> + WRITEL(0x0, mfc_regs->e_aspect_ratio);
> + WRITEL(0x0, mfc_regs->e_extended_sar);
> if (p_h264->vui_sar) {
> /* aspect ration IDC */
> reg = 0;
> reg |= p_h264->vui_sar_idc & 0xFF;
> - WRITEL(reg, S5P_FIMV_E_ASPECT_RATIO_V6);
> + WRITEL(reg, mfc_regs->e_aspect_ratio);
> if (p_h264->vui_sar_idc == 0xFF) {
> /* extended SAR */
> reg = 0;
> reg |= (p_h264->vui_ext_sar_width & 0xFFFF) << 16;
> reg |= p_h264->vui_ext_sar_height & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_EXTENDED_SAR_V6);
> + WRITEL(reg, mfc_regs->e_extended_sar);
> }
> }
>
> /* intra picture period for H.264 open GOP */
> /* control */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 4);
> reg |= ((p_h264->open_gop & 0x1) << 4);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
> +
> /* value */
> - WRITEL(0x0, S5P_FIMV_E_H264_I_PERIOD_V6);
> + WRITEL(0x0, mfc_regs->e_h264_i_period);
> if (p_h264->open_gop) {
> reg = 0;
> reg |= p_h264->open_gop_size & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_H264_I_PERIOD_V6);
> + WRITEL(reg, mfc_regs->e_h264_i_period);
> }
>
> /* 'WEIGHTED_BI_PREDICTION' for B is disable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x3 << 9);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 14);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* ASO */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 6);
> reg |= ((p_h264->aso & 0x1) << 6);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* hier qp enable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 8);
> reg |= ((p_h264->open_gop & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
> reg = 0;
> if (p_h264->hier_qp && p_h264->hier_qp_layer) {
> reg |= (p_h264->hier_qp_type & 0x1) << 0x3;
> reg |= p_h264->hier_qp_layer & 0x7;
> - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
> /* QP value for each layer */
> - for (i = 0; i < (p_h264->hier_qp_layer & 0x7); i++)
> + for (i = 0; i < p_h264->hier_qp_layer &&
> + i < ARRAY_SIZE(p_h264->hier_qp_layer_qp);
i++)
> {
> WRITEL(p_h264->hier_qp_layer_qp[i],
> - S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6 +
> - i * 4);
> + mfc_regs->e_h264_hierarchical_qp_layer0
> + + i * 4);
> + }
> }
> /* number of coding layer should be zero when hierarchical is
> disable */
> - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
>
> /* frame packing SEI generation */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 25);
> reg |= ((p_h264->sei_frame_packing & 0x1) << 25);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
> if (p_h264->sei_frame_packing) {
> reg = 0;
> /** current frame0 flag */
> reg |= ((p_h264->sei_fp_curr_frame_0 & 0x1) << 2);
> /** arrangement type */
> reg |= p_h264->sei_fp_arrangement_type & 0x3;
> - WRITEL(reg, S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> + WRITEL(reg, mfc_regs->e_h264_frame_packing_sei_info);
> }
>
> if (p_h264->fmo) {
> @@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
> if (p_h264->fmo_slice_grp > 4)
> p_h264->fmo_slice_grp = 4;
> - for (i = 0; i < (p_h264->fmo_slice_grp & 0xF); i++)
> + for (i = 0; i < ARRAY_SIZE(p_h264->fmo_run_len)
> + && i < p_h264->fmo_slice_grp; i++) {
> WRITEL(p_h264->fmo_run_len[i] - 1,
> - S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6 +
> - i * 4);
> +
mfc_regs->e_h264_fmo_run_length_minus1_0
> + + i * 4);
> + }
> break;
> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES:
> if (p_h264->fmo_slice_grp > 4)
> @@ -1002,10 +1007,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> if (p_h264->fmo_slice_grp > 2)
> p_h264->fmo_slice_grp = 2;
> WRITEL(p_h264->fmo_chg_dir & 0x1,
> -
S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> + mfc_regs->e_h264_fmo_slice_grp_change_dir);
> /* the valid range is 0 ~ number of macroblocks -1
*/
> WRITEL(p_h264->fmo_chg_rate,
> -
> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> + mfc_regs->e_h264_fmo_slice_grp_change_rate_minus1);
> break;
> default:
> mfc_err("Unsupported map type for FMO: %d\n",
> @@ -1016,11 +1021,11 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> }
>
> WRITEL(p_h264->fmo_map_type,
> - S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> + mfc_regs->e_h264_fmo_slice_grp_map_type);
> WRITEL(p_h264->fmo_slice_grp - 1,
> -
S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> + mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> } else {
> - WRITEL(0, S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> + WRITEL(0, mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> }
>
> mfc_debug_leave();
> @@ -1031,6 +1036,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_mpeg4_enc_params *p_mpeg4 = &p->codec.mpeg4;
> unsigned int reg = 0;
> @@ -1040,10 +1046,10 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params(ctx);
>
> /* pictype : number of B */
> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> + reg = READL(mfc_regs->e_gop_config);
> reg &= ~(0x3 << 16);
> reg |= ((p->num_b_frame & 0x3) << 16);
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* profile & level */
> reg = 0;
> @@ -1051,18 +1057,19 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_mpeg4->level & 0xFF) << 8);
> /** profile - 0 ~ 1 */
> reg |= p_mpeg4->profile & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
> +
> /** frame QP */
> reg &= ~(0x3F);
> reg |= p_mpeg4->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* max & min value of QP */
> reg = 0;
> @@ -1070,16 +1077,16 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_mpeg4->rc_max_qp & 0x3F) << 8);
> /** min QP */
> reg |= p_mpeg4->rc_min_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_mpeg4->rc_b_frame_qp & 0x3F) << 16);
> reg |= ((p_mpeg4->rc_p_frame_qp & 0x3F) << 8);
> reg |= p_mpeg4->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* frame rate */
> @@ -1087,21 +1094,21 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> /* Disable HEC */
> - WRITEL(0x0, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> - WRITEL(0x0, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> + WRITEL(0x0, mfc_regs->e_mpeg4_options);
> + WRITEL(0x0, mfc_regs->e_mpeg4_hec_period);
>
> mfc_debug_leave();
>
> @@ -1111,6 +1118,7 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_mpeg4_enc_params *p_h263 = &p->codec.mpeg4;
> unsigned int reg = 0;
> @@ -1123,18 +1131,19 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> /** profile */
> reg |= (0x1 << 4);
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
> +
> /** frame QP */
> reg &= ~(0x3F);
> reg |= p_h263->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* max & min value of QP */
> reg = 0;
> @@ -1142,16 +1151,16 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h263->rc_max_qp & 0x3F) << 8);
> /** min QP */
> reg |= p_h263->rc_min_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_h263->rc_b_frame_qp & 0x3F) << 16);
> reg |= ((p_h263->rc_p_frame_qp & 0x3F) << 8);
> reg |= p_h263->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* frame rate */
> @@ -1159,16 +1168,16 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> mfc_debug_leave();
> @@ -1179,6 +1188,7 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_vp8_enc_params *p_vp8 = &p->codec.vp8;
> unsigned int reg = 0;
> @@ -1189,57 +1199,57 @@ static int s5p_mfc_set_enc_params_vp8(struct
> s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params(ctx);
>
> /* pictype : number of B */
> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> + reg = READL(mfc_regs->e_gop_config);
> reg &= ~(0x3 << 16);
> reg |= ((p->num_b_frame & 0x3) << 16);
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* profile - 0 ~ 3 */
> reg = p_vp8->profile & 0x3;
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* frame rate */
> if (p->rc_frame && p->rc_framerate_num && p->rc_framerate_denom)
> {
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* frame QP */
> reg &= ~(0x7F);
> reg |= p_vp8->rc_frame_qp & 0x7F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_vp8->rc_p_frame_qp & 0x7F) << 8);
> reg |= p_vp8->rc_frame_qp & 0x7F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* max QP */
> reg = ((p_vp8->rc_max_qp & 0x7F) << 8);
> /* min QP */
> reg |= p_vp8->rc_min_qp & 0x7F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> /* VP8 specific params */
> @@ -1263,7 +1273,7 @@ static int s5p_mfc_set_enc_params_vp8(struct
> s5p_mfc_ctx *ctx)
> }
> reg |= (val & 0xF) << 3;
> reg |= (p_vp8->num_ref & 0x2);
> - WRITEL(reg, S5P_FIMV_E_VP8_OPTIONS_V7);
> + WRITEL(reg, mfc_regs->e_vp8_options);
>
> mfc_debug_leave();
>
> @@ -1297,6 +1307,7 @@ static bool s5p_mfc_is_v6_new(struct s5p_mfc_dev
> *dev)
> static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> unsigned int reg = 0;
> int fmo_aso_ctrl = 0;
>
> @@ -1304,9 +1315,9 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "InstNo: %d/%d\n", ctx->inst_no,
> S5P_FIMV_CH_SEQ_HEADER_V6);
> mfc_debug(2, "BUFs: %08x %08x %08x\n",
> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6));
> + READL(mfc_regs->d_cpb_buffer_addr),
> + READL(mfc_regs->d_cpb_buffer_addr),
> + READL(mfc_regs->d_cpb_buffer_addr));
>
> /* FMO_ASO_CTRL - 0: Enable, 1: Disable */
> reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6);
> @@ -1317,11 +1328,11 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> * set to negative value. */
> if (ctx->display_delay >= 0) {
> reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6);
> - WRITEL(ctx->display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> + WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
> }
>
> if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
> - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->d_dec_options);
> reg = 0;
> }
>
> @@ -1336,21 +1347,21 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
>
> if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
> - WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->d_init_buffer_options);
> else
> - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->d_dec_options);
>
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV21M)
> - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x1, mfc_regs->pixel_format);
> else
> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x0, mfc_regs->pixel_format);
>
>
> /* sei parse */
> - WRITEL(ctx->sei_fp_parse & 0x1, S5P_FIMV_D_SEI_ENABLE_V6);
> + WRITEL(ctx->sei_fp_parse & 0x1, mfc_regs->d_sei_enable);
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
>
> @@ -1361,11 +1372,12 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int
> flush)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> if (flush) {
> dev->curr_ctx = ctx->num;
> s5p_mfc_clean_ctx_int_flags(ctx);
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
> }
> @@ -1376,11 +1388,12 @@ static int s5p_mfc_decode_one_frame_v6(struct
> s5p_mfc_ctx *ctx,
> enum s5p_mfc_decode_arg last_frame)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> - WRITEL(ctx->dec_dst_flag, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> - WRITEL(ctx->slice_interface & 0x1, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> + WRITEL(ctx->dec_dst_flag, mfc_regs->d_available_dpb_flag_lower);
> + WRITEL(ctx->slice_interface & 0x1, mfc_regs->d_slice_if_enable);
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> /* Issue different commands to instance basing on whether it
> * is the last frame or not. */
> switch (last_frame) {
> @@ -1404,6 +1417,7 @@ static int s5p_mfc_decode_one_frame_v6(struct
> s5p_mfc_ctx *ctx,
> static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> if (ctx->codec_mode == S5P_MFC_CODEC_H264_ENC)
> s5p_mfc_set_enc_params_h264(ctx);
> @@ -1419,13 +1433,13 @@ static int s5p_mfc_init_encode_v6(struct
> s5p_mfc_ctx *ctx)
> return -EINVAL;
> }
>
> - /* Set stride lengths */
> + /* Set stride lengths for v7 & above */
> if (IS_MFCV7(dev)) {
> - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> + WRITEL(ctx->img_width, mfc_regs-
> >e_source_first_plane_stride);
> + WRITEL(ctx->img_width, mfc_regs-
> >e_source_second_plane_stride);
> }
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
>
> @@ -1435,14 +1449,16 @@ static int s5p_mfc_init_encode_v6(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> int i;
>
> if (p_h264->aso) {
> - for (i = 0; i < 8; i++)
> + for (i = 0; i < ARRAY_SIZE(p_h264->aso_slice_order); i++) {
> WRITEL(p_h264->aso_slice_order[i],
> - S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6 + i *
4);
> + mfc_regs->e_h264_aso_slice_order_0 + i * 4);
> + }
> }
> return 0;
> }
> @@ -1451,6 +1467,7 @@ static int
> s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> mfc_debug(2, "++\n");
>
> @@ -1461,7 +1478,7 @@ static int s5p_mfc_encode_one_frame_v6(struct
> s5p_mfc_ctx *ctx)
>
> s5p_mfc_set_slice_mode(ctx);
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_FRAME_START_V6, NULL);
>
> @@ -1836,28 +1853,26 @@ static void s5p_mfc_cleanup_queue_v6(struct
> list_head *lh, struct vb2_queue *vq)
>
> static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
> {
> - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
> - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_INT_V6);
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> + WRITEL(0, mfc_regs->risc2host_command);
> + WRITEL(0, mfc_regs->risc2host_int);
> }
>
> static void s5p_mfc_write_info_v6(struct s5p_mfc_ctx *ctx, unsigned
> int data,
> unsigned int ofs)
> {
> - struct s5p_mfc_dev *dev = ctx->dev;
> -
> s5p_mfc_clock_on();
> - WRITEL(data, ofs);
> + WRITEL(data, (void *)ofs);
> s5p_mfc_clock_off();
> }
>
> static unsigned int
> s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
> {
> - struct s5p_mfc_dev *dev = ctx->dev;
> int ret;
>
> s5p_mfc_clock_on();
> - ret = READL(ofs);
> + ret = READL((void *)ofs);
> s5p_mfc_clock_off();
>
> return ret;
> @@ -1865,50 +1880,51 @@ s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx,
> unsigned int ofs)
>
> static int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> + return READL(dev->mfc_regs->d_display_first_plane_addr);
> }
>
> static int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> + return READL(dev->mfc_regs->d_decoded_first_plane_addr);
> }
>
> static int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_STATUS_V6);
> + return READL(dev->mfc_regs->d_display_status);
> }
>
> static int s5p_mfc_get_dec_status_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_STATUS_V6);
> + return READL(dev->mfc_regs->d_decoded_status);
> }
>
> static int s5p_mfc_get_dec_frame_type_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_FRAME_TYPE_V6) &
> + return READL(dev->mfc_regs->d_decoded_frame_type) &
> S5P_FIMV_DECODE_FRAME_MASK_V6;
> }
>
> static int s5p_mfc_get_disp_frame_type_v6(struct s5p_mfc_ctx *ctx)
> {
> - return mfc_read(ctx->dev, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6) &
> + struct s5p_mfc_dev *dev = ctx->dev;
> + return READL(dev->mfc_regs->d_display_frame_type) &
> S5P_FIMV_DECODE_FRAME_MASK_V6;
> }
>
> static int s5p_mfc_get_consumed_stream_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> + return READL(dev->mfc_regs->d_decoded_nal_size);
> }
>
> static int s5p_mfc_get_int_reason_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_RISC2HOST_CMD_V6) &
> + return READL(dev->mfc_regs->risc2host_command) &
> S5P_FIMV_RISC2HOST_CMD_MASK;
> }
>
> static int s5p_mfc_get_int_err_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_ERROR_CODE_V6);
> + return READL(dev->mfc_regs->error_code);
> }
>
> static int s5p_mfc_err_dec_v6(unsigned int err)
> @@ -1923,82 +1939,263 @@ static int s5p_mfc_err_dspl_v6(unsigned int
> err)
>
> static int s5p_mfc_get_img_width_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> + return READL(dev->mfc_regs->d_display_frame_width);
> }
>
> static int s5p_mfc_get_img_height_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> + return READL(dev->mfc_regs->d_display_frame_height);
> }
>
> static int s5p_mfc_get_dpb_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_DPB_V6);
> + return READL(dev->mfc_regs->d_min_num_dpb);
> }
>
> static int s5p_mfc_get_mv_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_MV_V6);
> + return READL(dev->mfc_regs->d_min_num_mv);
> }
>
> static int s5p_mfc_get_inst_no_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_RET_INSTANCE_ID_V6);
> + return READL(dev->mfc_regs->ret_instance_id);
> }
>
> static int s5p_mfc_get_enc_dpb_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_NUM_DPB_V6);
> + return READL(dev->mfc_regs->e_num_dpb);
> }
>
> static int s5p_mfc_get_enc_strm_size_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_STREAM_SIZE_V6);
> + return READL(dev->mfc_regs->e_stream_size);
> }
>
> static int s5p_mfc_get_enc_slice_type_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_SLICE_TYPE_V6);
> + return READL(dev->mfc_regs->e_slice_type);
> }
>
> static int s5p_mfc_get_enc_pic_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_PICTURE_COUNT_V6);
> + return READL(dev->mfc_regs->e_picture_count);
> }
>
> static int s5p_mfc_get_sei_avail_status_v6(struct s5p_mfc_ctx *ctx)
> {
> - return mfc_read(ctx->dev, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> + struct s5p_mfc_dev *dev = ctx->dev;
> + return READL(dev->mfc_regs->d_frame_pack_sei_avail);
> }
>
> static int s5p_mfc_get_mvc_num_views_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> + return READL(dev->mfc_regs->d_mvc_num_views);
> }
>
> static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MVC_VIEW_ID_V6);
> + return READL(dev->mfc_regs->d_mvc_view_id);
> }
>
> static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx
> *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, PIC_TIME_TOP_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top);
> }
>
> static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx
> *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, PIC_TIME_BOT_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot);
> }
>
> static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, CROP_INFO_H_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
> }
>
> static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, CROP_INFO_V_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info2);
> +}
> +
> +static struct s5p_mfc_regs mfc_regs;
> +
> +/* Initialize registers for MFC v6 onwards */
> +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> s5p_mfc_dev *dev)
> +{
> + memset(&mfc_regs, 0, sizeof(mfc_regs));
> +
> +#define S5P_MFC_REG_ADDR(dev, reg) ((dev)->regs_base + (reg))
> +#define R(m, r) mfc_regs.m = S5P_MFC_REG_ADDR(dev, r)
> + /* codec common registers */
> + R(risc_on, S5P_FIMV_RISC_ON_V6);
> + R(risc2host_int, S5P_FIMV_RISC2HOST_INT_V6);
> + R(host2risc_int, S5P_FIMV_HOST2RISC_INT_V6);
> + R(risc_base_address, S5P_FIMV_RISC_BASE_ADDRESS_V6);
> + R(mfc_reset, S5P_FIMV_MFC_RESET_V6);
> + R(host2risc_command, S5P_FIMV_HOST2RISC_CMD_V6);
> + R(risc2host_command, S5P_FIMV_RISC2HOST_CMD_V6);
> + R(firmware_version, S5P_FIMV_FW_VERSION_V6);
> + R(instance_id, S5P_FIMV_INSTANCE_ID_V6);
> + R(codec_type, S5P_FIMV_CODEC_TYPE_V6);
> + R(context_mem_addr, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
> + R(context_mem_size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
> + R(pixel_format, S5P_FIMV_PIXEL_FORMAT_V6);
> + R(ret_instance_id, S5P_FIMV_RET_INSTANCE_ID_V6);
> + R(error_code, S5P_FIMV_ERROR_CODE_V6);
> +
> + /* decoder registers */
> + R(d_crc_ctrl, S5P_FIMV_D_CRC_CTRL_V6);
> + R(d_dec_options, S5P_FIMV_D_DEC_OPTIONS_V6);
> + R(d_display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> + R(d_sei_enable, S5P_FIMV_D_SEI_ENABLE_V6);
> + R(d_min_num_dpb, S5P_FIMV_D_MIN_NUM_DPB_V6);
> + R(d_min_num_mv, S5P_FIMV_D_MIN_NUM_MV_V6);
> + R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> + R(d_num_dpb, S5P_FIMV_D_NUM_DPB_V6);
> + R(d_num_mv, S5P_FIMV_D_NUM_MV_V6);
> + R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> + R(d_first_plane_dpb_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> + R(d_second_plane_dpb_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> + R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> + R(d_first_plane_dpb, S5P_FIMV_D_LUMA_DPB_V6);
> + R(d_second_plane_dpb, S5P_FIMV_D_CHROMA_DPB_V6);
> + R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V6);
> + R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> + R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> + R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> + R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> + R(d_available_dpb_flag_lower,
> S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> + R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> + R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> + R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> + R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> + R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> + R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V6);
> + R(d_display_first_plane_addr, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> + R(d_display_second_plane_addr, S5P_FIMV_D_DISPLAY_CHROMA_ADDR_V6);
> + R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6);
> + R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V6);
> + R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V6);
> + R(d_display_aspect_ratio, S5P_FIMV_D_DISPLAY_ASPECT_RATIO_V6);
> + R(d_display_extended_ar, S5P_FIMV_D_DISPLAY_EXTENDED_AR_V6);
> + R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V6);
> + R(d_decoded_first_plane_addr, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> + R(d_decoded_second_plane_addr, S5P_FIMV_D_DECODED_CHROMA_ADDR_V6);
> + R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V6);
> + R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> + R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6);
> + R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6);
> + R(d_h264_info, S5P_FIMV_D_H264_INFO_V6);
> + R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V6);
> + R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> +
> + /* encoder registers */
> + R(e_frame_width, S5P_FIMV_E_FRAME_WIDTH_V6);
> + R(e_frame_height, S5P_FIMV_E_FRAME_HEIGHT_V6);
> + R(e_cropped_frame_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> + R(e_cropped_frame_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> + R(e_frame_crop_offset, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> + R(e_enc_options, S5P_FIMV_E_ENC_OPTIONS_V6);
> + R(e_picture_profile, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + R(e_vbv_buffer_size, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + R(e_vbv_init_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + R(e_fixed_picture_qp, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + R(e_rc_config, S5P_FIMV_E_RC_CONFIG_V6);
> + R(e_rc_qp_bound, S5P_FIMV_E_RC_QP_BOUND_V6);
> + R(e_rc_mode, S5P_FIMV_E_RC_RPARAM_V6);
> + R(e_mb_rc_config, S5P_FIMV_E_MB_RC_CONFIG_V6);
> + R(e_padding_ctrl, S5P_FIMV_E_PADDING_CTRL_V6);
> + R(e_mv_hor_range, S5P_FIMV_E_MV_HOR_RANGE_V6);
> + R(e_mv_ver_range, S5P_FIMV_E_MV_VER_RANGE_V6);
> + R(e_num_dpb, S5P_FIMV_E_NUM_DPB_V6);
> + R(e_luma_dpb, S5P_FIMV_E_LUMA_DPB_V6);
> + R(e_chroma_dpb, S5P_FIMV_E_CHROMA_DPB_V6);
> + R(e_me_buffer, S5P_FIMV_E_ME_BUFFER_V6);
> + R(e_scratch_buffer_addr, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> + R(e_scratch_buffer_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> + R(e_tmv_buffer0, S5P_FIMV_E_TMV_BUFFER0_V6);
> + R(e_tmv_buffer1, S5P_FIMV_E_TMV_BUFFER1_V6);
> + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> + R(e_stream_buffer_addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6);
> + R(e_stream_buffer_size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> + R(e_roi_buffer_addr, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> + R(e_param_change, S5P_FIMV_E_PARAM_CHANGE_V6);
> + R(e_ir_size, S5P_FIMV_E_IR_SIZE_V6);
> + R(e_gop_config, S5P_FIMV_E_GOP_CONFIG_V6);
> + R(e_mslice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> + R(e_mslice_size_mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> + R(e_mslice_size_bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> + R(e_frame_insertion, S5P_FIMV_E_FRAME_INSERTION_V6);
> + R(e_rc_frame_rate, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + R(e_rc_bit_rate, S5P_FIMV_E_RC_BIT_RATE_V6);
> + R(e_rc_roi_ctrl, S5P_FIMV_E_RC_ROI_CTRL_V6);
> + R(e_picture_tag, S5P_FIMV_E_PICTURE_TAG_V6);
> + R(e_bit_count_enable, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> + R(e_max_bit_count, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> + R(e_min_bit_count, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> + R(e_metadata_buffer_addr, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> + R(e_metadata_buffer_size, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> + R(e_encoded_source_first_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> + R(e_encoded_source_second_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> + R(e_stream_size, S5P_FIMV_E_STREAM_SIZE_V6);
> + R(e_slice_type, S5P_FIMV_E_SLICE_TYPE_V6);
> + R(e_picture_count, S5P_FIMV_E_PICTURE_COUNT_V6);
> + R(e_ret_picture_tag, S5P_FIMV_E_RET_PICTURE_TAG_V6);
> + R(e_recon_luma_dpb_addr, S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> + R(e_recon_chroma_dpb_addr, S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> + R(e_mpeg4_options, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> + R(e_mpeg4_hec_period, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> + R(e_aspect_ratio, S5P_FIMV_E_ASPECT_RATIO_V6);
> + R(e_extended_sar, S5P_FIMV_E_EXTENDED_SAR_V6);
> + R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V6);
> + R(e_h264_lf_alpha_offset, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> + R(e_h264_lf_beta_offset, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> + R(e_h264_i_period, S5P_FIMV_E_H264_I_PERIOD_V6);
> + R(e_h264_fmo_slice_grp_map_type,
> + S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> + R(e_h264_fmo_num_slice_grp_minus1,
> + S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> + R(e_h264_fmo_slice_grp_change_dir,
> + S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> + R(e_h264_fmo_slice_grp_change_rate_minus1,
> +
S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> + R(e_h264_fmo_run_length_minus1_0,
> + S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6);
> + R(e_h264_aso_slice_order_0, S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6);
> + R(e_h264_num_t_layer, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> + R(e_h264_hierarchical_qp_layer0,
> + S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6);
> + R(e_h264_frame_packing_sei_info,
> + S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> +
> + if (!IS_MFCV7(dev))
> + goto done;
> +
> + /* Initialize registers used in MFC v7 */
> + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> + R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
> + R(e_source_first_plane_stride, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> + R(e_source_second_plane_stride,
> S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> + R(e_source_third_plane_stride, S5P_FIMV_E_SOURCE_THIRD_STRIDE_V7);
> + R(e_encoded_source_first_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> + R(e_encoded_source_second_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> + R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
> +
> +done:
> + return &mfc_regs;
> +#undef S5P_MFC_REG_ADDR
> +#undef R
> }
>
> /* Initialize opr function pointers for MFC v6 */
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> index ab164ef..8055848 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> @@ -40,11 +40,6 @@
> #define FRAME_DELTA_H264_H263 1
> #define TIGHT_CBR_MAX 10
>
> -/* Definitions for shared memory compatibility */
> -#define PIC_TIME_TOP_V6 S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6
> -#define PIC_TIME_BOT_V6 S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6
> -#define CROP_INFO_H_V6 S5P_FIMV_D_DISPLAY_CROP_INFO1_V6
> -#define CROP_INFO_V_V6 S5P_FIMV_D_DISPLAY_CROP_INFO2_V6
> -
> struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
> +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> s5p_mfc_dev *dev);
> #endif /* S5P_MFC_OPR_V6_H_ */
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-05-08 16:31 ` Kamil Debski
@ 2014-05-09 1:00 ` Pawel Osciak
2014-05-09 4:49 ` Arun Kumar K
2014-05-13 10:33 ` Kamil Debski
0 siblings, 2 replies; 16+ messages in thread
From: Pawel Osciak @ 2014-05-09 1:00 UTC (permalink / raw)
To: Kamil Debski
Cc: Arun Kumar K, linux-media, linux-samsung-soc, Sylwester Nawrocki,
Kiran Avnd, Arun Kumar
Hi Kamil,
On Fri, May 9, 2014 at 1:31 AM, Kamil Debski <k.debski@samsung.com> wrote:
>
> Hi Arun,
>
> I think that this driver is getting too complicated now.
>
> First there are separate files for MFC versions, but in addition there are
> many
> IF_MFCVx in there.
The intention of this patch is to actually get rid of IF_MFCVx
conditionals wherever possible.
>
> I am curious how many additional lines it would take to
> add s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.*.
>
> I get the point that this approach may result in less lines added, but
> having a callback specific for version use register pointers specific for
> another version makes the code look unreadable and difficult to maintain.
Could you please give an example of how this reduces readability?
I personally feel this patch makes things much more readable (see below).
On the other hand, if we continued without the current method, we
would have to sprinkle
IF_MFCVx macros all around actual functions/operations, instead of
just containing this
to the regs structure, and the only difference in each path would be
register name defines.
I don't feel this would be a better direction to be honest.
Compare, new, after this patch:
> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
vs previously, before this patch:
> - if (IS_MFCV7(dev)) {
> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> - } else {
> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> - }
And of course adding V8 more would make it even worse with yet another
else if case.
> Please give your opinion on another way to add support for v8.
> s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.* ?
If we add v7 and v8 files, a majority of their code will look like this:
s5p_mfc_opr_v6.c:
(...)
void foo_v6(args)
{
foofun(REGISTER_A_V6);
barfun(REGISTER_B_V6);
}
(...)
s5p_mfc_opr_v7.c:
(...)
void foo_v7(args)
{
foofun(REGISTER_A_V7);
barfun(REGISTER_B_V7);
}
(...)
s5p_mfc_opr_v8.c:
(...)
void foo_v8(args)
{
foofun(REGISTER_A_V8);
barfun(REGISTER_B_V8);
}
(...)
I'm not sure this is less error prone and less code...
Thanks,
Pawel
>
> Best wishes,
> --
> Kamil Debski
> Samsung R&D Institute Poland
>
>
> > From: Arun Kumar K [mailto:arunkk.samsung@gmail.com] On Behalf Of Arun
> > Kumar K
> > Sent: Wednesday, April 23, 2014 2:58 PM
> > To: linux-media@vger.kernel.org; linux-samsung-soc@vger.kernel.org
> > Cc: k.debski@samsung.com; s.nawrocki@samsung.com; posciak@chromium.org;
> > avnd.kiran@samsung.com; arunkk.samsung@gmail.com
> > Subject: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc
> > registers
> >
> > From: Kiran AVND <avnd.kiran@samsung.com>
> >
> > This patch is needed in preparation to add MFC V8
> > where the register offsets are changed w.r.t MFC V6/V7.
> >
> > This patch adds variants of MFC V6 and V7 while
> > accessing MFC registers. Registers are kept in mfc context
> > and are initialized to a particular MFC variant during probe,
> > which is used instead of macros.
> >
> > This avoids duplication of the code for MFC variants
> > V6 & V7, and reduces the if_else checks while accessing
> > registers of different MFC variants.
> >
> > Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
> > Signed-off-by: Pawel Osciak <posciak@chromium.org>
> > Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> > ---
> > drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
> > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> > drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
> > drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
> > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697
> > +++++++++++++++--------
> > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
> > 6 files changed, 710 insertions(+), 256 deletions(-)
> >
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > index 4f9d37a..07ebac8 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > @@ -1223,6 +1223,7 @@ static int s5p_mfc_probe(struct platform_device
> > *pdev)
> > /* Initialize HW ops and commands based on MFC version */
> > s5p_mfc_init_hw_ops(dev);
> > s5p_mfc_init_hw_cmds(dev);
> > + s5p_mfc_init_regs(dev);
> >
> > pr_debug("%s--\n", __func__);
> > return 0;
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > index f5404a6..48a14b5 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > @@ -332,6 +332,7 @@ struct s5p_mfc_dev {
> > struct s5p_mfc_hw_ops *mfc_ops;
> > struct s5p_mfc_hw_cmds *mfc_cmds;
> > int ver;
> > + const struct s5p_mfc_regs *mfc_regs;
> > };
> >
> > /**
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > index 3c01c33..c9a2274 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > @@ -31,6 +31,12 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
> > dev->mfc_ops = s5p_mfc_ops;
> > }
> >
> > +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev)
> > +{
> > + if (IS_MFCV6_PLUS(dev))
> > + dev->mfc_regs = s5p_mfc_init_regs_v6_plus(dev);
> > +}
> > +
> > int s5p_mfc_alloc_priv_buf(struct device *dev,
> > struct s5p_mfc_priv_buf *b)
> > {
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > index 754c540..7a7ad32 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > @@ -17,6 +17,259 @@
> >
> > #include "s5p_mfc_common.h"
> >
> > +struct s5p_mfc_regs {
> > +
> > + /* codec common registers */
> > + void *risc_on;
> > + void *risc2host_int;
> > + void *host2risc_int;
> > + void *risc_base_address;
> > + void *mfc_reset;
> > + void *host2risc_command;
> > + void *risc2host_command;
> > + void *mfc_bus_reset_ctrl;
> > + void *firmware_version;
> > + void *instance_id;
> > + void *codec_type;
> > + void *context_mem_addr;
> > + void *context_mem_size;
> > + void *pixel_format;
> > + void *metadata_enable;
> > + void *mfc_version;
> > + void *dbg_info_enable;
> > + void *dbg_buffer_addr;
> > + void *dbg_buffer_size;
> > + void *hed_control;
> > + void *mfc_timeout_value;
> > + void *hed_shared_mem_addr;
> > + void *dis_shared_mem_addr;/* only v7 */
> > + void *ret_instance_id;
> > + void *error_code;
> > + void *dbg_buffer_output_size;
> > + void *metadata_status;
> > + void *metadata_addr_mb_info;
> > + void *metadata_size_mb_info;
> > + void *dbg_info_stage_counter;
> > +
> > + /* decoder registers */
> > + void *d_crc_ctrl;
> > + void *d_dec_options;
> > + void *d_display_delay;
> > + void *d_set_frame_width;
> > + void *d_set_frame_height;
> > + void *d_sei_enable;
> > + void *d_min_num_dpb;
> > + void *d_min_first_plane_dpb_size;
> > + void *d_min_second_plane_dpb_size;
> > + void *d_min_third_plane_dpb_size;/* only v8 */
> > + void *d_min_num_mv;
> > + void *d_mvc_num_views;
> > + void *d_min_num_dis;/* only v7 */
> > + void *d_min_first_dis_size;/* only v7 */
> > + void *d_min_second_dis_size;/* only v7 */
> > + void *d_min_third_dis_size;/* only v7 */
> > + void *d_post_filter_luma_dpb0;/* v7 and v8 */
> > + void *d_post_filter_luma_dpb1;/* v7 and v8 */
> > + void *d_post_filter_luma_dpb2;/* only v7 */
> > + void *d_post_filter_chroma_dpb0;/* v7 and v8 */
> > + void *d_post_filter_chroma_dpb1;/* v7 and v8 */
> > + void *d_post_filter_chroma_dpb2;/* only v7 */
> > + void *d_num_dpb;
> > + void *d_num_mv;
> > + void *d_init_buffer_options;
> > + void *d_first_plane_dpb_stride_size;/* only v8 */
> > + void *d_second_plane_dpb_stride_size;/* only v8 */
> > + void *d_third_plane_dpb_stride_size;/* only v8 */
> > + void *d_first_plane_dpb_size;
> > + void *d_second_plane_dpb_size;
> > + void *d_third_plane_dpb_size;/* only v8 */
> > + void *d_mv_buffer_size;
> > + void *d_first_plane_dpb;
> > + void *d_second_plane_dpb;
> > + void *d_third_plane_dpb;
> > + void *d_mv_buffer;
> > + void *d_scratch_buffer_addr;
> > + void *d_scratch_buffer_size;
> > + void *d_metadata_buffer_addr;
> > + void *d_metadata_buffer_size;
> > + void *d_nal_start_options;/* v7 and v8 */
> > + void *d_cpb_buffer_addr;
> > + void *d_cpb_buffer_size;
> > + void *d_available_dpb_flag_upper;
> > + void *d_available_dpb_flag_lower;
> > + void *d_cpb_buffer_offset;
> > + void *d_slice_if_enable;
> > + void *d_picture_tag;
> > + void *d_stream_data_size;
> > + void *d_dynamic_dpb_flag_upper;/* v7 and v8 */
> > + void *d_dynamic_dpb_flag_lower;/* v7 and v8 */
> > + void *d_display_frame_width;
> > + void *d_display_frame_height;
> > + void *d_display_status;
> > + void *d_display_first_plane_addr;
> > + void *d_display_second_plane_addr;
> > + void *d_display_third_plane_addr;/* only v8 */
> > + void *d_display_frame_type;
> > + void *d_display_crop_info1;
> > + void *d_display_crop_info2;
> > + void *d_display_picture_profile;
> > + void *d_display_luma_crc;/* v7 and v8 */
> > + void *d_display_chroma0_crc;/* v7 and v8 */
> > + void *d_display_chroma1_crc;/* only v8 */
> > + void *d_display_luma_crc_top;/* only v6 */
> > + void *d_display_chroma_crc_top;/* only v6 */
> > + void *d_display_luma_crc_bot;/* only v6 */
> > + void *d_display_chroma_crc_bot;/* only v6 */
> > + void *d_display_aspect_ratio;
> > + void *d_display_extended_ar;
> > + void *d_decoded_frame_width;
> > + void *d_decoded_frame_height;
> > + void *d_decoded_status;
> > + void *d_decoded_first_plane_addr;
> > + void *d_decoded_second_plane_addr;
> > + void *d_decoded_third_plane_addr;/* only v8 */
> > + void *d_decoded_frame_type;
> > + void *d_decoded_crop_info1;
> > + void *d_decoded_crop_info2;
> > + void *d_decoded_picture_profile;
> > + void *d_decoded_nal_size;
> > + void *d_decoded_luma_crc;
> > + void *d_decoded_chroma0_crc;
> > + void *d_decoded_chroma1_crc;/* only v8 */
> > + void *d_ret_picture_tag_top;
> > + void *d_ret_picture_tag_bot;
> > + void *d_ret_picture_time_top;
> > + void *d_ret_picture_time_bot;
> > + void *d_chroma_format;
> > + void *d_vc1_info;/* v7 and v8 */
> > + void *d_mpeg4_info;
> > + void *d_h264_info;
> > + void *d_metadata_addr_concealed_mb;
> > + void *d_metadata_size_concealed_mb;
> > + void *d_metadata_addr_vc1_param;
> > + void *d_metadata_size_vc1_param;
> > + void *d_metadata_addr_sei_nal;
> > + void *d_metadata_size_sei_nal;
> > + void *d_metadata_addr_vui;
> > + void *d_metadata_size_vui;
> > + void *d_metadata_addr_mvcvui;/* v7 and v8 */
> > + void *d_metadata_size_mvcvui;/* v7 and v8 */
> > + void *d_mvc_view_id;
> > + void *d_frame_pack_sei_avail;
> > + void *d_frame_pack_arrgment_id;
> > + void *d_frame_pack_sei_info;
> > + void *d_frame_pack_grid_pos;
> > + void *d_display_recovery_sei_info;/* v7 and v8 */
> > + void *d_decoded_recovery_sei_info;/* v7 and v8 */
> > + void *d_display_first_addr;/* only v7 */
> > + void *d_display_second_addr;/* only v7 */
> > + void *d_display_third_addr;/* only v7 */
> > + void *d_decoded_first_addr;/* only v7 */
> > + void *d_decoded_second_addr;/* only v7 */
> > + void *d_decoded_third_addr;/* only v7 */
> > + void *d_used_dpb_flag_upper;/* v7 and v8 */
> > + void *d_used_dpb_flag_lower;/* v7 and v8 */
> > +
> > + /* encoder registers */
> > + void *e_frame_width;
> > + void *e_frame_height;
> > + void *e_cropped_frame_width;
> > + void *e_cropped_frame_height;
> > + void *e_frame_crop_offset;
> > + void *e_enc_options;
> > + void *e_picture_profile;
> > + void *e_vbv_buffer_size;
> > + void *e_vbv_init_delay;
> > + void *e_fixed_picture_qp;
> > + void *e_rc_config;
> > + void *e_rc_qp_bound;
> > + void *e_rc_qp_bound_pb;/* v7 and v8 */
> > + void *e_rc_mode;
> > + void *e_mb_rc_config;
> > + void *e_padding_ctrl;
> > + void *e_air_threshold;
> > + void *e_mv_hor_range;
> > + void *e_mv_ver_range;
> > + void *e_num_dpb;
> > + void *e_luma_dpb;
> > + void *e_chroma_dpb;
> > + void *e_me_buffer;
> > + void *e_scratch_buffer_addr;
> > + void *e_scratch_buffer_size;
> > + void *e_tmv_buffer0;
> > + void *e_tmv_buffer1;
> > + void *e_ir_buffer_addr;/* v7 and v8 */
> > + void *e_source_first_plane_addr;
> > + void *e_source_second_plane_addr;
> > + void *e_source_third_plane_addr;/* v7 and v8 */
> > + void *e_source_first_plane_stride;/* v7 and v8 */
> > + void *e_source_second_plane_stride;/* v7 and v8 */
> > + void *e_source_third_plane_stride;/* v7 and v8 */
> > + void *e_stream_buffer_addr;
> > + void *e_stream_buffer_size;
> > + void *e_roi_buffer_addr;
> > + void *e_param_change;
> > + void *e_ir_size;
> > + void *e_gop_config;
> > + void *e_mslice_mode;
> > + void *e_mslice_size_mb;
> > + void *e_mslice_size_bits;
> > + void *e_frame_insertion;
> > + void *e_rc_frame_rate;
> > + void *e_rc_bit_rate;
> > + void *e_rc_roi_ctrl;
> > + void *e_picture_tag;
> > + void *e_bit_count_enable;
> > + void *e_max_bit_count;
> > + void *e_min_bit_count;
> > + void *e_metadata_buffer_addr;
> > + void *e_metadata_buffer_size;
> > + void *e_encoded_source_first_plane_addr;
> > + void *e_encoded_source_second_plane_addr;
> > + void *e_encoded_source_third_plane_addr;/* v7 and v8 */
> > + void *e_stream_size;
> > + void *e_slice_type;
> > + void *e_picture_count;
> > + void *e_ret_picture_tag;
> > + void *e_stream_buffer_write_pointer; /* only v6 */
> > + void *e_recon_luma_dpb_addr;
> > + void *e_recon_chroma_dpb_addr;
> > + void *e_metadata_addr_enc_slice;
> > + void *e_metadata_size_enc_slice;
> > + void *e_mpeg4_options;
> > + void *e_mpeg4_hec_period;
> > + void *e_aspect_ratio;
> > + void *e_extended_sar;
> > + void *e_h264_options;
> > + void *e_h264_options_2;/* v7 and v8 */
> > + void *e_h264_lf_alpha_offset;
> > + void *e_h264_lf_beta_offset;
> > + void *e_h264_i_period;
> > + void *e_h264_fmo_slice_grp_map_type;
> > + void *e_h264_fmo_num_slice_grp_minus1;
> > + void *e_h264_fmo_slice_grp_change_dir;
> > + void *e_h264_fmo_slice_grp_change_rate_minus1;
> > + void *e_h264_fmo_run_length_minus1_0;
> > + void *e_h264_aso_slice_order_0;
> > + void *e_h264_chroma_qp_offset;
> > + void *e_h264_num_t_layer;
> > + void *e_h264_hierarchical_qp_layer0;
> > + void *e_h264_frame_packing_sei_info;
> > + void *e_h264_nal_control;/* v7 and v8 */
> > + void *e_mvc_frame_qp_view1;
> > + void *e_mvc_rc_bit_rate_view1;
> > + void *e_mvc_rc_qbound_view1;
> > + void *e_mvc_rc_mode_view1;
> > + void *e_mvc_inter_view_prediction_on;
> > + void *e_vp8_options;/* v7 and v8 */
> > + void *e_vp8_filter_options;/* v7 and v8 */
> > + void *e_vp8_golden_frame_option;/* v7 and v8 */
> > + void *e_vp8_num_t_layer;/* v7 and v8 */
> > + void *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
> > + void *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
> > + void *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
> > +};
> > +
> > struct s5p_mfc_hw_ops {
> > int (*alloc_dec_temp_buffers)(struct s5p_mfc_ctx *ctx);
> > void (*release_dec_desc_buffer)(struct s5p_mfc_ctx *ctx);
> > @@ -80,6 +333,7 @@ struct s5p_mfc_hw_ops {
> > };
> >
> > void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
> > +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev);
> > int s5p_mfc_alloc_priv_buf(struct device *dev,
> > struct s5p_mfc_priv_buf *b);
> > void s5p_mfc_release_priv_buf(struct device *dev,
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > index 356cfe5..65b8d20 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > @@ -44,10 +44,10 @@
> > } while (0)
> > #endif /* S5P_MFC_DEBUG_REGWRITE */
> >
> > -#define READL(offset) readl(dev->regs_base + (offset))
> > -#define WRITEL(data, offset) writel((data), dev->regs_base + (offset))
> > -#define OFFSETA(x) (((x) - dev->port_a) >>
> > S5P_FIMV_MEM_OFFSET)
> > -#define OFFSETB(x) (((x) - dev->port_b) >>
> > S5P_FIMV_MEM_OFFSET)
> > +#define READL(reg) \
> > + (WARN_ON_ONCE(!(reg)) ? 0 : readl(reg))
> > +#define WRITEL(data, reg) \
> > + (WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))
> >
> > /* Allocate temporary buffers for decoding */
> > static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx)
> > @@ -367,16 +367,17 @@ static int
> > s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
> > unsigned int strm_size)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
> >
> > mfc_debug_enter();
> > mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n"
> > "buf_size: 0x%08x (%d)\n",
> > ctx->inst_no, buf_addr, strm_size, strm_size);
> > - WRITEL(strm_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> > - WRITEL(buf_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> > - WRITEL(buf_size->cpb, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> > - WRITEL(start_num_byte, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> > + WRITEL(strm_size, mfc_regs->d_stream_data_size);
> > + WRITEL(buf_addr, mfc_regs->d_cpb_buffer_addr);
> > + WRITEL(buf_size->cpb, mfc_regs->d_cpb_buffer_size);
> > + WRITEL(start_num_byte, mfc_regs->d_cpb_buffer_offset);
> >
> > mfc_debug_leave();
> > return 0;
> > @@ -388,6 +389,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > unsigned int frame_size, i;
> > unsigned int frame_size_ch, frame_size_mv;
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > size_t buf_addr1;
> > int buf_size1;
> > int align_gap;
> > @@ -399,19 +401,19 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
> > mfc_debug(2, "Setting display delay to %d\n", ctx->display_delay);
> >
> > - WRITEL(ctx->total_dpb_count, S5P_FIMV_D_NUM_DPB_V6);
> > - WRITEL(ctx->luma_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> > - WRITEL(ctx->chroma_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> > + WRITEL(ctx->total_dpb_count, mfc_regs->d_num_dpb);
> > + WRITEL(ctx->luma_size, mfc_regs->d_first_plane_dpb_size);
> > + WRITEL(ctx->chroma_size, mfc_regs->d_second_plane_dpb_size);
> >
> > - WRITEL(buf_addr1, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> > - WRITEL(ctx->scratch_buf_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> > + WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
> > + WRITEL(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
> > buf_addr1 += ctx->scratch_buf_size;
> > buf_size1 -= ctx->scratch_buf_size;
> >
> > if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||
> > ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){
> > - WRITEL(ctx->mv_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> > - WRITEL(ctx->mv_count, S5P_FIMV_D_NUM_MV_V6);
> > + WRITEL(ctx->mv_size, mfc_regs->d_mv_buffer_size);
> > + WRITEL(ctx->mv_count, mfc_regs->d_num_mv);
> > }
> >
> > frame_size = ctx->luma_size;
> > @@ -425,11 +427,11 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > mfc_debug(2, "Luma %d: %x\n", i,
> > ctx->dst_bufs[i].cookie.raw.luma);
> > WRITEL(ctx->dst_bufs[i].cookie.raw.luma,
> > - S5P_FIMV_D_LUMA_DPB_V6 + i * 4);
> > + mfc_regs->d_first_plane_dpb + i * 4);
> > mfc_debug(2, "\tChroma %d: %x\n", i,
> > ctx->dst_bufs[i].cookie.raw.chroma);
> > WRITEL(ctx->dst_bufs[i].cookie.raw.chroma,
> > - S5P_FIMV_D_CHROMA_DPB_V6 + i * 4);
> > + mfc_regs->d_second_plane_dpb + i * 4);
> > }
> > if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
> > ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {
> > @@ -442,7 +444,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> >
> > mfc_debug(2, "\tBuf1: %x, size: %d\n",
> > buf_addr1, buf_size1);
> > - WRITEL(buf_addr1, S5P_FIMV_D_MV_BUFFER_V6 + i * 4);
> > + WRITEL(buf_addr1, mfc_regs->d_mv_buffer + i * 4);
> > buf_addr1 += frame_size_mv;
> > buf_size1 -= frame_size_mv;
> > }
> > @@ -455,7 +457,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > return -ENOMEM;
> > }
> >
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > S5P_FIMV_CH_INIT_BUFS_V6, NULL);
> >
> > @@ -468,9 +470,10 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct
> > s5p_mfc_ctx *ctx,
> > unsigned long addr, unsigned int size)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > - WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align */
> > - WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> > + WRITEL(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */
> > + WRITEL(size, mfc_regs->e_stream_buffer_size);
> >
> > mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",
> > addr, size);
> > @@ -482,14 +485,10 @@ static void
> > s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> > unsigned long y_addr, unsigned long c_addr)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > - if (IS_MFCV7(dev)) {
> > - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> > - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> > - } else {
> > - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> > - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> > - }
> > + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
> > + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
> >
> > mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);
> > mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);
> > @@ -499,18 +498,14 @@ static void
> > s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> > unsigned long *y_addr, unsigned long *c_addr)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > unsigned long enc_recon_y_addr, enc_recon_c_addr;
> >
> > - if (IS_MFCV7(dev)) {
> > - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> > - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> > - } else {
> > - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> > - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> > - }
> > + *y_addr = READL(mfc_regs->e_encoded_source_first_plane_addr);
> > + *c_addr = READL(mfc_regs->e_encoded_source_second_plane_addr);
> >
> > - enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> > - enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> > + enc_recon_y_addr = READL(mfc_regs->e_recon_luma_dpb_addr);
> > + enc_recon_c_addr = READL(mfc_regs->e_recon_chroma_dpb_addr);
> >
> > mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);
> > mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);
> > @@ -520,6 +515,7 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct
> > s5p_mfc_ctx *ctx,
> > static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > size_t buf_addr1;
> > int i, buf_size1;
> >
> > @@ -531,24 +527,24 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
> >
> > for (i = 0; i < ctx->pb_count; i++) {
> > - WRITEL(buf_addr1, S5P_FIMV_E_LUMA_DPB_V6 + (4 * i));
> > + WRITEL(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
> > buf_addr1 += ctx->luma_dpb_size;
> > - WRITEL(buf_addr1, S5P_FIMV_E_CHROMA_DPB_V6 + (4 * i));
> > + WRITEL(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i));
> > buf_addr1 += ctx->chroma_dpb_size;
> > - WRITEL(buf_addr1, S5P_FIMV_E_ME_BUFFER_V6 + (4 * i));
> > + WRITEL(buf_addr1, mfc_regs->e_me_buffer + (4 * i));
> > buf_addr1 += ctx->me_buffer_size;
> > buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size +
> > ctx->me_buffer_size);
> > }
> >
> > - WRITEL(buf_addr1, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> > - WRITEL(ctx->scratch_buf_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> > + WRITEL(buf_addr1, mfc_regs->e_scratch_buffer_addr);
> > + WRITEL(ctx->scratch_buf_size, mfc_regs->e_scratch_buffer_size);
> > buf_addr1 += ctx->scratch_buf_size;
> > buf_size1 -= ctx->scratch_buf_size;
> >
> > - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER0_V6);
> > + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer0);
> > buf_addr1 += ctx->tmv_buffer_size >> 1;
> > - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER1_V6);
> > + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer1);
> > buf_addr1 += ctx->tmv_buffer_size >> 1;
> > buf_size1 -= ctx->tmv_buffer_size;
> >
> > @@ -559,7 +555,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > return -ENOMEM;
> > }
> >
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > S5P_FIMV_CH_INIT_BUFS_V6, NULL);
> >
> > @@ -571,18 +567,19 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > /* multi-slice control */
> > /* multi-slice MB number or bit size */
> > - WRITEL(ctx->slice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> > + WRITEL(ctx->slice_mode, mfc_regs->e_mslice_mode);
> > if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
> > - WRITEL(ctx->slice_size.mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> > + WRITEL(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
> > } else if (ctx->slice_mode ==
> > V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> > - WRITEL(ctx->slice_size.bits,
> > S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> > + WRITEL(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
> > } else {
> > - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> > - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> > + WRITEL(0x0, mfc_regs->e_mslice_size_mb);
> > + WRITEL(0x0, mfc_regs->e_mslice_size_bits);
> > }
> >
> > return 0;
> > @@ -591,27 +588,28 @@ static int s5p_mfc_set_slice_mode(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > unsigned int reg = 0;
> >
> > mfc_debug_enter();
> >
> > /* width */
> > - WRITEL(ctx->img_width, S5P_FIMV_E_FRAME_WIDTH_V6); /* 16 align */
> > + WRITEL(ctx->img_width, mfc_regs->e_frame_width); /* 16 align */
> > /* height */
> > - WRITEL(ctx->img_height, S5P_FIMV_E_FRAME_HEIGHT_V6); /* 16 align
> > */
> > + WRITEL(ctx->img_height, mfc_regs->e_frame_height); /* 16 align */
> >
> > /* cropped width */
> > - WRITEL(ctx->img_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> > + WRITEL(ctx->img_width, mfc_regs->e_cropped_frame_width);
> > /* cropped height */
> > - WRITEL(ctx->img_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> > + WRITEL(ctx->img_height, mfc_regs->e_cropped_frame_height);
> > /* cropped offset */
> > - WRITEL(0x0, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> > + WRITEL(0x0, mfc_regs->e_frame_crop_offset);
> >
> > /* pictype : IDR period */
> > reg = 0;
> > reg |= p->gop_size & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_gop_config);
> >
> > /* multi-slice control */
> > /* multi-slice MB number or bit size */
> > @@ -619,65 +617,65 @@ static int s5p_mfc_set_enc_params(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0;
> > if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
> > reg |= (0x1 << 3);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> > ctx->slice_size.mb = p->slice_mb;
> > } else if (p->slice_mode ==
> > V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> > reg |= (0x1 << 3);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> > ctx->slice_size.bits = p->slice_bit;
> > } else {
> > reg &= ~(0x1 << 3);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> > }
> >
> > s5p_mfc_set_slice_mode(ctx);
> >
> > /* cyclic intra refresh */
> > - WRITEL(p->intra_refresh_mb, S5P_FIMV_E_IR_SIZE_V6);
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(p->intra_refresh_mb, mfc_regs->e_ir_size);
> > + reg = READL(mfc_regs->e_enc_options);
> > if (p->intra_refresh_mb == 0)
> > reg &= ~(0x1 << 4);
> > else
> > reg |= (0x1 << 4);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> >
> > /* 'NON_REFERENCE_STORE_ENABLE' for debugging */
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_enc_options);
> > reg &= ~(0x1 << 9);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> >
> > /* memory structure cur. frame */
> > if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12M) {
> > /* 0: Linear, 1: 2D tiled*/
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_enc_options);
> > reg &= ~(0x1 << 7);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> > + WRITEL(0x0, mfc_regs->pixel_format);
> > } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV21M) {
> > /* 0: Linear, 1: 2D tiled*/
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_enc_options);
> > reg &= ~(0x1 << 7);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> > + WRITEL(0x1, mfc_regs->pixel_format);
> > } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16) {
> > /* 0: Linear, 1: 2D tiled*/
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_enc_options);
> > reg |= (0x1 << 7);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> > + WRITEL(0x0, mfc_regs->pixel_format);
> > }
> >
> > /* memory structure recon. frame */
> > /* 0: Linear, 1: 2D tiled */
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_enc_options);
> > reg |= (0x1 << 8);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> >
> > /* padding control & value */
> > - WRITEL(0x0, S5P_FIMV_E_PADDING_CTRL_V6);
> > + WRITEL(0x0, mfc_regs->e_padding_ctrl);
> > if (p->pad) {
> > reg = 0;
> > /** enable */
> > @@ -688,64 +686,64 @@ static int s5p_mfc_set_enc_params(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p->pad_cb & 0xFF) << 8);
> > /** y value */
> > reg |= p->pad_luma & 0xFF;
> > - WRITEL(reg, S5P_FIMV_E_PADDING_CTRL_V6);
> > + WRITEL(reg, mfc_regs->e_padding_ctrl);
> > }
> >
> > /* rate control config. */
> > reg = 0;
> > /* frame-level rate control */
> > reg |= ((p->rc_frame & 0x1) << 9);
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* bit rate */
> > if (p->rc_frame)
> > WRITEL(p->rc_bitrate,
> > - S5P_FIMV_E_RC_BIT_RATE_V6);
> > + mfc_regs->e_rc_bit_rate);
> > else
> > - WRITEL(1, S5P_FIMV_E_RC_BIT_RATE_V6);
> > + WRITEL(1, mfc_regs->e_rc_bit_rate);
> >
> > /* reaction coefficient */
> > if (p->rc_frame) {
> > if (p->rc_reaction_coeff < TIGHT_CBR_MAX) /* tight CBR */
> > - WRITEL(1, S5P_FIMV_E_RC_RPARAM_V6);
> > + WRITEL(1, mfc_regs->e_rc_mode);
> > else /* loose CBR */
> > - WRITEL(2, S5P_FIMV_E_RC_RPARAM_V6);
> > + WRITEL(2, mfc_regs->e_rc_mode);
> > }
> >
> > /* seq header ctrl */
> > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_enc_options);
> > reg &= ~(0x1 << 2);
> > reg |= ((p->seq_hdr_mode & 0x1) << 2);
> >
> > /* frame skip mode */
> > reg &= ~(0x3);
> > reg |= (p->frame_skip_mode & 0x3);
> > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_enc_options);
> >
> > /* 'DROP_CONTROL_ENABLE', disable */
> > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > + reg = READL(mfc_regs->e_rc_config);
> > reg &= ~(0x1 << 10);
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* setting for MV range [16, 256] */
> > reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> > - WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6);
> > + WRITEL(reg, mfc_regs->e_mv_hor_range);
> >
> > reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> > - WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6);
> > + WRITEL(reg, mfc_regs->e_mv_ver_range);
> >
> > - WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6);
> > - WRITEL(0x0, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> > - WRITEL(0x0, S5P_FIMV_E_PARAM_CHANGE_V6);
> > - WRITEL(0x0, S5P_FIMV_E_RC_ROI_CTRL_V6);
> > - WRITEL(0x0, S5P_FIMV_E_PICTURE_TAG_V6);
> > + WRITEL(0x0, mfc_regs->e_frame_insertion);
> > + WRITEL(0x0, mfc_regs->e_roi_buffer_addr);
> > + WRITEL(0x0, mfc_regs->e_param_change);
> > + WRITEL(0x0, mfc_regs->e_rc_roi_ctrl);
> > + WRITEL(0x0, mfc_regs->e_picture_tag);
> >
> > - WRITEL(0x0, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> > - WRITEL(0x0, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> > - WRITEL(0x0, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> > + WRITEL(0x0, mfc_regs->e_bit_count_enable);
> > + WRITEL(0x0, mfc_regs->e_max_bit_count);
> > + WRITEL(0x0, mfc_regs->e_min_bit_count);
> >
> > - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> > - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> > + WRITEL(0x0, mfc_regs->e_metadata_buffer_addr);
> > + WRITEL(0x0, mfc_regs->e_metadata_buffer_size);
> >
> > mfc_debug_leave();
> >
> > @@ -755,6 +753,7 @@ static int s5p_mfc_set_enc_params(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> > unsigned int reg = 0;
> > @@ -765,10 +764,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > s5p_mfc_set_enc_params(ctx);
> >
> > /* pictype : number of B */
> > - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> > + reg = READL(mfc_regs->e_gop_config);
> > reg &= ~(0x3 << 16);
> > reg |= ((p->num_b_frame & 0x3) << 16);
> > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_gop_config);
> >
> > /* profile & level */
> > reg = 0;
> > @@ -776,18 +775,19 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p_h264->level & 0xFF) << 8);
> > /** profile - 0 ~ 3 */
> > reg |= p_h264->profile & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > + WRITEL(reg, mfc_regs->e_picture_profile);
> >
> > /* rate control config. */
> > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > + reg = READL(mfc_regs->e_rc_config);
> > /** macroblock level rate control */
> > reg &= ~(0x1 << 8);
> > reg |= ((p->rc_mb & 0x1) << 8);
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> > +
> > /** frame QP */
> > reg &= ~(0x3F);
> > reg |= p_h264->rc_frame_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* max & min value of QP */
> > reg = 0;
> > @@ -795,16 +795,16 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p_h264->rc_max_qp & 0x3F) << 8);
> > /** min QP */
> > reg |= p_h264->rc_min_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> >
> > /* other QPs */
> > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > if (!p->rc_frame && !p->rc_mb) {
> > reg = 0;
> > reg |= ((p_h264->rc_b_frame_qp & 0x3F) << 16);
> > reg |= ((p_h264->rc_p_frame_qp & 0x3F) << 8);
> > reg |= p_h264->rc_frame_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > }
> >
> > /* frame rate */
> > @@ -812,38 +812,38 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0;
> > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > reg |= p->rc_framerate_denom & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > }
> >
> > /* vbv buffer size */
> > if (p->frame_skip_mode ==
> > V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > WRITEL(p_h264->cpb_size & 0xFFFF,
> > - S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > + mfc_regs->e_vbv_buffer_size);
> >
> > if (p->rc_frame)
> > - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> > }
> >
> > /* interlace */
> > reg = 0;
> > reg |= ((p_h264->interlace & 0x1) << 3);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* height */
> > if (p_h264->interlace) {
> > WRITEL(ctx->img_height >> 1,
> > - S5P_FIMV_E_FRAME_HEIGHT_V6); /* 32 align */
> > + mfc_regs->e_frame_height); /* 32 align */
> > /* cropped height */
> > WRITEL(ctx->img_height >> 1,
> > - S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> > + mfc_regs->e_cropped_frame_height);
> > }
> >
> > /* loop filter ctrl */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_h264_options);
> > reg &= ~(0x3 << 1);
> > reg |= ((p_h264->loop_filter_mode & 0x3) << 1);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* loopfilter alpha offset */
> > if (p_h264->loop_filter_alpha < 0) {
> > @@ -853,7 +853,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0x00;
> > reg |= (p_h264->loop_filter_alpha & 0xF);
> > }
> > - WRITEL(reg, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> > + WRITEL(reg, mfc_regs->e_h264_lf_alpha_offset);
> >
> > /* loopfilter beta offset */
> > if (p_h264->loop_filter_beta < 0) {
> > @@ -863,28 +863,28 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0x00;
> > reg |= (p_h264->loop_filter_beta & 0xF);
> > }
> > - WRITEL(reg, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> > + WRITEL(reg, mfc_regs->e_h264_lf_beta_offset);
> >
> > /* entropy coding mode */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1);
> > reg |= p_h264->entropy_mode & 0x1;
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* number of ref. picture */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 7);
> > reg |= (((p_h264->num_ref_pic_4p - 1) & 0x1) << 7);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* 8x8 transform enable */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + reg = READL(mfc_regs->e_h264_options);
> > reg &= ~(0x3 << 12);
> > reg |= ((p_h264->_8x8_transform & 0x3) << 12);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* macroblock adaptive scaling features */
> > - WRITEL(0x0, S5P_FIMV_E_MB_RC_CONFIG_V6);
> > + WRITEL(0x0, mfc_regs->e_mb_rc_config);
> > if (p->rc_mb) {
> > reg = 0;
> > /** dark region */
> > @@ -895,92 +895,95 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p_h264->rc_mb_static & 0x1) << 1);
> > /** high activity region */
> > reg |= p_h264->rc_mb_activity & 0x1;
> > - WRITEL(reg, S5P_FIMV_E_MB_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_mb_rc_config);
> > }
> >
> > /* aspect ratio VUI */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 5);
> > reg |= ((p_h264->vui_sar & 0x1) << 5);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > - WRITEL(0x0, S5P_FIMV_E_ASPECT_RATIO_V6);
> > - WRITEL(0x0, S5P_FIMV_E_EXTENDED_SAR_V6);
> > + WRITEL(0x0, mfc_regs->e_aspect_ratio);
> > + WRITEL(0x0, mfc_regs->e_extended_sar);
> > if (p_h264->vui_sar) {
> > /* aspect ration IDC */
> > reg = 0;
> > reg |= p_h264->vui_sar_idc & 0xFF;
> > - WRITEL(reg, S5P_FIMV_E_ASPECT_RATIO_V6);
> > + WRITEL(reg, mfc_regs->e_aspect_ratio);
> > if (p_h264->vui_sar_idc == 0xFF) {
> > /* extended SAR */
> > reg = 0;
> > reg |= (p_h264->vui_ext_sar_width & 0xFFFF) << 16;
> > reg |= p_h264->vui_ext_sar_height & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_EXTENDED_SAR_V6);
> > + WRITEL(reg, mfc_regs->e_extended_sar);
> > }
> > }
> >
> > /* intra picture period for H.264 open GOP */
> > /* control */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 4);
> > reg |= ((p_h264->open_gop & 0x1) << 4);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> > +
> > /* value */
> > - WRITEL(0x0, S5P_FIMV_E_H264_I_PERIOD_V6);
> > + WRITEL(0x0, mfc_regs->e_h264_i_period);
> > if (p_h264->open_gop) {
> > reg = 0;
> > reg |= p_h264->open_gop_size & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_H264_I_PERIOD_V6);
> > + WRITEL(reg, mfc_regs->e_h264_i_period);
> > }
> >
> > /* 'WEIGHTED_BI_PREDICTION' for B is disable */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x3 << 9);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 14);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* ASO */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 6);
> > reg |= ((p_h264->aso & 0x1) << 6);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> >
> > /* hier qp enable */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 8);
> > reg |= ((p_h264->open_gop & 0x1) << 8);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> > reg = 0;
> > if (p_h264->hier_qp && p_h264->hier_qp_layer) {
> > reg |= (p_h264->hier_qp_type & 0x1) << 0x3;
> > reg |= p_h264->hier_qp_layer & 0x7;
> > - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> > + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
> > /* QP value for each layer */
> > - for (i = 0; i < (p_h264->hier_qp_layer & 0x7); i++)
> > + for (i = 0; i < p_h264->hier_qp_layer &&
> > + i < ARRAY_SIZE(p_h264->hier_qp_layer_qp);
> i++)
> > {
> > WRITEL(p_h264->hier_qp_layer_qp[i],
> > - S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6 +
> > - i * 4);
> > + mfc_regs->e_h264_hierarchical_qp_layer0
> > + + i * 4);
> > + }
> > }
> > /* number of coding layer should be zero when hierarchical is
> > disable */
> > - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> > + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
> >
> > /* frame packing SEI generation */
> > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > + READL(mfc_regs->e_h264_options);
> > reg &= ~(0x1 << 25);
> > reg |= ((p_h264->sei_frame_packing & 0x1) << 25);
> > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->e_h264_options);
> > if (p_h264->sei_frame_packing) {
> > reg = 0;
> > /** current frame0 flag */
> > reg |= ((p_h264->sei_fp_curr_frame_0 & 0x1) << 2);
> > /** arrangement type */
> > reg |= p_h264->sei_fp_arrangement_type & 0x3;
> > - WRITEL(reg, S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> > + WRITEL(reg, mfc_regs->e_h264_frame_packing_sei_info);
> > }
> >
> > if (p_h264->fmo) {
> > @@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
> > if (p_h264->fmo_slice_grp > 4)
> > p_h264->fmo_slice_grp = 4;
> > - for (i = 0; i < (p_h264->fmo_slice_grp & 0xF); i++)
> > + for (i = 0; i < ARRAY_SIZE(p_h264->fmo_run_len)
> > + && i < p_h264->fmo_slice_grp; i++) {
> > WRITEL(p_h264->fmo_run_len[i] - 1,
> > - S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6 +
> > - i * 4);
> > +
> mfc_regs->e_h264_fmo_run_length_minus1_0
> > + + i * 4);
> > + }
> > break;
> > case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES:
> > if (p_h264->fmo_slice_grp > 4)
> > @@ -1002,10 +1007,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > if (p_h264->fmo_slice_grp > 2)
> > p_h264->fmo_slice_grp = 2;
> > WRITEL(p_h264->fmo_chg_dir & 0x1,
> > -
> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> > + mfc_regs->e_h264_fmo_slice_grp_change_dir);
> > /* the valid range is 0 ~ number of macroblocks -1
> */
> > WRITEL(p_h264->fmo_chg_rate,
> > -
> > S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> > + mfc_regs->e_h264_fmo_slice_grp_change_rate_minus1);
> > break;
> > default:
> > mfc_err("Unsupported map type for FMO: %d\n",
> > @@ -1016,11 +1021,11 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > }
> >
> > WRITEL(p_h264->fmo_map_type,
> > - S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> > + mfc_regs->e_h264_fmo_slice_grp_map_type);
> > WRITEL(p_h264->fmo_slice_grp - 1,
> > -
> S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> > + mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> > } else {
> > - WRITEL(0, S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> > + WRITEL(0, mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> > }
> >
> > mfc_debug_leave();
> > @@ -1031,6 +1036,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > struct s5p_mfc_mpeg4_enc_params *p_mpeg4 = &p->codec.mpeg4;
> > unsigned int reg = 0;
> > @@ -1040,10 +1046,10 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> > s5p_mfc_ctx *ctx)
> > s5p_mfc_set_enc_params(ctx);
> >
> > /* pictype : number of B */
> > - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> > + reg = READL(mfc_regs->e_gop_config);
> > reg &= ~(0x3 << 16);
> > reg |= ((p->num_b_frame & 0x3) << 16);
> > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_gop_config);
> >
> > /* profile & level */
> > reg = 0;
> > @@ -1051,18 +1057,19 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p_mpeg4->level & 0xFF) << 8);
> > /** profile - 0 ~ 1 */
> > reg |= p_mpeg4->profile & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > + WRITEL(reg, mfc_regs->e_picture_profile);
> >
> > /* rate control config. */
> > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > + reg = READL(mfc_regs->e_rc_config);
> > /** macroblock level rate control */
> > reg &= ~(0x1 << 8);
> > reg |= ((p->rc_mb & 0x1) << 8);
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> > +
> > /** frame QP */
> > reg &= ~(0x3F);
> > reg |= p_mpeg4->rc_frame_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* max & min value of QP */
> > reg = 0;
> > @@ -1070,16 +1077,16 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p_mpeg4->rc_max_qp & 0x3F) << 8);
> > /** min QP */
> > reg |= p_mpeg4->rc_min_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> >
> > /* other QPs */
> > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > if (!p->rc_frame && !p->rc_mb) {
> > reg = 0;
> > reg |= ((p_mpeg4->rc_b_frame_qp & 0x3F) << 16);
> > reg |= ((p_mpeg4->rc_p_frame_qp & 0x3F) << 8);
> > reg |= p_mpeg4->rc_frame_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > }
> >
> > /* frame rate */
> > @@ -1087,21 +1094,21 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0;
> > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > reg |= p->rc_framerate_denom & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > }
> >
> > /* vbv buffer size */
> > if (p->frame_skip_mode ==
> > V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
> >
> > if (p->rc_frame)
> > - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> > }
> >
> > /* Disable HEC */
> > - WRITEL(0x0, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> > - WRITEL(0x0, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> > + WRITEL(0x0, mfc_regs->e_mpeg4_options);
> > + WRITEL(0x0, mfc_regs->e_mpeg4_hec_period);
> >
> > mfc_debug_leave();
> >
> > @@ -1111,6 +1118,7 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > struct s5p_mfc_mpeg4_enc_params *p_h263 = &p->codec.mpeg4;
> > unsigned int reg = 0;
> > @@ -1123,18 +1131,19 @@ static int s5p_mfc_set_enc_params_h263(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0;
> > /** profile */
> > reg |= (0x1 << 4);
> > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > + WRITEL(reg, mfc_regs->e_picture_profile);
> >
> > /* rate control config. */
> > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > + reg = READL(mfc_regs->e_rc_config);
> > /** macroblock level rate control */
> > reg &= ~(0x1 << 8);
> > reg |= ((p->rc_mb & 0x1) << 8);
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> > +
> > /** frame QP */
> > reg &= ~(0x3F);
> > reg |= p_h263->rc_frame_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* max & min value of QP */
> > reg = 0;
> > @@ -1142,16 +1151,16 @@ static int s5p_mfc_set_enc_params_h263(struct
> > s5p_mfc_ctx *ctx)
> > reg |= ((p_h263->rc_max_qp & 0x3F) << 8);
> > /** min QP */
> > reg |= p_h263->rc_min_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> >
> > /* other QPs */
> > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > if (!p->rc_frame && !p->rc_mb) {
> > reg = 0;
> > reg |= ((p_h263->rc_b_frame_qp & 0x3F) << 16);
> > reg |= ((p_h263->rc_p_frame_qp & 0x3F) << 8);
> > reg |= p_h263->rc_frame_qp & 0x3F;
> > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > }
> >
> > /* frame rate */
> > @@ -1159,16 +1168,16 @@ static int s5p_mfc_set_enc_params_h263(struct
> > s5p_mfc_ctx *ctx)
> > reg = 0;
> > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > reg |= p->rc_framerate_denom & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > }
> >
> > /* vbv buffer size */
> > if (p->frame_skip_mode ==
> > V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
> >
> > if (p->rc_frame)
> > - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> > }
> >
> > mfc_debug_leave();
> > @@ -1179,6 +1188,7 @@ static int s5p_mfc_set_enc_params_h263(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > struct s5p_mfc_vp8_enc_params *p_vp8 = &p->codec.vp8;
> > unsigned int reg = 0;
> > @@ -1189,57 +1199,57 @@ static int s5p_mfc_set_enc_params_vp8(struct
> > s5p_mfc_ctx *ctx)
> > s5p_mfc_set_enc_params(ctx);
> >
> > /* pictype : number of B */
> > - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> > + reg = READL(mfc_regs->e_gop_config);
> > reg &= ~(0x3 << 16);
> > reg |= ((p->num_b_frame & 0x3) << 16);
> > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_gop_config);
> >
> > /* profile - 0 ~ 3 */
> > reg = p_vp8->profile & 0x3;
> > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > + WRITEL(reg, mfc_regs->e_picture_profile);
> >
> > /* rate control config. */
> > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > + reg = READL(mfc_regs->e_rc_config);
> > /** macroblock level rate control */
> > reg &= ~(0x1 << 8);
> > reg |= ((p->rc_mb & 0x1) << 8);
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* frame rate */
> > if (p->rc_frame && p->rc_framerate_num && p->rc_framerate_denom)
> > {
> > reg = 0;
> > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > reg |= p->rc_framerate_denom & 0xFFFF;
> > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > }
> >
> > /* frame QP */
> > reg &= ~(0x7F);
> > reg |= p_vp8->rc_frame_qp & 0x7F;
> > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > + WRITEL(reg, mfc_regs->e_rc_config);
> >
> > /* other QPs */
> > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > if (!p->rc_frame && !p->rc_mb) {
> > reg = 0;
> > reg |= ((p_vp8->rc_p_frame_qp & 0x7F) << 8);
> > reg |= p_vp8->rc_frame_qp & 0x7F;
> > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > }
> >
> > /* max QP */
> > reg = ((p_vp8->rc_max_qp & 0x7F) << 8);
> > /* min QP */
> > reg |= p_vp8->rc_min_qp & 0x7F;
> > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> >
> > /* vbv buffer size */
> > if (p->frame_skip_mode ==
> > V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
> >
> > if (p->rc_frame)
> > - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> > }
> >
> > /* VP8 specific params */
> > @@ -1263,7 +1273,7 @@ static int s5p_mfc_set_enc_params_vp8(struct
> > s5p_mfc_ctx *ctx)
> > }
> > reg |= (val & 0xF) << 3;
> > reg |= (p_vp8->num_ref & 0x2);
> > - WRITEL(reg, S5P_FIMV_E_VP8_OPTIONS_V7);
> > + WRITEL(reg, mfc_regs->e_vp8_options);
> >
> > mfc_debug_leave();
> >
> > @@ -1297,6 +1307,7 @@ static bool s5p_mfc_is_v6_new(struct s5p_mfc_dev
> > *dev)
> > static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > unsigned int reg = 0;
> > int fmo_aso_ctrl = 0;
> >
> > @@ -1304,9 +1315,9 @@ static int s5p_mfc_init_decode_v6(struct
> > s5p_mfc_ctx *ctx)
> > mfc_debug(2, "InstNo: %d/%d\n", ctx->inst_no,
> > S5P_FIMV_CH_SEQ_HEADER_V6);
> > mfc_debug(2, "BUFs: %08x %08x %08x\n",
> > - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> > - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> > - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6));
> > + READL(mfc_regs->d_cpb_buffer_addr),
> > + READL(mfc_regs->d_cpb_buffer_addr),
> > + READL(mfc_regs->d_cpb_buffer_addr));
> >
> > /* FMO_ASO_CTRL - 0: Enable, 1: Disable */
> > reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6);
> > @@ -1317,11 +1328,11 @@ static int s5p_mfc_init_decode_v6(struct
> > s5p_mfc_ctx *ctx)
> > * set to negative value. */
> > if (ctx->display_delay >= 0) {
> > reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6);
> > - WRITEL(ctx->display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> > + WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
> > }
> >
> > if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
> > - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->d_dec_options);
> > reg = 0;
> > }
> >
> > @@ -1336,21 +1347,21 @@ static int s5p_mfc_init_decode_v6(struct
> > s5p_mfc_ctx *ctx)
> > reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
> >
> > if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
> > - WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->d_init_buffer_options);
> > else
> > - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> > + WRITEL(reg, mfc_regs->d_dec_options);
> >
> > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV21M)
> > - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> > + WRITEL(0x1, mfc_regs->pixel_format);
> > else
> > - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> > + WRITEL(0x0, mfc_regs->pixel_format);
> >
> >
> > /* sei parse */
> > - WRITEL(ctx->sei_fp_parse & 0x1, S5P_FIMV_D_SEI_ENABLE_V6);
> > + WRITEL(ctx->sei_fp_parse & 0x1, mfc_regs->d_sei_enable);
> >
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
> >
> > @@ -1361,11 +1372,12 @@ static int s5p_mfc_init_decode_v6(struct
> > s5p_mfc_ctx *ctx)
> > static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int
> > flush)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > if (flush) {
> > dev->curr_ctx = ctx->num;
> > s5p_mfc_clean_ctx_int_flags(ctx);
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
> > }
> > @@ -1376,11 +1388,12 @@ static int s5p_mfc_decode_one_frame_v6(struct
> > s5p_mfc_ctx *ctx,
> > enum s5p_mfc_decode_arg last_frame)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > - WRITEL(ctx->dec_dst_flag, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> > - WRITEL(ctx->slice_interface & 0x1, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> > + WRITEL(ctx->dec_dst_flag, mfc_regs->d_available_dpb_flag_lower);
> > + WRITEL(ctx->slice_interface & 0x1, mfc_regs->d_slice_if_enable);
> >
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > /* Issue different commands to instance basing on whether it
> > * is the last frame or not. */
> > switch (last_frame) {
> > @@ -1404,6 +1417,7 @@ static int s5p_mfc_decode_one_frame_v6(struct
> > s5p_mfc_ctx *ctx,
> > static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > if (ctx->codec_mode == S5P_MFC_CODEC_H264_ENC)
> > s5p_mfc_set_enc_params_h264(ctx);
> > @@ -1419,13 +1433,13 @@ static int s5p_mfc_init_encode_v6(struct
> > s5p_mfc_ctx *ctx)
> > return -EINVAL;
> > }
> >
> > - /* Set stride lengths */
> > + /* Set stride lengths for v7 & above */
> > if (IS_MFCV7(dev)) {
> > - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> > - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> > + WRITEL(ctx->img_width, mfc_regs-
> > >e_source_first_plane_stride);
> > + WRITEL(ctx->img_width, mfc_regs-
> > >e_source_second_plane_stride);
> > }
> >
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
> >
> > @@ -1435,14 +1449,16 @@ static int s5p_mfc_init_encode_v6(struct
> > s5p_mfc_ctx *ctx)
> > static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> > int i;
> >
> > if (p_h264->aso) {
> > - for (i = 0; i < 8; i++)
> > + for (i = 0; i < ARRAY_SIZE(p_h264->aso_slice_order); i++) {
> > WRITEL(p_h264->aso_slice_order[i],
> > - S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6 + i *
> 4);
> > + mfc_regs->e_h264_aso_slice_order_0 + i * 4);
> > + }
> > }
> > return 0;
> > }
> > @@ -1451,6 +1467,7 @@ static int
> > s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> > static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
> > {
> > struct s5p_mfc_dev *dev = ctx->dev;
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> >
> > mfc_debug(2, "++\n");
> >
> > @@ -1461,7 +1478,7 @@ static int s5p_mfc_encode_one_frame_v6(struct
> > s5p_mfc_ctx *ctx)
> >
> > s5p_mfc_set_slice_mode(ctx);
> >
> > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > S5P_FIMV_CH_FRAME_START_V6, NULL);
> >
> > @@ -1836,28 +1853,26 @@ static void s5p_mfc_cleanup_queue_v6(struct
> > list_head *lh, struct vb2_queue *vq)
> >
> > static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
> > {
> > - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
> > - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_INT_V6);
> > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > + WRITEL(0, mfc_regs->risc2host_command);
> > + WRITEL(0, mfc_regs->risc2host_int);
> > }
> >
> > static void s5p_mfc_write_info_v6(struct s5p_mfc_ctx *ctx, unsigned
> > int data,
> > unsigned int ofs)
> > {
> > - struct s5p_mfc_dev *dev = ctx->dev;
> > -
> > s5p_mfc_clock_on();
> > - WRITEL(data, ofs);
> > + WRITEL(data, (void *)ofs);
> > s5p_mfc_clock_off();
> > }
> >
> > static unsigned int
> > s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
> > {
> > - struct s5p_mfc_dev *dev = ctx->dev;
> > int ret;
> >
> > s5p_mfc_clock_on();
> > - ret = READL(ofs);
> > + ret = READL((void *)ofs);
> > s5p_mfc_clock_off();
> >
> > return ret;
> > @@ -1865,50 +1880,51 @@ s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx,
> > unsigned int ofs)
> >
> > static int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> > + return READL(dev->mfc_regs->d_display_first_plane_addr);
> > }
> >
> > static int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> > + return READL(dev->mfc_regs->d_decoded_first_plane_addr);
> > }
> >
> > static int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_STATUS_V6);
> > + return READL(dev->mfc_regs->d_display_status);
> > }
> >
> > static int s5p_mfc_get_dec_status_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DECODED_STATUS_V6);
> > + return READL(dev->mfc_regs->d_decoded_status);
> > }
> >
> > static int s5p_mfc_get_dec_frame_type_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DECODED_FRAME_TYPE_V6) &
> > + return READL(dev->mfc_regs->d_decoded_frame_type) &
> > S5P_FIMV_DECODE_FRAME_MASK_V6;
> > }
> >
> > static int s5p_mfc_get_disp_frame_type_v6(struct s5p_mfc_ctx *ctx)
> > {
> > - return mfc_read(ctx->dev, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6) &
> > + struct s5p_mfc_dev *dev = ctx->dev;
> > + return READL(dev->mfc_regs->d_display_frame_type) &
> > S5P_FIMV_DECODE_FRAME_MASK_V6;
> > }
> >
> > static int s5p_mfc_get_consumed_stream_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> > + return READL(dev->mfc_regs->d_decoded_nal_size);
> > }
> >
> > static int s5p_mfc_get_int_reason_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_RISC2HOST_CMD_V6) &
> > + return READL(dev->mfc_regs->risc2host_command) &
> > S5P_FIMV_RISC2HOST_CMD_MASK;
> > }
> >
> > static int s5p_mfc_get_int_err_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_ERROR_CODE_V6);
> > + return READL(dev->mfc_regs->error_code);
> > }
> >
> > static int s5p_mfc_err_dec_v6(unsigned int err)
> > @@ -1923,82 +1939,263 @@ static int s5p_mfc_err_dspl_v6(unsigned int
> > err)
> >
> > static int s5p_mfc_get_img_width_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> > + return READL(dev->mfc_regs->d_display_frame_width);
> > }
> >
> > static int s5p_mfc_get_img_height_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> > + return READL(dev->mfc_regs->d_display_frame_height);
> > }
> >
> > static int s5p_mfc_get_dpb_count_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_DPB_V6);
> > + return READL(dev->mfc_regs->d_min_num_dpb);
> > }
> >
> > static int s5p_mfc_get_mv_count_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_MV_V6);
> > + return READL(dev->mfc_regs->d_min_num_mv);
> > }
> >
> > static int s5p_mfc_get_inst_no_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_RET_INSTANCE_ID_V6);
> > + return READL(dev->mfc_regs->ret_instance_id);
> > }
> >
> > static int s5p_mfc_get_enc_dpb_count_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_E_NUM_DPB_V6);
> > + return READL(dev->mfc_regs->e_num_dpb);
> > }
> >
> > static int s5p_mfc_get_enc_strm_size_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_E_STREAM_SIZE_V6);
> > + return READL(dev->mfc_regs->e_stream_size);
> > }
> >
> > static int s5p_mfc_get_enc_slice_type_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_E_SLICE_TYPE_V6);
> > + return READL(dev->mfc_regs->e_slice_type);
> > }
> >
> > static int s5p_mfc_get_enc_pic_count_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_E_PICTURE_COUNT_V6);
> > + return READL(dev->mfc_regs->e_picture_count);
> > }
> >
> > static int s5p_mfc_get_sei_avail_status_v6(struct s5p_mfc_ctx *ctx)
> > {
> > - return mfc_read(ctx->dev, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> > + struct s5p_mfc_dev *dev = ctx->dev;
> > + return READL(dev->mfc_regs->d_frame_pack_sei_avail);
> > }
> >
> > static int s5p_mfc_get_mvc_num_views_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> > + return READL(dev->mfc_regs->d_mvc_num_views);
> > }
> >
> > static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
> > {
> > - return mfc_read(dev, S5P_FIMV_D_MVC_VIEW_ID_V6);
> > + return READL(dev->mfc_regs->d_mvc_view_id);
> > }
> >
> > static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx
> > *ctx)
> > {
> > - return s5p_mfc_read_info_v6(ctx, PIC_TIME_TOP_V6);
> > + return s5p_mfc_read_info_v6(ctx,
> > + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top);
> > }
> >
> > static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx
> > *ctx)
> > {
> > - return s5p_mfc_read_info_v6(ctx, PIC_TIME_BOT_V6);
> > + return s5p_mfc_read_info_v6(ctx,
> > + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot);
> > }
> >
> > static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx)
> > {
> > - return s5p_mfc_read_info_v6(ctx, CROP_INFO_H_V6);
> > + return s5p_mfc_read_info_v6(ctx,
> > + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
> > }
> >
> > static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
> > {
> > - return s5p_mfc_read_info_v6(ctx, CROP_INFO_V_V6);
> > + return s5p_mfc_read_info_v6(ctx,
> > + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info2);
> > +}
> > +
> > +static struct s5p_mfc_regs mfc_regs;
> > +
> > +/* Initialize registers for MFC v6 onwards */
> > +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> > s5p_mfc_dev *dev)
> > +{
> > + memset(&mfc_regs, 0, sizeof(mfc_regs));
> > +
> > +#define S5P_MFC_REG_ADDR(dev, reg) ((dev)->regs_base + (reg))
> > +#define R(m, r) mfc_regs.m = S5P_MFC_REG_ADDR(dev, r)
> > + /* codec common registers */
> > + R(risc_on, S5P_FIMV_RISC_ON_V6);
> > + R(risc2host_int, S5P_FIMV_RISC2HOST_INT_V6);
> > + R(host2risc_int, S5P_FIMV_HOST2RISC_INT_V6);
> > + R(risc_base_address, S5P_FIMV_RISC_BASE_ADDRESS_V6);
> > + R(mfc_reset, S5P_FIMV_MFC_RESET_V6);
> > + R(host2risc_command, S5P_FIMV_HOST2RISC_CMD_V6);
> > + R(risc2host_command, S5P_FIMV_RISC2HOST_CMD_V6);
> > + R(firmware_version, S5P_FIMV_FW_VERSION_V6);
> > + R(instance_id, S5P_FIMV_INSTANCE_ID_V6);
> > + R(codec_type, S5P_FIMV_CODEC_TYPE_V6);
> > + R(context_mem_addr, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
> > + R(context_mem_size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
> > + R(pixel_format, S5P_FIMV_PIXEL_FORMAT_V6);
> > + R(ret_instance_id, S5P_FIMV_RET_INSTANCE_ID_V6);
> > + R(error_code, S5P_FIMV_ERROR_CODE_V6);
> > +
> > + /* decoder registers */
> > + R(d_crc_ctrl, S5P_FIMV_D_CRC_CTRL_V6);
> > + R(d_dec_options, S5P_FIMV_D_DEC_OPTIONS_V6);
> > + R(d_display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> > + R(d_sei_enable, S5P_FIMV_D_SEI_ENABLE_V6);
> > + R(d_min_num_dpb, S5P_FIMV_D_MIN_NUM_DPB_V6);
> > + R(d_min_num_mv, S5P_FIMV_D_MIN_NUM_MV_V6);
> > + R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> > + R(d_num_dpb, S5P_FIMV_D_NUM_DPB_V6);
> > + R(d_num_mv, S5P_FIMV_D_NUM_MV_V6);
> > + R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> > + R(d_first_plane_dpb_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> > + R(d_second_plane_dpb_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> > + R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> > + R(d_first_plane_dpb, S5P_FIMV_D_LUMA_DPB_V6);
> > + R(d_second_plane_dpb, S5P_FIMV_D_CHROMA_DPB_V6);
> > + R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V6);
> > + R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> > + R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> > + R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> > + R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> > + R(d_available_dpb_flag_lower,
> > S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> > + R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> > + R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> > + R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> > + R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> > + R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> > + R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V6);
> > + R(d_display_first_plane_addr, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> > + R(d_display_second_plane_addr, S5P_FIMV_D_DISPLAY_CHROMA_ADDR_V6);
> > + R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6);
> > + R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V6);
> > + R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V6);
> > + R(d_display_aspect_ratio, S5P_FIMV_D_DISPLAY_ASPECT_RATIO_V6);
> > + R(d_display_extended_ar, S5P_FIMV_D_DISPLAY_EXTENDED_AR_V6);
> > + R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V6);
> > + R(d_decoded_first_plane_addr, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> > + R(d_decoded_second_plane_addr, S5P_FIMV_D_DECODED_CHROMA_ADDR_V6);
> > + R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V6);
> > + R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> > + R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6);
> > + R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6);
> > + R(d_h264_info, S5P_FIMV_D_H264_INFO_V6);
> > + R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V6);
> > + R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> > +
> > + /* encoder registers */
> > + R(e_frame_width, S5P_FIMV_E_FRAME_WIDTH_V6);
> > + R(e_frame_height, S5P_FIMV_E_FRAME_HEIGHT_V6);
> > + R(e_cropped_frame_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> > + R(e_cropped_frame_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> > + R(e_frame_crop_offset, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> > + R(e_enc_options, S5P_FIMV_E_ENC_OPTIONS_V6);
> > + R(e_picture_profile, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > + R(e_vbv_buffer_size, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > + R(e_vbv_init_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > + R(e_fixed_picture_qp, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > + R(e_rc_config, S5P_FIMV_E_RC_CONFIG_V6);
> > + R(e_rc_qp_bound, S5P_FIMV_E_RC_QP_BOUND_V6);
> > + R(e_rc_mode, S5P_FIMV_E_RC_RPARAM_V6);
> > + R(e_mb_rc_config, S5P_FIMV_E_MB_RC_CONFIG_V6);
> > + R(e_padding_ctrl, S5P_FIMV_E_PADDING_CTRL_V6);
> > + R(e_mv_hor_range, S5P_FIMV_E_MV_HOR_RANGE_V6);
> > + R(e_mv_ver_range, S5P_FIMV_E_MV_VER_RANGE_V6);
> > + R(e_num_dpb, S5P_FIMV_E_NUM_DPB_V6);
> > + R(e_luma_dpb, S5P_FIMV_E_LUMA_DPB_V6);
> > + R(e_chroma_dpb, S5P_FIMV_E_CHROMA_DPB_V6);
> > + R(e_me_buffer, S5P_FIMV_E_ME_BUFFER_V6);
> > + R(e_scratch_buffer_addr, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> > + R(e_scratch_buffer_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> > + R(e_tmv_buffer0, S5P_FIMV_E_TMV_BUFFER0_V6);
> > + R(e_tmv_buffer1, S5P_FIMV_E_TMV_BUFFER1_V6);
> > + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> > + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> > + R(e_stream_buffer_addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6);
> > + R(e_stream_buffer_size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> > + R(e_roi_buffer_addr, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> > + R(e_param_change, S5P_FIMV_E_PARAM_CHANGE_V6);
> > + R(e_ir_size, S5P_FIMV_E_IR_SIZE_V6);
> > + R(e_gop_config, S5P_FIMV_E_GOP_CONFIG_V6);
> > + R(e_mslice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> > + R(e_mslice_size_mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> > + R(e_mslice_size_bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> > + R(e_frame_insertion, S5P_FIMV_E_FRAME_INSERTION_V6);
> > + R(e_rc_frame_rate, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > + R(e_rc_bit_rate, S5P_FIMV_E_RC_BIT_RATE_V6);
> > + R(e_rc_roi_ctrl, S5P_FIMV_E_RC_ROI_CTRL_V6);
> > + R(e_picture_tag, S5P_FIMV_E_PICTURE_TAG_V6);
> > + R(e_bit_count_enable, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> > + R(e_max_bit_count, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> > + R(e_min_bit_count, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> > + R(e_metadata_buffer_addr, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> > + R(e_metadata_buffer_size, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> > + R(e_encoded_source_first_plane_addr,
> > + S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> > + R(e_encoded_source_second_plane_addr,
> > + S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> > + R(e_stream_size, S5P_FIMV_E_STREAM_SIZE_V6);
> > + R(e_slice_type, S5P_FIMV_E_SLICE_TYPE_V6);
> > + R(e_picture_count, S5P_FIMV_E_PICTURE_COUNT_V6);
> > + R(e_ret_picture_tag, S5P_FIMV_E_RET_PICTURE_TAG_V6);
> > + R(e_recon_luma_dpb_addr, S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> > + R(e_recon_chroma_dpb_addr, S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> > + R(e_mpeg4_options, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> > + R(e_mpeg4_hec_period, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> > + R(e_aspect_ratio, S5P_FIMV_E_ASPECT_RATIO_V6);
> > + R(e_extended_sar, S5P_FIMV_E_EXTENDED_SAR_V6);
> > + R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V6);
> > + R(e_h264_lf_alpha_offset, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> > + R(e_h264_lf_beta_offset, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> > + R(e_h264_i_period, S5P_FIMV_E_H264_I_PERIOD_V6);
> > + R(e_h264_fmo_slice_grp_map_type,
> > + S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> > + R(e_h264_fmo_num_slice_grp_minus1,
> > + S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> > + R(e_h264_fmo_slice_grp_change_dir,
> > + S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> > + R(e_h264_fmo_slice_grp_change_rate_minus1,
> > +
> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> > + R(e_h264_fmo_run_length_minus1_0,
> > + S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6);
> > + R(e_h264_aso_slice_order_0, S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6);
> > + R(e_h264_num_t_layer, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> > + R(e_h264_hierarchical_qp_layer0,
> > + S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6);
> > + R(e_h264_frame_packing_sei_info,
> > + S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> > +
> > + if (!IS_MFCV7(dev))
> > + goto done;
> > +
> > + /* Initialize registers used in MFC v7 */
> > + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> > + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> > + R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
> > + R(e_source_first_plane_stride, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> > + R(e_source_second_plane_stride,
> > S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> > + R(e_source_third_plane_stride, S5P_FIMV_E_SOURCE_THIRD_STRIDE_V7);
> > + R(e_encoded_source_first_plane_addr,
> > + S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> > + R(e_encoded_source_second_plane_addr,
> > + S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> > + R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
> > +
> > +done:
> > + return &mfc_regs;
> > +#undef S5P_MFC_REG_ADDR
> > +#undef R
> > }
> >
> > /* Initialize opr function pointers for MFC v6 */
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > index ab164ef..8055848 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > @@ -40,11 +40,6 @@
> > #define FRAME_DELTA_H264_H263 1
> > #define TIGHT_CBR_MAX 10
> >
> > -/* Definitions for shared memory compatibility */
> > -#define PIC_TIME_TOP_V6 S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6
> > -#define PIC_TIME_BOT_V6 S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6
> > -#define CROP_INFO_H_V6 S5P_FIMV_D_DISPLAY_CROP_INFO1_V6
> > -#define CROP_INFO_V_V6 S5P_FIMV_D_DISPLAY_CROP_INFO2_V6
> > -
> > struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
> > +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> > s5p_mfc_dev *dev);
> > #endif /* S5P_MFC_OPR_V6_H_ */
> > --
> > 1.7.9.5
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-05-09 1:00 ` Pawel Osciak
@ 2014-05-09 4:49 ` Arun Kumar K
2014-05-09 5:20 ` Tomasz Figa
2014-05-13 10:33 ` Kamil Debski
1 sibling, 1 reply; 16+ messages in thread
From: Arun Kumar K @ 2014-05-09 4:49 UTC (permalink / raw)
To: Pawel Osciak, Kamil Debski
Cc: Arun Kumar K, linux-media, linux-samsung-soc, Sylwester Nawrocki,
Kiran Avnd
Hi Kamil,
On 05/09/14 06:30, Pawel Osciak wrote:
> Hi Kamil,
>
> On Fri, May 9, 2014 at 1:31 AM, Kamil Debski <k.debski@samsung.com> wrote:
>>
>> Hi Arun,
>>
>> I think that this driver is getting too complicated now.
>>
>> First there are separate files for MFC versions, but in addition there are
>> many
>> IF_MFCVx in there.
>
> The intention of this patch is to actually get rid of IF_MFCVx
> conditionals wherever possible.
>
>>
>> I am curious how many additional lines it would take to
>> add s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.*.
>>
>> I get the point that this approach may result in less lines added, but
>> having a callback specific for version use register pointers specific for
>> another version makes the code look unreadable and difficult to maintain.
>
> Could you please give an example of how this reduces readability?
> I personally feel this patch makes things much more readable (see below).
>
> On the other hand, if we continued without the current method, we
> would have to sprinkle
> IF_MFCVx macros all around actual functions/operations, instead of
> just containing this
> to the regs structure, and the only difference in each path would be
> register name defines.
> I don't feel this would be a better direction to be honest.
>
> Compare, new, after this patch:
>
>> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
>> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>
> vs previously, before this patch:
>
>> - if (IS_MFCV7(dev)) {
>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
>> - } else {
>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
>> - }
>
> And of course adding V8 more would make it even worse with yet another
> else if case.
>
>
>> Please give your opinion on another way to add support for v8.
>> s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.* ?
>
> If we add v7 and v8 files, a majority of their code will look like this:
>
> s5p_mfc_opr_v6.c:
> (...)
> void foo_v6(args)
> {
> foofun(REGISTER_A_V6);
> barfun(REGISTER_B_V6);
> }
> (...)
>
> s5p_mfc_opr_v7.c:
> (...)
> void foo_v7(args)
> {
> foofun(REGISTER_A_V7);
> barfun(REGISTER_B_V7);
> }
> (...)
>
> s5p_mfc_opr_v8.c:
> (...)
> void foo_v8(args)
> {
> foofun(REGISTER_A_V8);
> barfun(REGISTER_B_V8);
> }
> (...)
>
> I'm not sure this is less error prone and less code...
>
Adding on to this, I had a discussion with the firmware team and what I
got to know is future firmwares are also going to keep the operation
sequence same as v6, but there can be more changes in register offsets
as they accomodate more features. So if we go with opr_v8.c, we _might_
need opr_v9.c also with hardly any change in the code except register
offset modifications.
Regards
Arun
> Thanks,
> Pawel
>
>>
>> Best wishes,
>> --
>> Kamil Debski
>> Samsung R&D Institute Poland
>>
>>
>>> From: Arun Kumar K [mailto:arunkk.samsung@gmail.com] On Behalf Of Arun
>>> Kumar K
>>> Sent: Wednesday, April 23, 2014 2:58 PM
>>> To: linux-media@vger.kernel.org; linux-samsung-soc@vger.kernel.org
>>> Cc: k.debski@samsung.com; s.nawrocki@samsung.com; posciak@chromium.org;
>>> avnd.kiran@samsung.com; arunkk.samsung@gmail.com
>>> Subject: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc
>>> registers
>>>
>>> From: Kiran AVND <avnd.kiran@samsung.com>
>>>
>>> This patch is needed in preparation to add MFC V8
>>> where the register offsets are changed w.r.t MFC V6/V7.
>>>
>>> This patch adds variants of MFC V6 and V7 while
>>> accessing MFC registers. Registers are kept in mfc context
>>> and are initialized to a particular MFC variant during probe,
>>> which is used instead of macros.
>>>
>>> This avoids duplication of the code for MFC variants
>>> V6 & V7, and reduces the if_else checks while accessing
>>> registers of different MFC variants.
>>>
>>> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
>>> Signed-off-by: Pawel Osciak <posciak@chromium.org>
>>> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
>>> ---
>>> drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
>>> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
>>> drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
>>> drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
>>> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697
>>> +++++++++++++++--------
>>> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
>>> 6 files changed, 710 insertions(+), 256 deletions(-)
>>>
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc.c
>>> index 4f9d37a..07ebac8 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
>>> @@ -1223,6 +1223,7 @@ static int s5p_mfc_probe(struct platform_device
>>> *pdev)
>>> /* Initialize HW ops and commands based on MFC version */
>>> s5p_mfc_init_hw_ops(dev);
>>> s5p_mfc_init_hw_cmds(dev);
>>> + s5p_mfc_init_regs(dev);
>>>
>>> pr_debug("%s--\n", __func__);
>>> return 0;
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> index f5404a6..48a14b5 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>>> @@ -332,6 +332,7 @@ struct s5p_mfc_dev {
>>> struct s5p_mfc_hw_ops *mfc_ops;
>>> struct s5p_mfc_hw_cmds *mfc_cmds;
>>> int ver;
>>> + const struct s5p_mfc_regs *mfc_regs;
>>> };
>>>
>>> /**
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
>>> index 3c01c33..c9a2274 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
>>> @@ -31,6 +31,12 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
>>> dev->mfc_ops = s5p_mfc_ops;
>>> }
>>>
>>> +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev)
>>> +{
>>> + if (IS_MFCV6_PLUS(dev))
>>> + dev->mfc_regs = s5p_mfc_init_regs_v6_plus(dev);
>>> +}
>>> +
>>> int s5p_mfc_alloc_priv_buf(struct device *dev,
>>> struct s5p_mfc_priv_buf *b)
>>> {
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
>>> index 754c540..7a7ad32 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
>>> @@ -17,6 +17,259 @@
>>>
>>> #include "s5p_mfc_common.h"
>>>
>>> +struct s5p_mfc_regs {
>>> +
>>> + /* codec common registers */
>>> + void *risc_on;
>>> + void *risc2host_int;
>>> + void *host2risc_int;
>>> + void *risc_base_address;
>>> + void *mfc_reset;
>>> + void *host2risc_command;
>>> + void *risc2host_command;
>>> + void *mfc_bus_reset_ctrl;
>>> + void *firmware_version;
>>> + void *instance_id;
>>> + void *codec_type;
>>> + void *context_mem_addr;
>>> + void *context_mem_size;
>>> + void *pixel_format;
>>> + void *metadata_enable;
>>> + void *mfc_version;
>>> + void *dbg_info_enable;
>>> + void *dbg_buffer_addr;
>>> + void *dbg_buffer_size;
>>> + void *hed_control;
>>> + void *mfc_timeout_value;
>>> + void *hed_shared_mem_addr;
>>> + void *dis_shared_mem_addr;/* only v7 */
>>> + void *ret_instance_id;
>>> + void *error_code;
>>> + void *dbg_buffer_output_size;
>>> + void *metadata_status;
>>> + void *metadata_addr_mb_info;
>>> + void *metadata_size_mb_info;
>>> + void *dbg_info_stage_counter;
>>> +
>>> + /* decoder registers */
>>> + void *d_crc_ctrl;
>>> + void *d_dec_options;
>>> + void *d_display_delay;
>>> + void *d_set_frame_width;
>>> + void *d_set_frame_height;
>>> + void *d_sei_enable;
>>> + void *d_min_num_dpb;
>>> + void *d_min_first_plane_dpb_size;
>>> + void *d_min_second_plane_dpb_size;
>>> + void *d_min_third_plane_dpb_size;/* only v8 */
>>> + void *d_min_num_mv;
>>> + void *d_mvc_num_views;
>>> + void *d_min_num_dis;/* only v7 */
>>> + void *d_min_first_dis_size;/* only v7 */
>>> + void *d_min_second_dis_size;/* only v7 */
>>> + void *d_min_third_dis_size;/* only v7 */
>>> + void *d_post_filter_luma_dpb0;/* v7 and v8 */
>>> + void *d_post_filter_luma_dpb1;/* v7 and v8 */
>>> + void *d_post_filter_luma_dpb2;/* only v7 */
>>> + void *d_post_filter_chroma_dpb0;/* v7 and v8 */
>>> + void *d_post_filter_chroma_dpb1;/* v7 and v8 */
>>> + void *d_post_filter_chroma_dpb2;/* only v7 */
>>> + void *d_num_dpb;
>>> + void *d_num_mv;
>>> + void *d_init_buffer_options;
>>> + void *d_first_plane_dpb_stride_size;/* only v8 */
>>> + void *d_second_plane_dpb_stride_size;/* only v8 */
>>> + void *d_third_plane_dpb_stride_size;/* only v8 */
>>> + void *d_first_plane_dpb_size;
>>> + void *d_second_plane_dpb_size;
>>> + void *d_third_plane_dpb_size;/* only v8 */
>>> + void *d_mv_buffer_size;
>>> + void *d_first_plane_dpb;
>>> + void *d_second_plane_dpb;
>>> + void *d_third_plane_dpb;
>>> + void *d_mv_buffer;
>>> + void *d_scratch_buffer_addr;
>>> + void *d_scratch_buffer_size;
>>> + void *d_metadata_buffer_addr;
>>> + void *d_metadata_buffer_size;
>>> + void *d_nal_start_options;/* v7 and v8 */
>>> + void *d_cpb_buffer_addr;
>>> + void *d_cpb_buffer_size;
>>> + void *d_available_dpb_flag_upper;
>>> + void *d_available_dpb_flag_lower;
>>> + void *d_cpb_buffer_offset;
>>> + void *d_slice_if_enable;
>>> + void *d_picture_tag;
>>> + void *d_stream_data_size;
>>> + void *d_dynamic_dpb_flag_upper;/* v7 and v8 */
>>> + void *d_dynamic_dpb_flag_lower;/* v7 and v8 */
>>> + void *d_display_frame_width;
>>> + void *d_display_frame_height;
>>> + void *d_display_status;
>>> + void *d_display_first_plane_addr;
>>> + void *d_display_second_plane_addr;
>>> + void *d_display_third_plane_addr;/* only v8 */
>>> + void *d_display_frame_type;
>>> + void *d_display_crop_info1;
>>> + void *d_display_crop_info2;
>>> + void *d_display_picture_profile;
>>> + void *d_display_luma_crc;/* v7 and v8 */
>>> + void *d_display_chroma0_crc;/* v7 and v8 */
>>> + void *d_display_chroma1_crc;/* only v8 */
>>> + void *d_display_luma_crc_top;/* only v6 */
>>> + void *d_display_chroma_crc_top;/* only v6 */
>>> + void *d_display_luma_crc_bot;/* only v6 */
>>> + void *d_display_chroma_crc_bot;/* only v6 */
>>> + void *d_display_aspect_ratio;
>>> + void *d_display_extended_ar;
>>> + void *d_decoded_frame_width;
>>> + void *d_decoded_frame_height;
>>> + void *d_decoded_status;
>>> + void *d_decoded_first_plane_addr;
>>> + void *d_decoded_second_plane_addr;
>>> + void *d_decoded_third_plane_addr;/* only v8 */
>>> + void *d_decoded_frame_type;
>>> + void *d_decoded_crop_info1;
>>> + void *d_decoded_crop_info2;
>>> + void *d_decoded_picture_profile;
>>> + void *d_decoded_nal_size;
>>> + void *d_decoded_luma_crc;
>>> + void *d_decoded_chroma0_crc;
>>> + void *d_decoded_chroma1_crc;/* only v8 */
>>> + void *d_ret_picture_tag_top;
>>> + void *d_ret_picture_tag_bot;
>>> + void *d_ret_picture_time_top;
>>> + void *d_ret_picture_time_bot;
>>> + void *d_chroma_format;
>>> + void *d_vc1_info;/* v7 and v8 */
>>> + void *d_mpeg4_info;
>>> + void *d_h264_info;
>>> + void *d_metadata_addr_concealed_mb;
>>> + void *d_metadata_size_concealed_mb;
>>> + void *d_metadata_addr_vc1_param;
>>> + void *d_metadata_size_vc1_param;
>>> + void *d_metadata_addr_sei_nal;
>>> + void *d_metadata_size_sei_nal;
>>> + void *d_metadata_addr_vui;
>>> + void *d_metadata_size_vui;
>>> + void *d_metadata_addr_mvcvui;/* v7 and v8 */
>>> + void *d_metadata_size_mvcvui;/* v7 and v8 */
>>> + void *d_mvc_view_id;
>>> + void *d_frame_pack_sei_avail;
>>> + void *d_frame_pack_arrgment_id;
>>> + void *d_frame_pack_sei_info;
>>> + void *d_frame_pack_grid_pos;
>>> + void *d_display_recovery_sei_info;/* v7 and v8 */
>>> + void *d_decoded_recovery_sei_info;/* v7 and v8 */
>>> + void *d_display_first_addr;/* only v7 */
>>> + void *d_display_second_addr;/* only v7 */
>>> + void *d_display_third_addr;/* only v7 */
>>> + void *d_decoded_first_addr;/* only v7 */
>>> + void *d_decoded_second_addr;/* only v7 */
>>> + void *d_decoded_third_addr;/* only v7 */
>>> + void *d_used_dpb_flag_upper;/* v7 and v8 */
>>> + void *d_used_dpb_flag_lower;/* v7 and v8 */
>>> +
>>> + /* encoder registers */
>>> + void *e_frame_width;
>>> + void *e_frame_height;
>>> + void *e_cropped_frame_width;
>>> + void *e_cropped_frame_height;
>>> + void *e_frame_crop_offset;
>>> + void *e_enc_options;
>>> + void *e_picture_profile;
>>> + void *e_vbv_buffer_size;
>>> + void *e_vbv_init_delay;
>>> + void *e_fixed_picture_qp;
>>> + void *e_rc_config;
>>> + void *e_rc_qp_bound;
>>> + void *e_rc_qp_bound_pb;/* v7 and v8 */
>>> + void *e_rc_mode;
>>> + void *e_mb_rc_config;
>>> + void *e_padding_ctrl;
>>> + void *e_air_threshold;
>>> + void *e_mv_hor_range;
>>> + void *e_mv_ver_range;
>>> + void *e_num_dpb;
>>> + void *e_luma_dpb;
>>> + void *e_chroma_dpb;
>>> + void *e_me_buffer;
>>> + void *e_scratch_buffer_addr;
>>> + void *e_scratch_buffer_size;
>>> + void *e_tmv_buffer0;
>>> + void *e_tmv_buffer1;
>>> + void *e_ir_buffer_addr;/* v7 and v8 */
>>> + void *e_source_first_plane_addr;
>>> + void *e_source_second_plane_addr;
>>> + void *e_source_third_plane_addr;/* v7 and v8 */
>>> + void *e_source_first_plane_stride;/* v7 and v8 */
>>> + void *e_source_second_plane_stride;/* v7 and v8 */
>>> + void *e_source_third_plane_stride;/* v7 and v8 */
>>> + void *e_stream_buffer_addr;
>>> + void *e_stream_buffer_size;
>>> + void *e_roi_buffer_addr;
>>> + void *e_param_change;
>>> + void *e_ir_size;
>>> + void *e_gop_config;
>>> + void *e_mslice_mode;
>>> + void *e_mslice_size_mb;
>>> + void *e_mslice_size_bits;
>>> + void *e_frame_insertion;
>>> + void *e_rc_frame_rate;
>>> + void *e_rc_bit_rate;
>>> + void *e_rc_roi_ctrl;
>>> + void *e_picture_tag;
>>> + void *e_bit_count_enable;
>>> + void *e_max_bit_count;
>>> + void *e_min_bit_count;
>>> + void *e_metadata_buffer_addr;
>>> + void *e_metadata_buffer_size;
>>> + void *e_encoded_source_first_plane_addr;
>>> + void *e_encoded_source_second_plane_addr;
>>> + void *e_encoded_source_third_plane_addr;/* v7 and v8 */
>>> + void *e_stream_size;
>>> + void *e_slice_type;
>>> + void *e_picture_count;
>>> + void *e_ret_picture_tag;
>>> + void *e_stream_buffer_write_pointer; /* only v6 */
>>> + void *e_recon_luma_dpb_addr;
>>> + void *e_recon_chroma_dpb_addr;
>>> + void *e_metadata_addr_enc_slice;
>>> + void *e_metadata_size_enc_slice;
>>> + void *e_mpeg4_options;
>>> + void *e_mpeg4_hec_period;
>>> + void *e_aspect_ratio;
>>> + void *e_extended_sar;
>>> + void *e_h264_options;
>>> + void *e_h264_options_2;/* v7 and v8 */
>>> + void *e_h264_lf_alpha_offset;
>>> + void *e_h264_lf_beta_offset;
>>> + void *e_h264_i_period;
>>> + void *e_h264_fmo_slice_grp_map_type;
>>> + void *e_h264_fmo_num_slice_grp_minus1;
>>> + void *e_h264_fmo_slice_grp_change_dir;
>>> + void *e_h264_fmo_slice_grp_change_rate_minus1;
>>> + void *e_h264_fmo_run_length_minus1_0;
>>> + void *e_h264_aso_slice_order_0;
>>> + void *e_h264_chroma_qp_offset;
>>> + void *e_h264_num_t_layer;
>>> + void *e_h264_hierarchical_qp_layer0;
>>> + void *e_h264_frame_packing_sei_info;
>>> + void *e_h264_nal_control;/* v7 and v8 */
>>> + void *e_mvc_frame_qp_view1;
>>> + void *e_mvc_rc_bit_rate_view1;
>>> + void *e_mvc_rc_qbound_view1;
>>> + void *e_mvc_rc_mode_view1;
>>> + void *e_mvc_inter_view_prediction_on;
>>> + void *e_vp8_options;/* v7 and v8 */
>>> + void *e_vp8_filter_options;/* v7 and v8 */
>>> + void *e_vp8_golden_frame_option;/* v7 and v8 */
>>> + void *e_vp8_num_t_layer;/* v7 and v8 */
>>> + void *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
>>> + void *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
>>> + void *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
>>> +};
>>> +
>>> struct s5p_mfc_hw_ops {
>>> int (*alloc_dec_temp_buffers)(struct s5p_mfc_ctx *ctx);
>>> void (*release_dec_desc_buffer)(struct s5p_mfc_ctx *ctx);
>>> @@ -80,6 +333,7 @@ struct s5p_mfc_hw_ops {
>>> };
>>>
>>> void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
>>> +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev);
>>> int s5p_mfc_alloc_priv_buf(struct device *dev,
>>> struct s5p_mfc_priv_buf *b);
>>> void s5p_mfc_release_priv_buf(struct device *dev,
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
>>> index 356cfe5..65b8d20 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
>>> @@ -44,10 +44,10 @@
>>> } while (0)
>>> #endif /* S5P_MFC_DEBUG_REGWRITE */
>>>
>>> -#define READL(offset) readl(dev->regs_base + (offset))
>>> -#define WRITEL(data, offset) writel((data), dev->regs_base + (offset))
>>> -#define OFFSETA(x) (((x) - dev->port_a) >>
>>> S5P_FIMV_MEM_OFFSET)
>>> -#define OFFSETB(x) (((x) - dev->port_b) >>
>>> S5P_FIMV_MEM_OFFSET)
>>> +#define READL(reg) \
>>> + (WARN_ON_ONCE(!(reg)) ? 0 : readl(reg))
>>> +#define WRITEL(data, reg) \
>>> + (WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))
>>>
>>> /* Allocate temporary buffers for decoding */
>>> static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx)
>>> @@ -367,16 +367,17 @@ static int
>>> s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
>>> unsigned int strm_size)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
>>>
>>> mfc_debug_enter();
>>> mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n"
>>> "buf_size: 0x%08x (%d)\n",
>>> ctx->inst_no, buf_addr, strm_size, strm_size);
>>> - WRITEL(strm_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
>>> - WRITEL(buf_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
>>> - WRITEL(buf_size->cpb, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
>>> - WRITEL(start_num_byte, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
>>> + WRITEL(strm_size, mfc_regs->d_stream_data_size);
>>> + WRITEL(buf_addr, mfc_regs->d_cpb_buffer_addr);
>>> + WRITEL(buf_size->cpb, mfc_regs->d_cpb_buffer_size);
>>> + WRITEL(start_num_byte, mfc_regs->d_cpb_buffer_offset);
>>>
>>> mfc_debug_leave();
>>> return 0;
>>> @@ -388,6 +389,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> unsigned int frame_size, i;
>>> unsigned int frame_size_ch, frame_size_mv;
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> size_t buf_addr1;
>>> int buf_size1;
>>> int align_gap;
>>> @@ -399,19 +401,19 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
>>> mfc_debug(2, "Setting display delay to %d\n", ctx->display_delay);
>>>
>>> - WRITEL(ctx->total_dpb_count, S5P_FIMV_D_NUM_DPB_V6);
>>> - WRITEL(ctx->luma_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
>>> - WRITEL(ctx->chroma_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
>>> + WRITEL(ctx->total_dpb_count, mfc_regs->d_num_dpb);
>>> + WRITEL(ctx->luma_size, mfc_regs->d_first_plane_dpb_size);
>>> + WRITEL(ctx->chroma_size, mfc_regs->d_second_plane_dpb_size);
>>>
>>> - WRITEL(buf_addr1, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
>>> - WRITEL(ctx->scratch_buf_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
>>> + WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
>>> + WRITEL(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
>>> buf_addr1 += ctx->scratch_buf_size;
>>> buf_size1 -= ctx->scratch_buf_size;
>>>
>>> if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||
>>> ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){
>>> - WRITEL(ctx->mv_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
>>> - WRITEL(ctx->mv_count, S5P_FIMV_D_NUM_MV_V6);
>>> + WRITEL(ctx->mv_size, mfc_regs->d_mv_buffer_size);
>>> + WRITEL(ctx->mv_count, mfc_regs->d_num_mv);
>>> }
>>>
>>> frame_size = ctx->luma_size;
>>> @@ -425,11 +427,11 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> mfc_debug(2, "Luma %d: %x\n", i,
>>> ctx->dst_bufs[i].cookie.raw.luma);
>>> WRITEL(ctx->dst_bufs[i].cookie.raw.luma,
>>> - S5P_FIMV_D_LUMA_DPB_V6 + i * 4);
>>> + mfc_regs->d_first_plane_dpb + i * 4);
>>> mfc_debug(2, "\tChroma %d: %x\n", i,
>>> ctx->dst_bufs[i].cookie.raw.chroma);
>>> WRITEL(ctx->dst_bufs[i].cookie.raw.chroma,
>>> - S5P_FIMV_D_CHROMA_DPB_V6 + i * 4);
>>> + mfc_regs->d_second_plane_dpb + i * 4);
>>> }
>>> if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
>>> ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {
>>> @@ -442,7 +444,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>>
>>> mfc_debug(2, "\tBuf1: %x, size: %d\n",
>>> buf_addr1, buf_size1);
>>> - WRITEL(buf_addr1, S5P_FIMV_D_MV_BUFFER_V6 + i * 4);
>>> + WRITEL(buf_addr1, mfc_regs->d_mv_buffer + i * 4);
>>> buf_addr1 += frame_size_mv;
>>> buf_size1 -= frame_size_mv;
>>> }
>>> @@ -455,7 +457,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> return -ENOMEM;
>>> }
>>>
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
>>> S5P_FIMV_CH_INIT_BUFS_V6, NULL);
>>>
>>> @@ -468,9 +470,10 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct
>>> s5p_mfc_ctx *ctx,
>>> unsigned long addr, unsigned int size)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> - WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align */
>>> - WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
>>> + WRITEL(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */
>>> + WRITEL(size, mfc_regs->e_stream_buffer_size);
>>>
>>> mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",
>>> addr, size);
>>> @@ -482,14 +485,10 @@ static void
>>> s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
>>> unsigned long y_addr, unsigned long c_addr)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> - if (IS_MFCV7(dev)) {
>>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
>>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
>>> - } else {
>>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
>>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
>>> - }
>>> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
>>> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>>>
>>> mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);
>>> mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);
>>> @@ -499,18 +498,14 @@ static void
>>> s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
>>> unsigned long *y_addr, unsigned long *c_addr)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> unsigned long enc_recon_y_addr, enc_recon_c_addr;
>>>
>>> - if (IS_MFCV7(dev)) {
>>> - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
>>> - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
>>> - } else {
>>> - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
>>> - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
>>> - }
>>> + *y_addr = READL(mfc_regs->e_encoded_source_first_plane_addr);
>>> + *c_addr = READL(mfc_regs->e_encoded_source_second_plane_addr);
>>>
>>> - enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
>>> - enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
>>> + enc_recon_y_addr = READL(mfc_regs->e_recon_luma_dpb_addr);
>>> + enc_recon_c_addr = READL(mfc_regs->e_recon_chroma_dpb_addr);
>>>
>>> mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);
>>> mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);
>>> @@ -520,6 +515,7 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct
>>> s5p_mfc_ctx *ctx,
>>> static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> size_t buf_addr1;
>>> int i, buf_size1;
>>>
>>> @@ -531,24 +527,24 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
>>>
>>> for (i = 0; i < ctx->pb_count; i++) {
>>> - WRITEL(buf_addr1, S5P_FIMV_E_LUMA_DPB_V6 + (4 * i));
>>> + WRITEL(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
>>> buf_addr1 += ctx->luma_dpb_size;
>>> - WRITEL(buf_addr1, S5P_FIMV_E_CHROMA_DPB_V6 + (4 * i));
>>> + WRITEL(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i));
>>> buf_addr1 += ctx->chroma_dpb_size;
>>> - WRITEL(buf_addr1, S5P_FIMV_E_ME_BUFFER_V6 + (4 * i));
>>> + WRITEL(buf_addr1, mfc_regs->e_me_buffer + (4 * i));
>>> buf_addr1 += ctx->me_buffer_size;
>>> buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size +
>>> ctx->me_buffer_size);
>>> }
>>>
>>> - WRITEL(buf_addr1, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
>>> - WRITEL(ctx->scratch_buf_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
>>> + WRITEL(buf_addr1, mfc_regs->e_scratch_buffer_addr);
>>> + WRITEL(ctx->scratch_buf_size, mfc_regs->e_scratch_buffer_size);
>>> buf_addr1 += ctx->scratch_buf_size;
>>> buf_size1 -= ctx->scratch_buf_size;
>>>
>>> - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER0_V6);
>>> + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer0);
>>> buf_addr1 += ctx->tmv_buffer_size >> 1;
>>> - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER1_V6);
>>> + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer1);
>>> buf_addr1 += ctx->tmv_buffer_size >> 1;
>>> buf_size1 -= ctx->tmv_buffer_size;
>>>
>>> @@ -559,7 +555,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> return -ENOMEM;
>>> }
>>>
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
>>> S5P_FIMV_CH_INIT_BUFS_V6, NULL);
>>>
>>> @@ -571,18 +567,19 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> /* multi-slice control */
>>> /* multi-slice MB number or bit size */
>>> - WRITEL(ctx->slice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
>>> + WRITEL(ctx->slice_mode, mfc_regs->e_mslice_mode);
>>> if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
>>> - WRITEL(ctx->slice_size.mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
>>> + WRITEL(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
>>> } else if (ctx->slice_mode ==
>>> V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
>>> - WRITEL(ctx->slice_size.bits,
>>> S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
>>> + WRITEL(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
>>> } else {
>>> - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
>>> + WRITEL(0x0, mfc_regs->e_mslice_size_mb);
>>> + WRITEL(0x0, mfc_regs->e_mslice_size_bits);
>>> }
>>>
>>> return 0;
>>> @@ -591,27 +588,28 @@ static int s5p_mfc_set_slice_mode(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_enc_params *p = &ctx->enc_params;
>>> unsigned int reg = 0;
>>>
>>> mfc_debug_enter();
>>>
>>> /* width */
>>> - WRITEL(ctx->img_width, S5P_FIMV_E_FRAME_WIDTH_V6); /* 16 align */
>>> + WRITEL(ctx->img_width, mfc_regs->e_frame_width); /* 16 align */
>>> /* height */
>>> - WRITEL(ctx->img_height, S5P_FIMV_E_FRAME_HEIGHT_V6); /* 16 align
>>> */
>>> + WRITEL(ctx->img_height, mfc_regs->e_frame_height); /* 16 align */
>>>
>>> /* cropped width */
>>> - WRITEL(ctx->img_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
>>> + WRITEL(ctx->img_width, mfc_regs->e_cropped_frame_width);
>>> /* cropped height */
>>> - WRITEL(ctx->img_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
>>> + WRITEL(ctx->img_height, mfc_regs->e_cropped_frame_height);
>>> /* cropped offset */
>>> - WRITEL(0x0, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
>>> + WRITEL(0x0, mfc_regs->e_frame_crop_offset);
>>>
>>> /* pictype : IDR period */
>>> reg = 0;
>>> reg |= p->gop_size & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_gop_config);
>>>
>>> /* multi-slice control */
>>> /* multi-slice MB number or bit size */
>>> @@ -619,65 +617,65 @@ static int s5p_mfc_set_enc_params(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0;
>>> if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
>>> reg |= (0x1 << 3);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>> ctx->slice_size.mb = p->slice_mb;
>>> } else if (p->slice_mode ==
>>> V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
>>> reg |= (0x1 << 3);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>> ctx->slice_size.bits = p->slice_bit;
>>> } else {
>>> reg &= ~(0x1 << 3);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>> }
>>>
>>> s5p_mfc_set_slice_mode(ctx);
>>>
>>> /* cyclic intra refresh */
>>> - WRITEL(p->intra_refresh_mb, S5P_FIMV_E_IR_SIZE_V6);
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(p->intra_refresh_mb, mfc_regs->e_ir_size);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> if (p->intra_refresh_mb == 0)
>>> reg &= ~(0x1 << 4);
>>> else
>>> reg |= (0x1 << 4);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>>
>>> /* 'NON_REFERENCE_STORE_ENABLE' for debugging */
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> reg &= ~(0x1 << 9);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>>
>>> /* memory structure cur. frame */
>>> if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12M) {
>>> /* 0: Linear, 1: 2D tiled*/
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> reg &= ~(0x1 << 7);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>> /* 0: NV12(CbCr), 1: NV21(CrCb) */
>>> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
>>> + WRITEL(0x0, mfc_regs->pixel_format);
>>> } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV21M) {
>>> /* 0: Linear, 1: 2D tiled*/
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> reg &= ~(0x1 << 7);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>> /* 0: NV12(CbCr), 1: NV21(CrCb) */
>>> - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
>>> + WRITEL(0x1, mfc_regs->pixel_format);
>>> } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16) {
>>> /* 0: Linear, 1: 2D tiled*/
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> reg |= (0x1 << 7);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>> /* 0: NV12(CbCr), 1: NV21(CrCb) */
>>> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
>>> + WRITEL(0x0, mfc_regs->pixel_format);
>>> }
>>>
>>> /* memory structure recon. frame */
>>> /* 0: Linear, 1: 2D tiled */
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> reg |= (0x1 << 8);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>>
>>> /* padding control & value */
>>> - WRITEL(0x0, S5P_FIMV_E_PADDING_CTRL_V6);
>>> + WRITEL(0x0, mfc_regs->e_padding_ctrl);
>>> if (p->pad) {
>>> reg = 0;
>>> /** enable */
>>> @@ -688,64 +686,64 @@ static int s5p_mfc_set_enc_params(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p->pad_cb & 0xFF) << 8);
>>> /** y value */
>>> reg |= p->pad_luma & 0xFF;
>>> - WRITEL(reg, S5P_FIMV_E_PADDING_CTRL_V6);
>>> + WRITEL(reg, mfc_regs->e_padding_ctrl);
>>> }
>>>
>>> /* rate control config. */
>>> reg = 0;
>>> /* frame-level rate control */
>>> reg |= ((p->rc_frame & 0x1) << 9);
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* bit rate */
>>> if (p->rc_frame)
>>> WRITEL(p->rc_bitrate,
>>> - S5P_FIMV_E_RC_BIT_RATE_V6);
>>> + mfc_regs->e_rc_bit_rate);
>>> else
>>> - WRITEL(1, S5P_FIMV_E_RC_BIT_RATE_V6);
>>> + WRITEL(1, mfc_regs->e_rc_bit_rate);
>>>
>>> /* reaction coefficient */
>>> if (p->rc_frame) {
>>> if (p->rc_reaction_coeff < TIGHT_CBR_MAX) /* tight CBR */
>>> - WRITEL(1, S5P_FIMV_E_RC_RPARAM_V6);
>>> + WRITEL(1, mfc_regs->e_rc_mode);
>>> else /* loose CBR */
>>> - WRITEL(2, S5P_FIMV_E_RC_RPARAM_V6);
>>> + WRITEL(2, mfc_regs->e_rc_mode);
>>> }
>>>
>>> /* seq header ctrl */
>>> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_enc_options);
>>> reg &= ~(0x1 << 2);
>>> reg |= ((p->seq_hdr_mode & 0x1) << 2);
>>>
>>> /* frame skip mode */
>>> reg &= ~(0x3);
>>> reg |= (p->frame_skip_mode & 0x3);
>>> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_enc_options);
>>>
>>> /* 'DROP_CONTROL_ENABLE', disable */
>>> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_rc_config);
>>> reg &= ~(0x1 << 10);
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* setting for MV range [16, 256] */
>>> reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
>>> - WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6);
>>> + WRITEL(reg, mfc_regs->e_mv_hor_range);
>>>
>>> reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
>>> - WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6);
>>> + WRITEL(reg, mfc_regs->e_mv_ver_range);
>>>
>>> - WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_PARAM_CHANGE_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_RC_ROI_CTRL_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_PICTURE_TAG_V6);
>>> + WRITEL(0x0, mfc_regs->e_frame_insertion);
>>> + WRITEL(0x0, mfc_regs->e_roi_buffer_addr);
>>> + WRITEL(0x0, mfc_regs->e_param_change);
>>> + WRITEL(0x0, mfc_regs->e_rc_roi_ctrl);
>>> + WRITEL(0x0, mfc_regs->e_picture_tag);
>>>
>>> - WRITEL(0x0, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_MAX_BIT_COUNT_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_MIN_BIT_COUNT_V6);
>>> + WRITEL(0x0, mfc_regs->e_bit_count_enable);
>>> + WRITEL(0x0, mfc_regs->e_max_bit_count);
>>> + WRITEL(0x0, mfc_regs->e_min_bit_count);
>>>
>>> - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
>>> + WRITEL(0x0, mfc_regs->e_metadata_buffer_addr);
>>> + WRITEL(0x0, mfc_regs->e_metadata_buffer_size);
>>>
>>> mfc_debug_leave();
>>>
>>> @@ -755,6 +753,7 @@ static int s5p_mfc_set_enc_params(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_enc_params *p = &ctx->enc_params;
>>> struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
>>> unsigned int reg = 0;
>>> @@ -765,10 +764,10 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> s5p_mfc_set_enc_params(ctx);
>>>
>>> /* pictype : number of B */
>>> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_gop_config);
>>> reg &= ~(0x3 << 16);
>>> reg |= ((p->num_b_frame & 0x3) << 16);
>>> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_gop_config);
>>>
>>> /* profile & level */
>>> reg = 0;
>>> @@ -776,18 +775,19 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p_h264->level & 0xFF) << 8);
>>> /** profile - 0 ~ 3 */
>>> reg |= p_h264->profile & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
>>> + WRITEL(reg, mfc_regs->e_picture_profile);
>>>
>>> /* rate control config. */
>>> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_rc_config);
>>> /** macroblock level rate control */
>>> reg &= ~(0x1 << 8);
>>> reg |= ((p->rc_mb & 0x1) << 8);
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>> +
>>> /** frame QP */
>>> reg &= ~(0x3F);
>>> reg |= p_h264->rc_frame_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* max & min value of QP */
>>> reg = 0;
>>> @@ -795,16 +795,16 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p_h264->rc_max_qp & 0x3F) << 8);
>>> /** min QP */
>>> reg |= p_h264->rc_min_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>>>
>>> /* other QPs */
>>> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
>>> if (!p->rc_frame && !p->rc_mb) {
>>> reg = 0;
>>> reg |= ((p_h264->rc_b_frame_qp & 0x3F) << 16);
>>> reg |= ((p_h264->rc_p_frame_qp & 0x3F) << 8);
>>> reg |= p_h264->rc_frame_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
>>> }
>>>
>>> /* frame rate */
>>> @@ -812,38 +812,38 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0;
>>> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
>>> reg |= p->rc_framerate_denom & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
>>> }
>>>
>>> /* vbv buffer size */
>>> if (p->frame_skip_mode ==
>>> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
>>> WRITEL(p_h264->cpb_size & 0xFFFF,
>>> - S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
>>> + mfc_regs->e_vbv_buffer_size);
>>>
>>> if (p->rc_frame)
>>> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
>>> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
>>> }
>>>
>>> /* interlace */
>>> reg = 0;
>>> reg |= ((p_h264->interlace & 0x1) << 3);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* height */
>>> if (p_h264->interlace) {
>>> WRITEL(ctx->img_height >> 1,
>>> - S5P_FIMV_E_FRAME_HEIGHT_V6); /* 32 align */
>>> + mfc_regs->e_frame_height); /* 32 align */
>>> /* cropped height */
>>> WRITEL(ctx->img_height >> 1,
>>> - S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
>>> + mfc_regs->e_cropped_frame_height);
>>> }
>>>
>>> /* loop filter ctrl */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x3 << 1);
>>> reg |= ((p_h264->loop_filter_mode & 0x3) << 1);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* loopfilter alpha offset */
>>> if (p_h264->loop_filter_alpha < 0) {
>>> @@ -853,7 +853,7 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0x00;
>>> reg |= (p_h264->loop_filter_alpha & 0xF);
>>> }
>>> - WRITEL(reg, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_lf_alpha_offset);
>>>
>>> /* loopfilter beta offset */
>>> if (p_h264->loop_filter_beta < 0) {
>>> @@ -863,28 +863,28 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0x00;
>>> reg |= (p_h264->loop_filter_beta & 0xF);
>>> }
>>> - WRITEL(reg, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_lf_beta_offset);
>>>
>>> /* entropy coding mode */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1);
>>> reg |= p_h264->entropy_mode & 0x1;
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* number of ref. picture */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 7);
>>> reg |= (((p_h264->num_ref_pic_4p - 1) & 0x1) << 7);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* 8x8 transform enable */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + reg = READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x3 << 12);
>>> reg |= ((p_h264->_8x8_transform & 0x3) << 12);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* macroblock adaptive scaling features */
>>> - WRITEL(0x0, S5P_FIMV_E_MB_RC_CONFIG_V6);
>>> + WRITEL(0x0, mfc_regs->e_mb_rc_config);
>>> if (p->rc_mb) {
>>> reg = 0;
>>> /** dark region */
>>> @@ -895,92 +895,95 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p_h264->rc_mb_static & 0x1) << 1);
>>> /** high activity region */
>>> reg |= p_h264->rc_mb_activity & 0x1;
>>> - WRITEL(reg, S5P_FIMV_E_MB_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_mb_rc_config);
>>> }
>>>
>>> /* aspect ratio VUI */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 5);
>>> reg |= ((p_h264->vui_sar & 0x1) << 5);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> - WRITEL(0x0, S5P_FIMV_E_ASPECT_RATIO_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_EXTENDED_SAR_V6);
>>> + WRITEL(0x0, mfc_regs->e_aspect_ratio);
>>> + WRITEL(0x0, mfc_regs->e_extended_sar);
>>> if (p_h264->vui_sar) {
>>> /* aspect ration IDC */
>>> reg = 0;
>>> reg |= p_h264->vui_sar_idc & 0xFF;
>>> - WRITEL(reg, S5P_FIMV_E_ASPECT_RATIO_V6);
>>> + WRITEL(reg, mfc_regs->e_aspect_ratio);
>>> if (p_h264->vui_sar_idc == 0xFF) {
>>> /* extended SAR */
>>> reg = 0;
>>> reg |= (p_h264->vui_ext_sar_width & 0xFFFF) << 16;
>>> reg |= p_h264->vui_ext_sar_height & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_EXTENDED_SAR_V6);
>>> + WRITEL(reg, mfc_regs->e_extended_sar);
>>> }
>>> }
>>>
>>> /* intra picture period for H.264 open GOP */
>>> /* control */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 4);
>>> reg |= ((p_h264->open_gop & 0x1) << 4);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>> +
>>> /* value */
>>> - WRITEL(0x0, S5P_FIMV_E_H264_I_PERIOD_V6);
>>> + WRITEL(0x0, mfc_regs->e_h264_i_period);
>>> if (p_h264->open_gop) {
>>> reg = 0;
>>> reg |= p_h264->open_gop_size & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_H264_I_PERIOD_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_i_period);
>>> }
>>>
>>> /* 'WEIGHTED_BI_PREDICTION' for B is disable */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x3 << 9);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 14);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* ASO */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 6);
>>> reg |= ((p_h264->aso & 0x1) << 6);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>>
>>> /* hier qp enable */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 8);
>>> reg |= ((p_h264->open_gop & 0x1) << 8);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>> reg = 0;
>>> if (p_h264->hier_qp && p_h264->hier_qp_layer) {
>>> reg |= (p_h264->hier_qp_type & 0x1) << 0x3;
>>> reg |= p_h264->hier_qp_layer & 0x7;
>>> - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
>>> /* QP value for each layer */
>>> - for (i = 0; i < (p_h264->hier_qp_layer & 0x7); i++)
>>> + for (i = 0; i < p_h264->hier_qp_layer &&
>>> + i < ARRAY_SIZE(p_h264->hier_qp_layer_qp);
>> i++)
>>> {
>>> WRITEL(p_h264->hier_qp_layer_qp[i],
>>> - S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6 +
>>> - i * 4);
>>> + mfc_regs->e_h264_hierarchical_qp_layer0
>>> + + i * 4);
>>> + }
>>> }
>>> /* number of coding layer should be zero when hierarchical is
>>> disable */
>>> - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
>>>
>>> /* frame packing SEI generation */
>>> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
>>> + READL(mfc_regs->e_h264_options);
>>> reg &= ~(0x1 << 25);
>>> reg |= ((p_h264->sei_frame_packing & 0x1) << 25);
>>> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_options);
>>> if (p_h264->sei_frame_packing) {
>>> reg = 0;
>>> /** current frame0 flag */
>>> reg |= ((p_h264->sei_fp_curr_frame_0 & 0x1) << 2);
>>> /** arrangement type */
>>> reg |= p_h264->sei_fp_arrangement_type & 0x3;
>>> - WRITEL(reg, S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
>>> + WRITEL(reg, mfc_regs->e_h264_frame_packing_sei_info);
>>> }
>>>
>>> if (p_h264->fmo) {
>>> @@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
>>> if (p_h264->fmo_slice_grp > 4)
>>> p_h264->fmo_slice_grp = 4;
>>> - for (i = 0; i < (p_h264->fmo_slice_grp & 0xF); i++)
>>> + for (i = 0; i < ARRAY_SIZE(p_h264->fmo_run_len)
>>> + && i < p_h264->fmo_slice_grp; i++) {
>>> WRITEL(p_h264->fmo_run_len[i] - 1,
>>> - S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6 +
>>> - i * 4);
>>> +
>> mfc_regs->e_h264_fmo_run_length_minus1_0
>>> + + i * 4);
>>> + }
>>> break;
>>> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES:
>>> if (p_h264->fmo_slice_grp > 4)
>>> @@ -1002,10 +1007,10 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> if (p_h264->fmo_slice_grp > 2)
>>> p_h264->fmo_slice_grp = 2;
>>> WRITEL(p_h264->fmo_chg_dir & 0x1,
>>> -
>> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
>>> + mfc_regs->e_h264_fmo_slice_grp_change_dir);
>>> /* the valid range is 0 ~ number of macroblocks -1
>> */
>>> WRITEL(p_h264->fmo_chg_rate,
>>> -
>>> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
>>> + mfc_regs->e_h264_fmo_slice_grp_change_rate_minus1);
>>> break;
>>> default:
>>> mfc_err("Unsupported map type for FMO: %d\n",
>>> @@ -1016,11 +1021,11 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> }
>>>
>>> WRITEL(p_h264->fmo_map_type,
>>> - S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
>>> + mfc_regs->e_h264_fmo_slice_grp_map_type);
>>> WRITEL(p_h264->fmo_slice_grp - 1,
>>> -
>> S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
>>> + mfc_regs->e_h264_fmo_num_slice_grp_minus1);
>>> } else {
>>> - WRITEL(0, S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
>>> + WRITEL(0, mfc_regs->e_h264_fmo_num_slice_grp_minus1);
>>> }
>>>
>>> mfc_debug_leave();
>>> @@ -1031,6 +1036,7 @@ static int s5p_mfc_set_enc_params_h264(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_enc_params *p = &ctx->enc_params;
>>> struct s5p_mfc_mpeg4_enc_params *p_mpeg4 = &p->codec.mpeg4;
>>> unsigned int reg = 0;
>>> @@ -1040,10 +1046,10 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
>>> s5p_mfc_ctx *ctx)
>>> s5p_mfc_set_enc_params(ctx);
>>>
>>> /* pictype : number of B */
>>> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_gop_config);
>>> reg &= ~(0x3 << 16);
>>> reg |= ((p->num_b_frame & 0x3) << 16);
>>> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_gop_config);
>>>
>>> /* profile & level */
>>> reg = 0;
>>> @@ -1051,18 +1057,19 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p_mpeg4->level & 0xFF) << 8);
>>> /** profile - 0 ~ 1 */
>>> reg |= p_mpeg4->profile & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
>>> + WRITEL(reg, mfc_regs->e_picture_profile);
>>>
>>> /* rate control config. */
>>> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_rc_config);
>>> /** macroblock level rate control */
>>> reg &= ~(0x1 << 8);
>>> reg |= ((p->rc_mb & 0x1) << 8);
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>> +
>>> /** frame QP */
>>> reg &= ~(0x3F);
>>> reg |= p_mpeg4->rc_frame_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* max & min value of QP */
>>> reg = 0;
>>> @@ -1070,16 +1077,16 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p_mpeg4->rc_max_qp & 0x3F) << 8);
>>> /** min QP */
>>> reg |= p_mpeg4->rc_min_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>>>
>>> /* other QPs */
>>> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
>>> if (!p->rc_frame && !p->rc_mb) {
>>> reg = 0;
>>> reg |= ((p_mpeg4->rc_b_frame_qp & 0x3F) << 16);
>>> reg |= ((p_mpeg4->rc_p_frame_qp & 0x3F) << 8);
>>> reg |= p_mpeg4->rc_frame_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
>>> }
>>>
>>> /* frame rate */
>>> @@ -1087,21 +1094,21 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0;
>>> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
>>> reg |= p->rc_framerate_denom & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
>>> }
>>>
>>> /* vbv buffer size */
>>> if (p->frame_skip_mode ==
>>> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
>>> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
>>> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>>>
>>> if (p->rc_frame)
>>> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
>>> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
>>> }
>>>
>>> /* Disable HEC */
>>> - WRITEL(0x0, S5P_FIMV_E_MPEG4_OPTIONS_V6);
>>> - WRITEL(0x0, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
>>> + WRITEL(0x0, mfc_regs->e_mpeg4_options);
>>> + WRITEL(0x0, mfc_regs->e_mpeg4_hec_period);
>>>
>>> mfc_debug_leave();
>>>
>>> @@ -1111,6 +1118,7 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_enc_params *p = &ctx->enc_params;
>>> struct s5p_mfc_mpeg4_enc_params *p_h263 = &p->codec.mpeg4;
>>> unsigned int reg = 0;
>>> @@ -1123,18 +1131,19 @@ static int s5p_mfc_set_enc_params_h263(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0;
>>> /** profile */
>>> reg |= (0x1 << 4);
>>> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
>>> + WRITEL(reg, mfc_regs->e_picture_profile);
>>>
>>> /* rate control config. */
>>> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_rc_config);
>>> /** macroblock level rate control */
>>> reg &= ~(0x1 << 8);
>>> reg |= ((p->rc_mb & 0x1) << 8);
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>> +
>>> /** frame QP */
>>> reg &= ~(0x3F);
>>> reg |= p_h263->rc_frame_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* max & min value of QP */
>>> reg = 0;
>>> @@ -1142,16 +1151,16 @@ static int s5p_mfc_set_enc_params_h263(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= ((p_h263->rc_max_qp & 0x3F) << 8);
>>> /** min QP */
>>> reg |= p_h263->rc_min_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>>>
>>> /* other QPs */
>>> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
>>> if (!p->rc_frame && !p->rc_mb) {
>>> reg = 0;
>>> reg |= ((p_h263->rc_b_frame_qp & 0x3F) << 16);
>>> reg |= ((p_h263->rc_p_frame_qp & 0x3F) << 8);
>>> reg |= p_h263->rc_frame_qp & 0x3F;
>>> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
>>> }
>>>
>>> /* frame rate */
>>> @@ -1159,16 +1168,16 @@ static int s5p_mfc_set_enc_params_h263(struct
>>> s5p_mfc_ctx *ctx)
>>> reg = 0;
>>> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
>>> reg |= p->rc_framerate_denom & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
>>> }
>>>
>>> /* vbv buffer size */
>>> if (p->frame_skip_mode ==
>>> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
>>> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
>>> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>>>
>>> if (p->rc_frame)
>>> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
>>> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
>>> }
>>>
>>> mfc_debug_leave();
>>> @@ -1179,6 +1188,7 @@ static int s5p_mfc_set_enc_params_h263(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_enc_params *p = &ctx->enc_params;
>>> struct s5p_mfc_vp8_enc_params *p_vp8 = &p->codec.vp8;
>>> unsigned int reg = 0;
>>> @@ -1189,57 +1199,57 @@ static int s5p_mfc_set_enc_params_vp8(struct
>>> s5p_mfc_ctx *ctx)
>>> s5p_mfc_set_enc_params(ctx);
>>>
>>> /* pictype : number of B */
>>> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_gop_config);
>>> reg &= ~(0x3 << 16);
>>> reg |= ((p->num_b_frame & 0x3) << 16);
>>> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_gop_config);
>>>
>>> /* profile - 0 ~ 3 */
>>> reg = p_vp8->profile & 0x3;
>>> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
>>> + WRITEL(reg, mfc_regs->e_picture_profile);
>>>
>>> /* rate control config. */
>>> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
>>> + reg = READL(mfc_regs->e_rc_config);
>>> /** macroblock level rate control */
>>> reg &= ~(0x1 << 8);
>>> reg |= ((p->rc_mb & 0x1) << 8);
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* frame rate */
>>> if (p->rc_frame && p->rc_framerate_num && p->rc_framerate_denom)
>>> {
>>> reg = 0;
>>> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
>>> reg |= p->rc_framerate_denom & 0xFFFF;
>>> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
>>> }
>>>
>>> /* frame QP */
>>> reg &= ~(0x7F);
>>> reg |= p_vp8->rc_frame_qp & 0x7F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_config);
>>>
>>> /* other QPs */
>>> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
>>> if (!p->rc_frame && !p->rc_mb) {
>>> reg = 0;
>>> reg |= ((p_vp8->rc_p_frame_qp & 0x7F) << 8);
>>> reg |= p_vp8->rc_frame_qp & 0x7F;
>>> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
>>> }
>>>
>>> /* max QP */
>>> reg = ((p_vp8->rc_max_qp & 0x7F) << 8);
>>> /* min QP */
>>> reg |= p_vp8->rc_min_qp & 0x7F;
>>> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
>>> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>>>
>>> /* vbv buffer size */
>>> if (p->frame_skip_mode ==
>>> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
>>> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
>>> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>>>
>>> if (p->rc_frame)
>>> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
>>> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
>>> }
>>>
>>> /* VP8 specific params */
>>> @@ -1263,7 +1273,7 @@ static int s5p_mfc_set_enc_params_vp8(struct
>>> s5p_mfc_ctx *ctx)
>>> }
>>> reg |= (val & 0xF) << 3;
>>> reg |= (p_vp8->num_ref & 0x2);
>>> - WRITEL(reg, S5P_FIMV_E_VP8_OPTIONS_V7);
>>> + WRITEL(reg, mfc_regs->e_vp8_options);
>>>
>>> mfc_debug_leave();
>>>
>>> @@ -1297,6 +1307,7 @@ static bool s5p_mfc_is_v6_new(struct s5p_mfc_dev
>>> *dev)
>>> static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> unsigned int reg = 0;
>>> int fmo_aso_ctrl = 0;
>>>
>>> @@ -1304,9 +1315,9 @@ static int s5p_mfc_init_decode_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> mfc_debug(2, "InstNo: %d/%d\n", ctx->inst_no,
>>> S5P_FIMV_CH_SEQ_HEADER_V6);
>>> mfc_debug(2, "BUFs: %08x %08x %08x\n",
>>> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
>>> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
>>> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6));
>>> + READL(mfc_regs->d_cpb_buffer_addr),
>>> + READL(mfc_regs->d_cpb_buffer_addr),
>>> + READL(mfc_regs->d_cpb_buffer_addr));
>>>
>>> /* FMO_ASO_CTRL - 0: Enable, 1: Disable */
>>> reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6);
>>> @@ -1317,11 +1328,11 @@ static int s5p_mfc_init_decode_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> * set to negative value. */
>>> if (ctx->display_delay >= 0) {
>>> reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6);
>>> - WRITEL(ctx->display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
>>> + WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
>>> }
>>>
>>> if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
>>> - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->d_dec_options);
>>> reg = 0;
>>> }
>>>
>>> @@ -1336,21 +1347,21 @@ static int s5p_mfc_init_decode_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
>>>
>>> if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
>>> - WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->d_init_buffer_options);
>>> else
>>> - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
>>> + WRITEL(reg, mfc_regs->d_dec_options);
>>>
>>> /* 0: NV12(CbCr), 1: NV21(CrCb) */
>>> if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV21M)
>>> - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
>>> + WRITEL(0x1, mfc_regs->pixel_format);
>>> else
>>> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
>>> + WRITEL(0x0, mfc_regs->pixel_format);
>>>
>>>
>>> /* sei parse */
>>> - WRITEL(ctx->sei_fp_parse & 0x1, S5P_FIMV_D_SEI_ENABLE_V6);
>>> + WRITEL(ctx->sei_fp_parse & 0x1, mfc_regs->d_sei_enable);
>>>
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
>>> S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
>>>
>>> @@ -1361,11 +1372,12 @@ static int s5p_mfc_init_decode_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int
>>> flush)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> if (flush) {
>>> dev->curr_ctx = ctx->num;
>>> s5p_mfc_clean_ctx_int_flags(ctx);
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
>>> S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
>>> }
>>> @@ -1376,11 +1388,12 @@ static int s5p_mfc_decode_one_frame_v6(struct
>>> s5p_mfc_ctx *ctx,
>>> enum s5p_mfc_decode_arg last_frame)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> - WRITEL(ctx->dec_dst_flag, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
>>> - WRITEL(ctx->slice_interface & 0x1, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
>>> + WRITEL(ctx->dec_dst_flag, mfc_regs->d_available_dpb_flag_lower);
>>> + WRITEL(ctx->slice_interface & 0x1, mfc_regs->d_slice_if_enable);
>>>
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> /* Issue different commands to instance basing on whether it
>>> * is the last frame or not. */
>>> switch (last_frame) {
>>> @@ -1404,6 +1417,7 @@ static int s5p_mfc_decode_one_frame_v6(struct
>>> s5p_mfc_ctx *ctx,
>>> static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> if (ctx->codec_mode == S5P_MFC_CODEC_H264_ENC)
>>> s5p_mfc_set_enc_params_h264(ctx);
>>> @@ -1419,13 +1433,13 @@ static int s5p_mfc_init_encode_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> return -EINVAL;
>>> }
>>>
>>> - /* Set stride lengths */
>>> + /* Set stride lengths for v7 & above */
>>> if (IS_MFCV7(dev)) {
>>> - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
>>> - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
>>> + WRITEL(ctx->img_width, mfc_regs-
>>>> e_source_first_plane_stride);
>>> + WRITEL(ctx->img_width, mfc_regs-
>>>> e_source_second_plane_stride);
>>> }
>>>
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
>>> S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
>>>
>>> @@ -1435,14 +1449,16 @@ static int s5p_mfc_init_encode_v6(struct
>>> s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> struct s5p_mfc_enc_params *p = &ctx->enc_params;
>>> struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
>>> int i;
>>>
>>> if (p_h264->aso) {
>>> - for (i = 0; i < 8; i++)
>>> + for (i = 0; i < ARRAY_SIZE(p_h264->aso_slice_order); i++) {
>>> WRITEL(p_h264->aso_slice_order[i],
>>> - S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6 + i *
>> 4);
>>> + mfc_regs->e_h264_aso_slice_order_0 + i * 4);
>>> + }
>>> }
>>> return 0;
>>> }
>>> @@ -1451,6 +1467,7 @@ static int
>>> s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
>>> static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> struct s5p_mfc_dev *dev = ctx->dev;
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>>
>>> mfc_debug(2, "++\n");
>>>
>>> @@ -1461,7 +1478,7 @@ static int s5p_mfc_encode_one_frame_v6(struct
>>> s5p_mfc_ctx *ctx)
>>>
>>> s5p_mfc_set_slice_mode(ctx);
>>>
>>> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
>>> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
>>> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
>>> S5P_FIMV_CH_FRAME_START_V6, NULL);
>>>
>>> @@ -1836,28 +1853,26 @@ static void s5p_mfc_cleanup_queue_v6(struct
>>> list_head *lh, struct vb2_queue *vq)
>>>
>>> static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
>>> - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_INT_V6);
>>> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>>> + WRITEL(0, mfc_regs->risc2host_command);
>>> + WRITEL(0, mfc_regs->risc2host_int);
>>> }
>>>
>>> static void s5p_mfc_write_info_v6(struct s5p_mfc_ctx *ctx, unsigned
>>> int data,
>>> unsigned int ofs)
>>> {
>>> - struct s5p_mfc_dev *dev = ctx->dev;
>>> -
>>> s5p_mfc_clock_on();
>>> - WRITEL(data, ofs);
>>> + WRITEL(data, (void *)ofs);
>>> s5p_mfc_clock_off();
>>> }
>>>
>>> static unsigned int
>>> s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
>>> {
>>> - struct s5p_mfc_dev *dev = ctx->dev;
>>> int ret;
>>>
>>> s5p_mfc_clock_on();
>>> - ret = READL(ofs);
>>> + ret = READL((void *)ofs);
>>> s5p_mfc_clock_off();
>>>
>>> return ret;
>>> @@ -1865,50 +1880,51 @@ s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx,
>>> unsigned int ofs)
>>>
>>> static int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
>>> + return READL(dev->mfc_regs->d_display_first_plane_addr);
>>> }
>>>
>>> static int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
>>> + return READL(dev->mfc_regs->d_decoded_first_plane_addr);
>>> }
>>>
>>> static int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_STATUS_V6);
>>> + return READL(dev->mfc_regs->d_display_status);
>>> }
>>>
>>> static int s5p_mfc_get_dec_status_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DECODED_STATUS_V6);
>>> + return READL(dev->mfc_regs->d_decoded_status);
>>> }
>>>
>>> static int s5p_mfc_get_dec_frame_type_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DECODED_FRAME_TYPE_V6) &
>>> + return READL(dev->mfc_regs->d_decoded_frame_type) &
>>> S5P_FIMV_DECODE_FRAME_MASK_V6;
>>> }
>>>
>>> static int s5p_mfc_get_disp_frame_type_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> - return mfc_read(ctx->dev, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6) &
>>> + struct s5p_mfc_dev *dev = ctx->dev;
>>> + return READL(dev->mfc_regs->d_display_frame_type) &
>>> S5P_FIMV_DECODE_FRAME_MASK_V6;
>>> }
>>>
>>> static int s5p_mfc_get_consumed_stream_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
>>> + return READL(dev->mfc_regs->d_decoded_nal_size);
>>> }
>>>
>>> static int s5p_mfc_get_int_reason_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_RISC2HOST_CMD_V6) &
>>> + return READL(dev->mfc_regs->risc2host_command) &
>>> S5P_FIMV_RISC2HOST_CMD_MASK;
>>> }
>>>
>>> static int s5p_mfc_get_int_err_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_ERROR_CODE_V6);
>>> + return READL(dev->mfc_regs->error_code);
>>> }
>>>
>>> static int s5p_mfc_err_dec_v6(unsigned int err)
>>> @@ -1923,82 +1939,263 @@ static int s5p_mfc_err_dspl_v6(unsigned int
>>> err)
>>>
>>> static int s5p_mfc_get_img_width_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
>>> + return READL(dev->mfc_regs->d_display_frame_width);
>>> }
>>>
>>> static int s5p_mfc_get_img_height_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
>>> + return READL(dev->mfc_regs->d_display_frame_height);
>>> }
>>>
>>> static int s5p_mfc_get_dpb_count_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_DPB_V6);
>>> + return READL(dev->mfc_regs->d_min_num_dpb);
>>> }
>>>
>>> static int s5p_mfc_get_mv_count_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_MV_V6);
>>> + return READL(dev->mfc_regs->d_min_num_mv);
>>> }
>>>
>>> static int s5p_mfc_get_inst_no_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_RET_INSTANCE_ID_V6);
>>> + return READL(dev->mfc_regs->ret_instance_id);
>>> }
>>>
>>> static int s5p_mfc_get_enc_dpb_count_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_E_NUM_DPB_V6);
>>> + return READL(dev->mfc_regs->e_num_dpb);
>>> }
>>>
>>> static int s5p_mfc_get_enc_strm_size_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_E_STREAM_SIZE_V6);
>>> + return READL(dev->mfc_regs->e_stream_size);
>>> }
>>>
>>> static int s5p_mfc_get_enc_slice_type_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_E_SLICE_TYPE_V6);
>>> + return READL(dev->mfc_regs->e_slice_type);
>>> }
>>>
>>> static int s5p_mfc_get_enc_pic_count_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_E_PICTURE_COUNT_V6);
>>> + return READL(dev->mfc_regs->e_picture_count);
>>> }
>>>
>>> static int s5p_mfc_get_sei_avail_status_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> - return mfc_read(ctx->dev, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
>>> + struct s5p_mfc_dev *dev = ctx->dev;
>>> + return READL(dev->mfc_regs->d_frame_pack_sei_avail);
>>> }
>>>
>>> static int s5p_mfc_get_mvc_num_views_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
>>> + return READL(dev->mfc_regs->d_mvc_num_views);
>>> }
>>>
>>> static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
>>> {
>>> - return mfc_read(dev, S5P_FIMV_D_MVC_VIEW_ID_V6);
>>> + return READL(dev->mfc_regs->d_mvc_view_id);
>>> }
>>>
>>> static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx
>>> *ctx)
>>> {
>>> - return s5p_mfc_read_info_v6(ctx, PIC_TIME_TOP_V6);
>>> + return s5p_mfc_read_info_v6(ctx,
>>> + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top);
>>> }
>>>
>>> static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx
>>> *ctx)
>>> {
>>> - return s5p_mfc_read_info_v6(ctx, PIC_TIME_BOT_V6);
>>> + return s5p_mfc_read_info_v6(ctx,
>>> + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot);
>>> }
>>>
>>> static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> - return s5p_mfc_read_info_v6(ctx, CROP_INFO_H_V6);
>>> + return s5p_mfc_read_info_v6(ctx,
>>> + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
>>> }
>>>
>>> static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
>>> {
>>> - return s5p_mfc_read_info_v6(ctx, CROP_INFO_V_V6);
>>> + return s5p_mfc_read_info_v6(ctx,
>>> + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info2);
>>> +}
>>> +
>>> +static struct s5p_mfc_regs mfc_regs;
>>> +
>>> +/* Initialize registers for MFC v6 onwards */
>>> +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
>>> s5p_mfc_dev *dev)
>>> +{
>>> + memset(&mfc_regs, 0, sizeof(mfc_regs));
>>> +
>>> +#define S5P_MFC_REG_ADDR(dev, reg) ((dev)->regs_base + (reg))
>>> +#define R(m, r) mfc_regs.m = S5P_MFC_REG_ADDR(dev, r)
>>> + /* codec common registers */
>>> + R(risc_on, S5P_FIMV_RISC_ON_V6);
>>> + R(risc2host_int, S5P_FIMV_RISC2HOST_INT_V6);
>>> + R(host2risc_int, S5P_FIMV_HOST2RISC_INT_V6);
>>> + R(risc_base_address, S5P_FIMV_RISC_BASE_ADDRESS_V6);
>>> + R(mfc_reset, S5P_FIMV_MFC_RESET_V6);
>>> + R(host2risc_command, S5P_FIMV_HOST2RISC_CMD_V6);
>>> + R(risc2host_command, S5P_FIMV_RISC2HOST_CMD_V6);
>>> + R(firmware_version, S5P_FIMV_FW_VERSION_V6);
>>> + R(instance_id, S5P_FIMV_INSTANCE_ID_V6);
>>> + R(codec_type, S5P_FIMV_CODEC_TYPE_V6);
>>> + R(context_mem_addr, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
>>> + R(context_mem_size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
>>> + R(pixel_format, S5P_FIMV_PIXEL_FORMAT_V6);
>>> + R(ret_instance_id, S5P_FIMV_RET_INSTANCE_ID_V6);
>>> + R(error_code, S5P_FIMV_ERROR_CODE_V6);
>>> +
>>> + /* decoder registers */
>>> + R(d_crc_ctrl, S5P_FIMV_D_CRC_CTRL_V6);
>>> + R(d_dec_options, S5P_FIMV_D_DEC_OPTIONS_V6);
>>> + R(d_display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
>>> + R(d_sei_enable, S5P_FIMV_D_SEI_ENABLE_V6);
>>> + R(d_min_num_dpb, S5P_FIMV_D_MIN_NUM_DPB_V6);
>>> + R(d_min_num_mv, S5P_FIMV_D_MIN_NUM_MV_V6);
>>> + R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
>>> + R(d_num_dpb, S5P_FIMV_D_NUM_DPB_V6);
>>> + R(d_num_mv, S5P_FIMV_D_NUM_MV_V6);
>>> + R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
>>> + R(d_first_plane_dpb_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
>>> + R(d_second_plane_dpb_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
>>> + R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
>>> + R(d_first_plane_dpb, S5P_FIMV_D_LUMA_DPB_V6);
>>> + R(d_second_plane_dpb, S5P_FIMV_D_CHROMA_DPB_V6);
>>> + R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V6);
>>> + R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
>>> + R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
>>> + R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
>>> + R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
>>> + R(d_available_dpb_flag_lower,
>>> S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
>>> + R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
>>> + R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
>>> + R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
>>> + R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
>>> + R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
>>> + R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V6);
>>> + R(d_display_first_plane_addr, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
>>> + R(d_display_second_plane_addr, S5P_FIMV_D_DISPLAY_CHROMA_ADDR_V6);
>>> + R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6);
>>> + R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V6);
>>> + R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V6);
>>> + R(d_display_aspect_ratio, S5P_FIMV_D_DISPLAY_ASPECT_RATIO_V6);
>>> + R(d_display_extended_ar, S5P_FIMV_D_DISPLAY_EXTENDED_AR_V6);
>>> + R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V6);
>>> + R(d_decoded_first_plane_addr, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
>>> + R(d_decoded_second_plane_addr, S5P_FIMV_D_DECODED_CHROMA_ADDR_V6);
>>> + R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V6);
>>> + R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
>>> + R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6);
>>> + R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6);
>>> + R(d_h264_info, S5P_FIMV_D_H264_INFO_V6);
>>> + R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V6);
>>> + R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
>>> +
>>> + /* encoder registers */
>>> + R(e_frame_width, S5P_FIMV_E_FRAME_WIDTH_V6);
>>> + R(e_frame_height, S5P_FIMV_E_FRAME_HEIGHT_V6);
>>> + R(e_cropped_frame_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
>>> + R(e_cropped_frame_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
>>> + R(e_frame_crop_offset, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
>>> + R(e_enc_options, S5P_FIMV_E_ENC_OPTIONS_V6);
>>> + R(e_picture_profile, S5P_FIMV_E_PICTURE_PROFILE_V6);
>>> + R(e_vbv_buffer_size, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
>>> + R(e_vbv_init_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
>>> + R(e_fixed_picture_qp, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
>>> + R(e_rc_config, S5P_FIMV_E_RC_CONFIG_V6);
>>> + R(e_rc_qp_bound, S5P_FIMV_E_RC_QP_BOUND_V6);
>>> + R(e_rc_mode, S5P_FIMV_E_RC_RPARAM_V6);
>>> + R(e_mb_rc_config, S5P_FIMV_E_MB_RC_CONFIG_V6);
>>> + R(e_padding_ctrl, S5P_FIMV_E_PADDING_CTRL_V6);
>>> + R(e_mv_hor_range, S5P_FIMV_E_MV_HOR_RANGE_V6);
>>> + R(e_mv_ver_range, S5P_FIMV_E_MV_VER_RANGE_V6);
>>> + R(e_num_dpb, S5P_FIMV_E_NUM_DPB_V6);
>>> + R(e_luma_dpb, S5P_FIMV_E_LUMA_DPB_V6);
>>> + R(e_chroma_dpb, S5P_FIMV_E_CHROMA_DPB_V6);
>>> + R(e_me_buffer, S5P_FIMV_E_ME_BUFFER_V6);
>>> + R(e_scratch_buffer_addr, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
>>> + R(e_scratch_buffer_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
>>> + R(e_tmv_buffer0, S5P_FIMV_E_TMV_BUFFER0_V6);
>>> + R(e_tmv_buffer1, S5P_FIMV_E_TMV_BUFFER1_V6);
>>> + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
>>> + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
>>> + R(e_stream_buffer_addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6);
>>> + R(e_stream_buffer_size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
>>> + R(e_roi_buffer_addr, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
>>> + R(e_param_change, S5P_FIMV_E_PARAM_CHANGE_V6);
>>> + R(e_ir_size, S5P_FIMV_E_IR_SIZE_V6);
>>> + R(e_gop_config, S5P_FIMV_E_GOP_CONFIG_V6);
>>> + R(e_mslice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
>>> + R(e_mslice_size_mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
>>> + R(e_mslice_size_bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
>>> + R(e_frame_insertion, S5P_FIMV_E_FRAME_INSERTION_V6);
>>> + R(e_rc_frame_rate, S5P_FIMV_E_RC_FRAME_RATE_V6);
>>> + R(e_rc_bit_rate, S5P_FIMV_E_RC_BIT_RATE_V6);
>>> + R(e_rc_roi_ctrl, S5P_FIMV_E_RC_ROI_CTRL_V6);
>>> + R(e_picture_tag, S5P_FIMV_E_PICTURE_TAG_V6);
>>> + R(e_bit_count_enable, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
>>> + R(e_max_bit_count, S5P_FIMV_E_MAX_BIT_COUNT_V6);
>>> + R(e_min_bit_count, S5P_FIMV_E_MIN_BIT_COUNT_V6);
>>> + R(e_metadata_buffer_addr, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
>>> + R(e_metadata_buffer_size, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
>>> + R(e_encoded_source_first_plane_addr,
>>> + S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
>>> + R(e_encoded_source_second_plane_addr,
>>> + S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
>>> + R(e_stream_size, S5P_FIMV_E_STREAM_SIZE_V6);
>>> + R(e_slice_type, S5P_FIMV_E_SLICE_TYPE_V6);
>>> + R(e_picture_count, S5P_FIMV_E_PICTURE_COUNT_V6);
>>> + R(e_ret_picture_tag, S5P_FIMV_E_RET_PICTURE_TAG_V6);
>>> + R(e_recon_luma_dpb_addr, S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
>>> + R(e_recon_chroma_dpb_addr, S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
>>> + R(e_mpeg4_options, S5P_FIMV_E_MPEG4_OPTIONS_V6);
>>> + R(e_mpeg4_hec_period, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
>>> + R(e_aspect_ratio, S5P_FIMV_E_ASPECT_RATIO_V6);
>>> + R(e_extended_sar, S5P_FIMV_E_EXTENDED_SAR_V6);
>>> + R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V6);
>>> + R(e_h264_lf_alpha_offset, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
>>> + R(e_h264_lf_beta_offset, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
>>> + R(e_h264_i_period, S5P_FIMV_E_H264_I_PERIOD_V6);
>>> + R(e_h264_fmo_slice_grp_map_type,
>>> + S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
>>> + R(e_h264_fmo_num_slice_grp_minus1,
>>> + S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
>>> + R(e_h264_fmo_slice_grp_change_dir,
>>> + S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
>>> + R(e_h264_fmo_slice_grp_change_rate_minus1,
>>> +
>> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
>>> + R(e_h264_fmo_run_length_minus1_0,
>>> + S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6);
>>> + R(e_h264_aso_slice_order_0, S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6);
>>> + R(e_h264_num_t_layer, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
>>> + R(e_h264_hierarchical_qp_layer0,
>>> + S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6);
>>> + R(e_h264_frame_packing_sei_info,
>>> + S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
>>> +
>>> + if (!IS_MFCV7(dev))
>>> + goto done;
>>> +
>>> + /* Initialize registers used in MFC v7 */
>>> + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
>>> + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
>>> + R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
>>> + R(e_source_first_plane_stride, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
>>> + R(e_source_second_plane_stride,
>>> S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
>>> + R(e_source_third_plane_stride, S5P_FIMV_E_SOURCE_THIRD_STRIDE_V7);
>>> + R(e_encoded_source_first_plane_addr,
>>> + S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
>>> + R(e_encoded_source_second_plane_addr,
>>> + S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
>>> + R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
>>> +
>>> +done:
>>> + return &mfc_regs;
>>> +#undef S5P_MFC_REG_ADDR
>>> +#undef R
>>> }
>>>
>>> /* Initialize opr function pointers for MFC v6 */
>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
>>> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
>>> index ab164ef..8055848 100644
>>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
>>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
>>> @@ -40,11 +40,6 @@
>>> #define FRAME_DELTA_H264_H263 1
>>> #define TIGHT_CBR_MAX 10
>>>
>>> -/* Definitions for shared memory compatibility */
>>> -#define PIC_TIME_TOP_V6 S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6
>>> -#define PIC_TIME_BOT_V6 S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6
>>> -#define CROP_INFO_H_V6 S5P_FIMV_D_DISPLAY_CROP_INFO1_V6
>>> -#define CROP_INFO_V_V6 S5P_FIMV_D_DISPLAY_CROP_INFO2_V6
>>> -
>>> struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
>>> +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
>>> s5p_mfc_dev *dev);
>>> #endif /* S5P_MFC_OPR_V6_H_ */
>>> --
>>> 1.7.9.5
>>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-05-09 4:49 ` Arun Kumar K
@ 2014-05-09 5:20 ` Tomasz Figa
2014-05-09 5:31 ` Arun Kumar K
0 siblings, 1 reply; 16+ messages in thread
From: Tomasz Figa @ 2014-05-09 5:20 UTC (permalink / raw)
To: Arun Kumar K, Pawel Osciak, Kamil Debski
Cc: Arun Kumar K, linux-media, linux-samsung-soc, Sylwester Nawrocki,
Kiran Avnd
Hi Arun, Paweł,
On 09.05.2014 06:49, Arun Kumar K wrote:
> Hi Kamil,
>
> On 05/09/14 06:30, Pawel Osciak wrote:
>> Hi Kamil,
>>
>> On Fri, May 9, 2014 at 1:31 AM, Kamil Debski <k.debski@samsung.com> wrote:
>>>
>>> Hi Arun,
>>>
>>> I think that this driver is getting too complicated now.
>>>
>>> First there are separate files for MFC versions, but in addition there are
>>> many
>>> IF_MFCVx in there.
>>
>> The intention of this patch is to actually get rid of IF_MFCVx
>> conditionals wherever possible.
>>
>>>
>>> I am curious how many additional lines it would take to
>>> add s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.*.
>>>
>>> I get the point that this approach may result in less lines added, but
>>> having a callback specific for version use register pointers specific for
>>> another version makes the code look unreadable and difficult to maintain.
>>
>> Could you please give an example of how this reduces readability?
>> I personally feel this patch makes things much more readable (see below).
>>
>> On the other hand, if we continued without the current method, we
>> would have to sprinkle
>> IF_MFCVx macros all around actual functions/operations, instead of
>> just containing this
>> to the regs structure, and the only difference in each path would be
>> register name defines.
>> I don't feel this would be a better direction to be honest.
>>
>> Compare, new, after this patch:
>>
>>> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
>>> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>>
>> vs previously, before this patch:
>>
>>> - if (IS_MFCV7(dev)) {
>>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
>>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
>>> - } else {
>>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
>>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
>>> - }
>>
>> And of course adding V8 more would make it even worse with yet another
>> else if case.
>>
>>
>>> Please give your opinion on another way to add support for v8.
>>> s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.* ?
>>
>> If we add v7 and v8 files, a majority of their code will look like this:
>>
>> s5p_mfc_opr_v6.c:
>> (...)
>> void foo_v6(args)
>> {
>> foofun(REGISTER_A_V6);
>> barfun(REGISTER_B_V6);
>> }
>> (...)
>>
>> s5p_mfc_opr_v7.c:
>> (...)
>> void foo_v7(args)
>> {
>> foofun(REGISTER_A_V7);
>> barfun(REGISTER_B_V7);
>> }
>> (...)
>>
>> s5p_mfc_opr_v8.c:
>> (...)
>> void foo_v8(args)
>> {
>> foofun(REGISTER_A_V8);
>> barfun(REGISTER_B_V8);
>> }
>> (...)
>>
>> I'm not sure this is less error prone and less code...
>>
>
> Adding on to this, I had a discussion with the firmware team and what I
> got to know is future firmwares are also going to keep the operation
> sequence same as v6, but there can be more changes in register offsets
> as they accomodate more features. So if we go with opr_v8.c, we _might_
> need opr_v9.c also with hardly any change in the code except register
> offset modifications.
If register offsets make for most of the differences between particular
MFC versions, then probably having the register pointers used instead of
base + OFFSET could be useful. Unfortunately we don't have much
information about the newer variants, so it's hard to say.
Btw. I wonder why the firmware team couldn't simply add new registers at
the end of the address space, without breaking software compatibility
with every new version, even though rest of programming model mostly
stays intact, which is a pure nonsense. Couldn't you complain to the for
this if you have contact with them? Otherwise this madness will never stop.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-05-09 5:20 ` Tomasz Figa
@ 2014-05-09 5:31 ` Arun Kumar K
0 siblings, 0 replies; 16+ messages in thread
From: Arun Kumar K @ 2014-05-09 5:31 UTC (permalink / raw)
To: Tomasz Figa, Pawel Osciak, Kamil Debski
Cc: Arun Kumar K, linux-media, linux-samsung-soc, Sylwester Nawrocki,
Kiran Avnd
Hi Tomasz,
On 05/09/14 10:50, Tomasz Figa wrote:
> Hi Arun, Paweł,
>
> On 09.05.2014 06:49, Arun Kumar K wrote:
>> Hi Kamil,
>>
>> On 05/09/14 06:30, Pawel Osciak wrote:
>>> Hi Kamil,
>>>
>>> On Fri, May 9, 2014 at 1:31 AM, Kamil Debski <k.debski@samsung.com> wrote:
>>>>
>>>> Hi Arun,
>>>>
>>>> I think that this driver is getting too complicated now.
>>>>
>>>> First there are separate files for MFC versions, but in addition there are
>>>> many
>>>> IF_MFCVx in there.
>>>
>>> The intention of this patch is to actually get rid of IF_MFCVx
>>> conditionals wherever possible.
>>>
>>>>
>>>> I am curious how many additional lines it would take to
>>>> add s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.*.
>>>>
>>>> I get the point that this approach may result in less lines added, but
>>>> having a callback specific for version use register pointers specific for
>>>> another version makes the code look unreadable and difficult to maintain.
>>>
>>> Could you please give an example of how this reduces readability?
>>> I personally feel this patch makes things much more readable (see below).
>>>
>>> On the other hand, if we continued without the current method, we
>>> would have to sprinkle
>>> IF_MFCVx macros all around actual functions/operations, instead of
>>> just containing this
>>> to the regs structure, and the only difference in each path would be
>>> register name defines.
>>> I don't feel this would be a better direction to be honest.
>>>
>>> Compare, new, after this patch:
>>>
>>>> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
>>>> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>>>
>>> vs previously, before this patch:
>>>
>>>> - if (IS_MFCV7(dev)) {
>>>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
>>>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
>>>> - } else {
>>>> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
>>>> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
>>>> - }
>>>
>>> And of course adding V8 more would make it even worse with yet another
>>> else if case.
>>>
>>>
>>>> Please give your opinion on another way to add support for v8.
>>>> s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.* ?
>>>
>>> If we add v7 and v8 files, a majority of their code will look like this:
>>>
>>> s5p_mfc_opr_v6.c:
>>> (...)
>>> void foo_v6(args)
>>> {
>>> foofun(REGISTER_A_V6);
>>> barfun(REGISTER_B_V6);
>>> }
>>> (...)
>>>
>>> s5p_mfc_opr_v7.c:
>>> (...)
>>> void foo_v7(args)
>>> {
>>> foofun(REGISTER_A_V7);
>>> barfun(REGISTER_B_V7);
>>> }
>>> (...)
>>>
>>> s5p_mfc_opr_v8.c:
>>> (...)
>>> void foo_v8(args)
>>> {
>>> foofun(REGISTER_A_V8);
>>> barfun(REGISTER_B_V8);
>>> }
>>> (...)
>>>
>>> I'm not sure this is less error prone and less code...
>>>
>>
>> Adding on to this, I had a discussion with the firmware team and what I
>> got to know is future firmwares are also going to keep the operation
>> sequence same as v6, but there can be more changes in register offsets
>> as they accomodate more features. So if we go with opr_v8.c, we _might_
>> need opr_v9.c also with hardly any change in the code except register
>> offset modifications.
>
> If register offsets make for most of the differences between particular
> MFC versions, then probably having the register pointers used instead of
> base + OFFSET could be useful. Unfortunately we don't have much
> information about the newer variants, so it's hard to say.
>
> Btw. I wonder why the firmware team couldn't simply add new registers at
> the end of the address space, without breaking software compatibility
> with every new version, even though rest of programming model mostly
> stays intact, which is a pure nonsense. Couldn't you complain to the for
> this if you have contact with them? Otherwise this madness will never stop.
>
I had a detailed discussion with the firmware team regarding this and
updated them the concerns. The need to do it is because, the register
offsets are grouped codec-wise. Like
0x000a H264
0x000d MPEG4
0x000f VP8
etc.
There are some holes given for future register additions also, but
sometimes many additional features are added to specific codecs and also
in the common feature set which doesnt fit in the pre-defined holes. So
as per them, the re-shuffle of registers was done in v8 so as to make it
more clean and taking into consideration future feature requirements.
But again it might have few changes here and there in the next version.
Since these register offsets are not really in our control, this
approach is best in the driver to absorb these changes without many if -
else conditions. The firware team assured me that they will try to avoid
these kind of changes as much as possible in future.
Regards
Arun
> Best regards,
> Tomasz
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-04-23 12:57 ` [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers Arun Kumar K
2014-05-08 16:31 ` Kamil Debski
@ 2014-05-13 10:32 ` Kamil Debski
2014-05-13 11:24 ` Arun Kumar K
1 sibling, 1 reply; 16+ messages in thread
From: Kamil Debski @ 2014-05-13 10:32 UTC (permalink / raw)
To: 'Arun Kumar K', linux-media, linux-samsung-soc
Cc: Sylwester Nawrocki, posciak, avnd.kiran, arunkk.samsung
Hi,
One small comment below,
> -----Original Message-----
> From: Arun Kumar K [mailto:arunkk.samsung@gmail.com] On Behalf Of Arun
> Kumar K
> Sent: Wednesday, April 23, 2014 2:58 PM
> To: linux-media@vger.kernel.org; linux-samsung-soc@vger.kernel.org
> Cc: k.debski@samsung.com; s.nawrocki@samsung.com; posciak@chromium.org;
> avnd.kiran@samsung.com; arunkk.samsung@gmail.com
> Subject: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc
> registers
>
> From: Kiran AVND <avnd.kiran@samsung.com>
>
> This patch is needed in preparation to add MFC V8
> where the register offsets are changed w.r.t MFC V6/V7.
>
> This patch adds variants of MFC V6 and V7 while
> accessing MFC registers. Registers are kept in mfc context
> and are initialized to a particular MFC variant during probe,
> which is used instead of macros.
>
> This avoids duplication of the code for MFC variants
> V6 & V7, and reduces the if_else checks while accessing
> registers of different MFC variants.
>
> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
> Signed-off-by: Pawel Osciak <posciak@chromium.org>
> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> ---
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
> drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697
> +++++++++++++++--------
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
> 6 files changed, 710 insertions(+), 256 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index 4f9d37a..07ebac8 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -1223,6 +1223,7 @@ static int s5p_mfc_probe(struct platform_device
> *pdev)
> /* Initialize HW ops and commands based on MFC version */
> s5p_mfc_init_hw_ops(dev);
> s5p_mfc_init_hw_cmds(dev);
> + s5p_mfc_init_regs(dev);
>
> pr_debug("%s--\n", __func__);
> return 0;
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> index f5404a6..48a14b5 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> @@ -332,6 +332,7 @@ struct s5p_mfc_dev {
> struct s5p_mfc_hw_ops *mfc_ops;
> struct s5p_mfc_hw_cmds *mfc_cmds;
> int ver;
> + const struct s5p_mfc_regs *mfc_regs;
> };
>
> /**
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> index 3c01c33..c9a2274 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> @@ -31,6 +31,12 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
> dev->mfc_ops = s5p_mfc_ops;
> }
>
> +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev)
> +{
> + if (IS_MFCV6_PLUS(dev))
> + dev->mfc_regs = s5p_mfc_init_regs_v6_plus(dev);
> +}
> +
> int s5p_mfc_alloc_priv_buf(struct device *dev,
> struct s5p_mfc_priv_buf *b)
> {
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> index 754c540..7a7ad32 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> @@ -17,6 +17,259 @@
>
> #include "s5p_mfc_common.h"
>
> +struct s5p_mfc_regs {
> +
> + /* codec common registers */
> + void *risc_on;
> + void *risc2host_int;
> + void *host2risc_int;
> + void *risc_base_address;
> + void *mfc_reset;
> + void *host2risc_command;
> + void *risc2host_command;
> + void *mfc_bus_reset_ctrl;
> + void *firmware_version;
> + void *instance_id;
> + void *codec_type;
> + void *context_mem_addr;
> + void *context_mem_size;
> + void *pixel_format;
> + void *metadata_enable;
> + void *mfc_version;
> + void *dbg_info_enable;
> + void *dbg_buffer_addr;
> + void *dbg_buffer_size;
> + void *hed_control;
> + void *mfc_timeout_value;
> + void *hed_shared_mem_addr;
> + void *dis_shared_mem_addr;/* only v7 */
> + void *ret_instance_id;
> + void *error_code;
> + void *dbg_buffer_output_size;
> + void *metadata_status;
> + void *metadata_addr_mb_info;
> + void *metadata_size_mb_info;
> + void *dbg_info_stage_counter;
> +
> + /* decoder registers */
> + void *d_crc_ctrl;
> + void *d_dec_options;
> + void *d_display_delay;
> + void *d_set_frame_width;
> + void *d_set_frame_height;
> + void *d_sei_enable;
> + void *d_min_num_dpb;
> + void *d_min_first_plane_dpb_size;
> + void *d_min_second_plane_dpb_size;
> + void *d_min_third_plane_dpb_size;/* only v8 */
> + void *d_min_num_mv;
> + void *d_mvc_num_views;
> + void *d_min_num_dis;/* only v7 */
> + void *d_min_first_dis_size;/* only v7 */
> + void *d_min_second_dis_size;/* only v7 */
> + void *d_min_third_dis_size;/* only v7 */
> + void *d_post_filter_luma_dpb0;/* v7 and v8 */
> + void *d_post_filter_luma_dpb1;/* v7 and v8 */
> + void *d_post_filter_luma_dpb2;/* only v7 */
> + void *d_post_filter_chroma_dpb0;/* v7 and v8 */
> + void *d_post_filter_chroma_dpb1;/* v7 and v8 */
> + void *d_post_filter_chroma_dpb2;/* only v7 */
> + void *d_num_dpb;
> + void *d_num_mv;
> + void *d_init_buffer_options;
> + void *d_first_plane_dpb_stride_size;/* only v8 */
> + void *d_second_plane_dpb_stride_size;/* only v8 */
> + void *d_third_plane_dpb_stride_size;/* only v8 */
> + void *d_first_plane_dpb_size;
> + void *d_second_plane_dpb_size;
> + void *d_third_plane_dpb_size;/* only v8 */
> + void *d_mv_buffer_size;
> + void *d_first_plane_dpb;
> + void *d_second_plane_dpb;
> + void *d_third_plane_dpb;
> + void *d_mv_buffer;
> + void *d_scratch_buffer_addr;
> + void *d_scratch_buffer_size;
> + void *d_metadata_buffer_addr;
> + void *d_metadata_buffer_size;
> + void *d_nal_start_options;/* v7 and v8 */
> + void *d_cpb_buffer_addr;
> + void *d_cpb_buffer_size;
> + void *d_available_dpb_flag_upper;
> + void *d_available_dpb_flag_lower;
> + void *d_cpb_buffer_offset;
> + void *d_slice_if_enable;
> + void *d_picture_tag;
> + void *d_stream_data_size;
> + void *d_dynamic_dpb_flag_upper;/* v7 and v8 */
> + void *d_dynamic_dpb_flag_lower;/* v7 and v8 */
> + void *d_display_frame_width;
> + void *d_display_frame_height;
> + void *d_display_status;
> + void *d_display_first_plane_addr;
> + void *d_display_second_plane_addr;
> + void *d_display_third_plane_addr;/* only v8 */
> + void *d_display_frame_type;
> + void *d_display_crop_info1;
> + void *d_display_crop_info2;
> + void *d_display_picture_profile;
> + void *d_display_luma_crc;/* v7 and v8 */
> + void *d_display_chroma0_crc;/* v7 and v8 */
> + void *d_display_chroma1_crc;/* only v8 */
> + void *d_display_luma_crc_top;/* only v6 */
> + void *d_display_chroma_crc_top;/* only v6 */
> + void *d_display_luma_crc_bot;/* only v6 */
> + void *d_display_chroma_crc_bot;/* only v6 */
> + void *d_display_aspect_ratio;
> + void *d_display_extended_ar;
> + void *d_decoded_frame_width;
> + void *d_decoded_frame_height;
> + void *d_decoded_status;
> + void *d_decoded_first_plane_addr;
> + void *d_decoded_second_plane_addr;
> + void *d_decoded_third_plane_addr;/* only v8 */
> + void *d_decoded_frame_type;
> + void *d_decoded_crop_info1;
> + void *d_decoded_crop_info2;
> + void *d_decoded_picture_profile;
> + void *d_decoded_nal_size;
> + void *d_decoded_luma_crc;
> + void *d_decoded_chroma0_crc;
> + void *d_decoded_chroma1_crc;/* only v8 */
> + void *d_ret_picture_tag_top;
> + void *d_ret_picture_tag_bot;
> + void *d_ret_picture_time_top;
> + void *d_ret_picture_time_bot;
> + void *d_chroma_format;
> + void *d_vc1_info;/* v7 and v8 */
> + void *d_mpeg4_info;
> + void *d_h264_info;
> + void *d_metadata_addr_concealed_mb;
> + void *d_metadata_size_concealed_mb;
> + void *d_metadata_addr_vc1_param;
> + void *d_metadata_size_vc1_param;
> + void *d_metadata_addr_sei_nal;
> + void *d_metadata_size_sei_nal;
> + void *d_metadata_addr_vui;
> + void *d_metadata_size_vui;
> + void *d_metadata_addr_mvcvui;/* v7 and v8 */
> + void *d_metadata_size_mvcvui;/* v7 and v8 */
> + void *d_mvc_view_id;
> + void *d_frame_pack_sei_avail;
> + void *d_frame_pack_arrgment_id;
> + void *d_frame_pack_sei_info;
> + void *d_frame_pack_grid_pos;
> + void *d_display_recovery_sei_info;/* v7 and v8 */
> + void *d_decoded_recovery_sei_info;/* v7 and v8 */
> + void *d_display_first_addr;/* only v7 */
> + void *d_display_second_addr;/* only v7 */
> + void *d_display_third_addr;/* only v7 */
> + void *d_decoded_first_addr;/* only v7 */
> + void *d_decoded_second_addr;/* only v7 */
> + void *d_decoded_third_addr;/* only v7 */
> + void *d_used_dpb_flag_upper;/* v7 and v8 */
> + void *d_used_dpb_flag_lower;/* v7 and v8 */
> +
> + /* encoder registers */
> + void *e_frame_width;
> + void *e_frame_height;
> + void *e_cropped_frame_width;
> + void *e_cropped_frame_height;
> + void *e_frame_crop_offset;
> + void *e_enc_options;
> + void *e_picture_profile;
> + void *e_vbv_buffer_size;
> + void *e_vbv_init_delay;
> + void *e_fixed_picture_qp;
> + void *e_rc_config;
> + void *e_rc_qp_bound;
> + void *e_rc_qp_bound_pb;/* v7 and v8 */
> + void *e_rc_mode;
> + void *e_mb_rc_config;
> + void *e_padding_ctrl;
> + void *e_air_threshold;
> + void *e_mv_hor_range;
> + void *e_mv_ver_range;
> + void *e_num_dpb;
> + void *e_luma_dpb;
> + void *e_chroma_dpb;
> + void *e_me_buffer;
> + void *e_scratch_buffer_addr;
> + void *e_scratch_buffer_size;
> + void *e_tmv_buffer0;
> + void *e_tmv_buffer1;
> + void *e_ir_buffer_addr;/* v7 and v8 */
> + void *e_source_first_plane_addr;
> + void *e_source_second_plane_addr;
> + void *e_source_third_plane_addr;/* v7 and v8 */
> + void *e_source_first_plane_stride;/* v7 and v8 */
> + void *e_source_second_plane_stride;/* v7 and v8 */
> + void *e_source_third_plane_stride;/* v7 and v8 */
> + void *e_stream_buffer_addr;
> + void *e_stream_buffer_size;
> + void *e_roi_buffer_addr;
> + void *e_param_change;
> + void *e_ir_size;
> + void *e_gop_config;
> + void *e_mslice_mode;
> + void *e_mslice_size_mb;
> + void *e_mslice_size_bits;
> + void *e_frame_insertion;
> + void *e_rc_frame_rate;
> + void *e_rc_bit_rate;
> + void *e_rc_roi_ctrl;
> + void *e_picture_tag;
> + void *e_bit_count_enable;
> + void *e_max_bit_count;
> + void *e_min_bit_count;
> + void *e_metadata_buffer_addr;
> + void *e_metadata_buffer_size;
> + void *e_encoded_source_first_plane_addr;
> + void *e_encoded_source_second_plane_addr;
> + void *e_encoded_source_third_plane_addr;/* v7 and v8 */
> + void *e_stream_size;
> + void *e_slice_type;
> + void *e_picture_count;
> + void *e_ret_picture_tag;
> + void *e_stream_buffer_write_pointer; /* only v6 */
> + void *e_recon_luma_dpb_addr;
> + void *e_recon_chroma_dpb_addr;
> + void *e_metadata_addr_enc_slice;
> + void *e_metadata_size_enc_slice;
> + void *e_mpeg4_options;
> + void *e_mpeg4_hec_period;
> + void *e_aspect_ratio;
> + void *e_extended_sar;
> + void *e_h264_options;
> + void *e_h264_options_2;/* v7 and v8 */
> + void *e_h264_lf_alpha_offset;
> + void *e_h264_lf_beta_offset;
> + void *e_h264_i_period;
> + void *e_h264_fmo_slice_grp_map_type;
> + void *e_h264_fmo_num_slice_grp_minus1;
> + void *e_h264_fmo_slice_grp_change_dir;
> + void *e_h264_fmo_slice_grp_change_rate_minus1;
> + void *e_h264_fmo_run_length_minus1_0;
> + void *e_h264_aso_slice_order_0;
> + void *e_h264_chroma_qp_offset;
> + void *e_h264_num_t_layer;
> + void *e_h264_hierarchical_qp_layer0;
> + void *e_h264_frame_packing_sei_info;
> + void *e_h264_nal_control;/* v7 and v8 */
> + void *e_mvc_frame_qp_view1;
> + void *e_mvc_rc_bit_rate_view1;
> + void *e_mvc_rc_qbound_view1;
> + void *e_mvc_rc_mode_view1;
> + void *e_mvc_inter_view_prediction_on;
> + void *e_vp8_options;/* v7 and v8 */
> + void *e_vp8_filter_options;/* v7 and v8 */
> + void *e_vp8_golden_frame_option;/* v7 and v8 */
> + void *e_vp8_num_t_layer;/* v7 and v8 */
> + void *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
> + void *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
> + void *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
> +};
> +
> struct s5p_mfc_hw_ops {
> int (*alloc_dec_temp_buffers)(struct s5p_mfc_ctx *ctx);
> void (*release_dec_desc_buffer)(struct s5p_mfc_ctx *ctx);
> @@ -80,6 +333,7 @@ struct s5p_mfc_hw_ops {
> };
>
> void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
> +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev);
> int s5p_mfc_alloc_priv_buf(struct device *dev,
> struct s5p_mfc_priv_buf *b);
> void s5p_mfc_release_priv_buf(struct device *dev,
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> index 356cfe5..65b8d20 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> @@ -44,10 +44,10 @@
> } while (0)
> #endif /* S5P_MFC_DEBUG_REGWRITE */
>
> -#define READL(offset) readl(dev->regs_base + (offset))
> -#define WRITEL(data, offset) writel((data), dev->regs_base + (offset))
> -#define OFFSETA(x) (((x) - dev->port_a) >>
> S5P_FIMV_MEM_OFFSET)
> -#define OFFSETB(x) (((x) - dev->port_b) >>
> S5P_FIMV_MEM_OFFSET)
> +#define READL(reg) \
> + (WARN_ON_ONCE(!(reg)) ? 0 : readl(reg))
> +#define WRITEL(data, reg) \
> + (WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))
>
> /* Allocate temporary buffers for decoding */
> static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx)
> @@ -367,16 +367,17 @@ static int
> s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
> unsigned int strm_size)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
>
> mfc_debug_enter();
> mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n"
> "buf_size: 0x%08x (%d)\n",
> ctx->inst_no, buf_addr, strm_size, strm_size);
> - WRITEL(strm_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> - WRITEL(buf_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> - WRITEL(buf_size->cpb, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> - WRITEL(start_num_byte, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> + WRITEL(strm_size, mfc_regs->d_stream_data_size);
> + WRITEL(buf_addr, mfc_regs->d_cpb_buffer_addr);
> + WRITEL(buf_size->cpb, mfc_regs->d_cpb_buffer_size);
> + WRITEL(start_num_byte, mfc_regs->d_cpb_buffer_offset);
>
> mfc_debug_leave();
> return 0;
> @@ -388,6 +389,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> unsigned int frame_size, i;
> unsigned int frame_size_ch, frame_size_mv;
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> size_t buf_addr1;
> int buf_size1;
> int align_gap;
> @@ -399,19 +401,19 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
> mfc_debug(2, "Setting display delay to %d\n", ctx->display_delay);
>
> - WRITEL(ctx->total_dpb_count, S5P_FIMV_D_NUM_DPB_V6);
> - WRITEL(ctx->luma_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> - WRITEL(ctx->chroma_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> + WRITEL(ctx->total_dpb_count, mfc_regs->d_num_dpb);
> + WRITEL(ctx->luma_size, mfc_regs->d_first_plane_dpb_size);
> + WRITEL(ctx->chroma_size, mfc_regs->d_second_plane_dpb_size);
>
> - WRITEL(buf_addr1, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> - WRITEL(ctx->scratch_buf_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> + WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
> + WRITEL(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
> buf_addr1 += ctx->scratch_buf_size;
> buf_size1 -= ctx->scratch_buf_size;
>
> if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||
> ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){
> - WRITEL(ctx->mv_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> - WRITEL(ctx->mv_count, S5P_FIMV_D_NUM_MV_V6);
> + WRITEL(ctx->mv_size, mfc_regs->d_mv_buffer_size);
> + WRITEL(ctx->mv_count, mfc_regs->d_num_mv);
> }
>
> frame_size = ctx->luma_size;
> @@ -425,11 +427,11 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "Luma %d: %x\n", i,
> ctx->dst_bufs[i].cookie.raw.luma);
> WRITEL(ctx->dst_bufs[i].cookie.raw.luma,
> - S5P_FIMV_D_LUMA_DPB_V6 + i * 4);
> + mfc_regs->d_first_plane_dpb + i * 4);
> mfc_debug(2, "\tChroma %d: %x\n", i,
> ctx->dst_bufs[i].cookie.raw.chroma);
> WRITEL(ctx->dst_bufs[i].cookie.raw.chroma,
> - S5P_FIMV_D_CHROMA_DPB_V6 + i * 4);
> + mfc_regs->d_second_plane_dpb + i * 4);
> }
> if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
> ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {
> @@ -442,7 +444,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
>
> mfc_debug(2, "\tBuf1: %x, size: %d\n",
> buf_addr1, buf_size1);
> - WRITEL(buf_addr1, S5P_FIMV_D_MV_BUFFER_V6 + i * 4);
> + WRITEL(buf_addr1, mfc_regs->d_mv_buffer + i * 4);
> buf_addr1 += frame_size_mv;
> buf_size1 -= frame_size_mv;
> }
> @@ -455,7 +457,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> return -ENOMEM;
> }
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_INIT_BUFS_V6, NULL);
>
> @@ -468,9 +470,10 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct
> s5p_mfc_ctx *ctx,
> unsigned long addr, unsigned int size)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> - WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align */
> - WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> + WRITEL(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */
> + WRITEL(size, mfc_regs->e_stream_buffer_size);
>
> mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",
> addr, size);
> @@ -482,14 +485,10 @@ static void
> s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> unsigned long y_addr, unsigned long c_addr)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> - if (IS_MFCV7(dev)) {
> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> - } else {
> - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> - }
> + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
> + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>
> mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);
> mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);
> @@ -499,18 +498,14 @@ static void
> s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> unsigned long *y_addr, unsigned long *c_addr)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> unsigned long enc_recon_y_addr, enc_recon_c_addr;
>
> - if (IS_MFCV7(dev)) {
> - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> - } else {
> - *y_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> - *c_addr = READL(S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> - }
> + *y_addr = READL(mfc_regs->e_encoded_source_first_plane_addr);
> + *c_addr = READL(mfc_regs->e_encoded_source_second_plane_addr);
>
> - enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> - enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> + enc_recon_y_addr = READL(mfc_regs->e_recon_luma_dpb_addr);
> + enc_recon_c_addr = READL(mfc_regs->e_recon_chroma_dpb_addr);
>
> mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);
> mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);
> @@ -520,6 +515,7 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct
> s5p_mfc_ctx *ctx,
> static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> size_t buf_addr1;
> int i, buf_size1;
>
> @@ -531,24 +527,24 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
>
> for (i = 0; i < ctx->pb_count; i++) {
> - WRITEL(buf_addr1, S5P_FIMV_E_LUMA_DPB_V6 + (4 * i));
> + WRITEL(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
> buf_addr1 += ctx->luma_dpb_size;
> - WRITEL(buf_addr1, S5P_FIMV_E_CHROMA_DPB_V6 + (4 * i));
> + WRITEL(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i));
> buf_addr1 += ctx->chroma_dpb_size;
> - WRITEL(buf_addr1, S5P_FIMV_E_ME_BUFFER_V6 + (4 * i));
> + WRITEL(buf_addr1, mfc_regs->e_me_buffer + (4 * i));
> buf_addr1 += ctx->me_buffer_size;
> buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size +
> ctx->me_buffer_size);
> }
>
> - WRITEL(buf_addr1, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> - WRITEL(ctx->scratch_buf_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> + WRITEL(buf_addr1, mfc_regs->e_scratch_buffer_addr);
> + WRITEL(ctx->scratch_buf_size, mfc_regs->e_scratch_buffer_size);
> buf_addr1 += ctx->scratch_buf_size;
> buf_size1 -= ctx->scratch_buf_size;
>
> - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER0_V6);
> + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer0);
> buf_addr1 += ctx->tmv_buffer_size >> 1;
> - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER1_V6);
> + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer1);
> buf_addr1 += ctx->tmv_buffer_size >> 1;
> buf_size1 -= ctx->tmv_buffer_size;
>
> @@ -559,7 +555,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> return -ENOMEM;
> }
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_INIT_BUFS_V6, NULL);
>
> @@ -571,18 +567,19 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> /* multi-slice control */
> /* multi-slice MB number or bit size */
> - WRITEL(ctx->slice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> + WRITEL(ctx->slice_mode, mfc_regs->e_mslice_mode);
> if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
> - WRITEL(ctx->slice_size.mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> + WRITEL(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
> } else if (ctx->slice_mode ==
> V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> - WRITEL(ctx->slice_size.bits,
> S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> + WRITEL(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
> } else {
> - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> + WRITEL(0x0, mfc_regs->e_mslice_size_mb);
> + WRITEL(0x0, mfc_regs->e_mslice_size_bits);
> }
>
> return 0;
> @@ -591,27 +588,28 @@ static int s5p_mfc_set_slice_mode(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> unsigned int reg = 0;
>
> mfc_debug_enter();
>
> /* width */
> - WRITEL(ctx->img_width, S5P_FIMV_E_FRAME_WIDTH_V6); /* 16 align */
> + WRITEL(ctx->img_width, mfc_regs->e_frame_width); /* 16 align */
> /* height */
> - WRITEL(ctx->img_height, S5P_FIMV_E_FRAME_HEIGHT_V6); /* 16 align
> */
> + WRITEL(ctx->img_height, mfc_regs->e_frame_height); /* 16 align */
>
> /* cropped width */
> - WRITEL(ctx->img_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> + WRITEL(ctx->img_width, mfc_regs->e_cropped_frame_width);
> /* cropped height */
> - WRITEL(ctx->img_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> + WRITEL(ctx->img_height, mfc_regs->e_cropped_frame_height);
> /* cropped offset */
> - WRITEL(0x0, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> + WRITEL(0x0, mfc_regs->e_frame_crop_offset);
>
> /* pictype : IDR period */
> reg = 0;
> reg |= p->gop_size & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* multi-slice control */
> /* multi-slice MB number or bit size */
> @@ -619,65 +617,65 @@ static int s5p_mfc_set_enc_params(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
> reg |= (0x1 << 3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> ctx->slice_size.mb = p->slice_mb;
> } else if (p->slice_mode ==
> V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> reg |= (0x1 << 3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> ctx->slice_size.bits = p->slice_bit;
> } else {
> reg &= ~(0x1 << 3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> }
>
> s5p_mfc_set_slice_mode(ctx);
>
> /* cyclic intra refresh */
> - WRITEL(p->intra_refresh_mb, S5P_FIMV_E_IR_SIZE_V6);
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(p->intra_refresh_mb, mfc_regs->e_ir_size);
> + reg = READL(mfc_regs->e_enc_options);
> if (p->intra_refresh_mb == 0)
> reg &= ~(0x1 << 4);
> else
> reg |= (0x1 << 4);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* 'NON_REFERENCE_STORE_ENABLE' for debugging */
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 9);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* memory structure cur. frame */
> if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12M) {
> /* 0: Linear, 1: 2D tiled*/
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 7);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x0, mfc_regs->pixel_format);
> } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV21M) {
> /* 0: Linear, 1: 2D tiled*/
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 7);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x1, mfc_regs->pixel_format);
> } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16) {
> /* 0: Linear, 1: 2D tiled*/
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg |= (0x1 << 7);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x0, mfc_regs->pixel_format);
> }
>
> /* memory structure recon. frame */
> /* 0: Linear, 1: 2D tiled */
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg |= (0x1 << 8);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* padding control & value */
> - WRITEL(0x0, S5P_FIMV_E_PADDING_CTRL_V6);
> + WRITEL(0x0, mfc_regs->e_padding_ctrl);
> if (p->pad) {
> reg = 0;
> /** enable */
> @@ -688,64 +686,64 @@ static int s5p_mfc_set_enc_params(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p->pad_cb & 0xFF) << 8);
> /** y value */
> reg |= p->pad_luma & 0xFF;
> - WRITEL(reg, S5P_FIMV_E_PADDING_CTRL_V6);
> + WRITEL(reg, mfc_regs->e_padding_ctrl);
> }
>
> /* rate control config. */
> reg = 0;
> /* frame-level rate control */
> reg |= ((p->rc_frame & 0x1) << 9);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* bit rate */
> if (p->rc_frame)
> WRITEL(p->rc_bitrate,
> - S5P_FIMV_E_RC_BIT_RATE_V6);
> + mfc_regs->e_rc_bit_rate);
> else
> - WRITEL(1, S5P_FIMV_E_RC_BIT_RATE_V6);
> + WRITEL(1, mfc_regs->e_rc_bit_rate);
>
> /* reaction coefficient */
> if (p->rc_frame) {
> if (p->rc_reaction_coeff < TIGHT_CBR_MAX) /* tight CBR */
> - WRITEL(1, S5P_FIMV_E_RC_RPARAM_V6);
> + WRITEL(1, mfc_regs->e_rc_mode);
> else /* loose CBR */
> - WRITEL(2, S5P_FIMV_E_RC_RPARAM_V6);
> + WRITEL(2, mfc_regs->e_rc_mode);
> }
>
> /* seq header ctrl */
> - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> + reg = READL(mfc_regs->e_enc_options);
> reg &= ~(0x1 << 2);
> reg |= ((p->seq_hdr_mode & 0x1) << 2);
>
> /* frame skip mode */
> reg &= ~(0x3);
> reg |= (p->frame_skip_mode & 0x3);
> - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_enc_options);
>
> /* 'DROP_CONTROL_ENABLE', disable */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> reg &= ~(0x1 << 10);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* setting for MV range [16, 256] */
> reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> - WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6);
> + WRITEL(reg, mfc_regs->e_mv_hor_range);
>
> reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> - WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6);
> + WRITEL(reg, mfc_regs->e_mv_ver_range);
>
> - WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6);
> - WRITEL(0x0, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> - WRITEL(0x0, S5P_FIMV_E_PARAM_CHANGE_V6);
> - WRITEL(0x0, S5P_FIMV_E_RC_ROI_CTRL_V6);
> - WRITEL(0x0, S5P_FIMV_E_PICTURE_TAG_V6);
> + WRITEL(0x0, mfc_regs->e_frame_insertion);
> + WRITEL(0x0, mfc_regs->e_roi_buffer_addr);
> + WRITEL(0x0, mfc_regs->e_param_change);
> + WRITEL(0x0, mfc_regs->e_rc_roi_ctrl);
> + WRITEL(0x0, mfc_regs->e_picture_tag);
>
> - WRITEL(0x0, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> - WRITEL(0x0, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> - WRITEL(0x0, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> + WRITEL(0x0, mfc_regs->e_bit_count_enable);
> + WRITEL(0x0, mfc_regs->e_max_bit_count);
> + WRITEL(0x0, mfc_regs->e_min_bit_count);
>
> - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> + WRITEL(0x0, mfc_regs->e_metadata_buffer_addr);
> + WRITEL(0x0, mfc_regs->e_metadata_buffer_size);
>
> mfc_debug_leave();
>
> @@ -755,6 +753,7 @@ static int s5p_mfc_set_enc_params(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> unsigned int reg = 0;
> @@ -765,10 +764,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params(ctx);
>
> /* pictype : number of B */
> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> + reg = READL(mfc_regs->e_gop_config);
> reg &= ~(0x3 << 16);
> reg |= ((p->num_b_frame & 0x3) << 16);
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* profile & level */
> reg = 0;
> @@ -776,18 +775,19 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h264->level & 0xFF) << 8);
> /** profile - 0 ~ 3 */
> reg |= p_h264->profile & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
> +
> /** frame QP */
> reg &= ~(0x3F);
> reg |= p_h264->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* max & min value of QP */
> reg = 0;
> @@ -795,16 +795,16 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h264->rc_max_qp & 0x3F) << 8);
> /** min QP */
> reg |= p_h264->rc_min_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_h264->rc_b_frame_qp & 0x3F) << 16);
> reg |= ((p_h264->rc_p_frame_qp & 0x3F) << 8);
> reg |= p_h264->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* frame rate */
> @@ -812,38 +812,38 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> WRITEL(p_h264->cpb_size & 0xFFFF,
> - S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> /* interlace */
> reg = 0;
> reg |= ((p_h264->interlace & 0x1) << 3);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* height */
> if (p_h264->interlace) {
> WRITEL(ctx->img_height >> 1,
> - S5P_FIMV_E_FRAME_HEIGHT_V6); /* 32 align */
> + mfc_regs->e_frame_height); /* 32 align */
> /* cropped height */
> WRITEL(ctx->img_height >> 1,
> - S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> + mfc_regs->e_cropped_frame_height);
> }
>
> /* loop filter ctrl */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x3 << 1);
> reg |= ((p_h264->loop_filter_mode & 0x3) << 1);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* loopfilter alpha offset */
> if (p_h264->loop_filter_alpha < 0) {
> @@ -853,7 +853,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg = 0x00;
> reg |= (p_h264->loop_filter_alpha & 0xF);
> }
> - WRITEL(reg, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> + WRITEL(reg, mfc_regs->e_h264_lf_alpha_offset);
>
> /* loopfilter beta offset */
> if (p_h264->loop_filter_beta < 0) {
> @@ -863,28 +863,28 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg = 0x00;
> reg |= (p_h264->loop_filter_beta & 0xF);
> }
> - WRITEL(reg, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> + WRITEL(reg, mfc_regs->e_h264_lf_beta_offset);
>
> /* entropy coding mode */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x1);
> reg |= p_h264->entropy_mode & 0x1;
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* number of ref. picture */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 7);
> reg |= (((p_h264->num_ref_pic_4p - 1) & 0x1) << 7);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* 8x8 transform enable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + reg = READL(mfc_regs->e_h264_options);
> reg &= ~(0x3 << 12);
> reg |= ((p_h264->_8x8_transform & 0x3) << 12);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* macroblock adaptive scaling features */
> - WRITEL(0x0, S5P_FIMV_E_MB_RC_CONFIG_V6);
> + WRITEL(0x0, mfc_regs->e_mb_rc_config);
> if (p->rc_mb) {
> reg = 0;
> /** dark region */
> @@ -895,92 +895,95 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h264->rc_mb_static & 0x1) << 1);
> /** high activity region */
> reg |= p_h264->rc_mb_activity & 0x1;
> - WRITEL(reg, S5P_FIMV_E_MB_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_mb_rc_config);
> }
>
> /* aspect ratio VUI */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 5);
> reg |= ((p_h264->vui_sar & 0x1) << 5);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> - WRITEL(0x0, S5P_FIMV_E_ASPECT_RATIO_V6);
> - WRITEL(0x0, S5P_FIMV_E_EXTENDED_SAR_V6);
> + WRITEL(0x0, mfc_regs->e_aspect_ratio);
> + WRITEL(0x0, mfc_regs->e_extended_sar);
> if (p_h264->vui_sar) {
> /* aspect ration IDC */
> reg = 0;
> reg |= p_h264->vui_sar_idc & 0xFF;
> - WRITEL(reg, S5P_FIMV_E_ASPECT_RATIO_V6);
> + WRITEL(reg, mfc_regs->e_aspect_ratio);
> if (p_h264->vui_sar_idc == 0xFF) {
> /* extended SAR */
> reg = 0;
> reg |= (p_h264->vui_ext_sar_width & 0xFFFF) << 16;
> reg |= p_h264->vui_ext_sar_height & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_EXTENDED_SAR_V6);
> + WRITEL(reg, mfc_regs->e_extended_sar);
> }
> }
>
> /* intra picture period for H.264 open GOP */
> /* control */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 4);
> reg |= ((p_h264->open_gop & 0x1) << 4);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
> +
> /* value */
> - WRITEL(0x0, S5P_FIMV_E_H264_I_PERIOD_V6);
> + WRITEL(0x0, mfc_regs->e_h264_i_period);
> if (p_h264->open_gop) {
> reg = 0;
> reg |= p_h264->open_gop_size & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_H264_I_PERIOD_V6);
> + WRITEL(reg, mfc_regs->e_h264_i_period);
> }
>
> /* 'WEIGHTED_BI_PREDICTION' for B is disable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x3 << 9);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 14);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* ASO */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 6);
> reg |= ((p_h264->aso & 0x1) << 6);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
>
> /* hier qp enable */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 8);
> reg |= ((p_h264->open_gop & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
> reg = 0;
> if (p_h264->hier_qp && p_h264->hier_qp_layer) {
> reg |= (p_h264->hier_qp_type & 0x1) << 0x3;
> reg |= p_h264->hier_qp_layer & 0x7;
> - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
> /* QP value for each layer */
> - for (i = 0; i < (p_h264->hier_qp_layer & 0x7); i++)
> + for (i = 0; i < p_h264->hier_qp_layer &&
> + i < ARRAY_SIZE(p_h264->hier_qp_layer_qp);
i++)
> {
> WRITEL(p_h264->hier_qp_layer_qp[i],
> - S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6 +
> - i * 4);
> + mfc_regs->e_h264_hierarchical_qp_layer0
> + + i * 4);
> + }
> }
> /* number of coding layer should be zero when hierarchical is
> disable */
> - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
>
> /* frame packing SEI generation */
> - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> + READL(mfc_regs->e_h264_options);
> reg &= ~(0x1 << 25);
> reg |= ((p_h264->sei_frame_packing & 0x1) << 25);
> - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->e_h264_options);
> if (p_h264->sei_frame_packing) {
> reg = 0;
> /** current frame0 flag */
> reg |= ((p_h264->sei_fp_curr_frame_0 & 0x1) << 2);
> /** arrangement type */
> reg |= p_h264->sei_fp_arrangement_type & 0x3;
> - WRITEL(reg, S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> + WRITEL(reg, mfc_regs->e_h264_frame_packing_sei_info);
> }
>
> if (p_h264->fmo) {
> @@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
> if (p_h264->fmo_slice_grp > 4)
> p_h264->fmo_slice_grp = 4;
> - for (i = 0; i < (p_h264->fmo_slice_grp & 0xF); i++)
> + for (i = 0; i < ARRAY_SIZE(p_h264->fmo_run_len)
> + && i < p_h264->fmo_slice_grp; i++) {
What do you think about moving this to separate path? This seems
like it slipped with the register patches.
> WRITEL(p_h264->fmo_run_len[i] - 1,
> - S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6 +
> - i * 4);
> +
mfc_regs->e_h264_fmo_run_length_minus1_0
> + + i * 4);
> + }
> break;
> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES:
> if (p_h264->fmo_slice_grp > 4)
> @@ -1002,10 +1007,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> if (p_h264->fmo_slice_grp > 2)
> p_h264->fmo_slice_grp = 2;
> WRITEL(p_h264->fmo_chg_dir & 0x1,
> -
S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> + mfc_regs->e_h264_fmo_slice_grp_change_dir);
> /* the valid range is 0 ~ number of macroblocks -1
*/
> WRITEL(p_h264->fmo_chg_rate,
> -
> S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> + mfc_regs->e_h264_fmo_slice_grp_change_rate_minus1);
> break;
> default:
> mfc_err("Unsupported map type for FMO: %d\n",
> @@ -1016,11 +1021,11 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> }
>
> WRITEL(p_h264->fmo_map_type,
> - S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> + mfc_regs->e_h264_fmo_slice_grp_map_type);
> WRITEL(p_h264->fmo_slice_grp - 1,
> -
S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> + mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> } else {
> - WRITEL(0, S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> + WRITEL(0, mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> }
>
> mfc_debug_leave();
> @@ -1031,6 +1036,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_mpeg4_enc_params *p_mpeg4 = &p->codec.mpeg4;
> unsigned int reg = 0;
> @@ -1040,10 +1046,10 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params(ctx);
>
> /* pictype : number of B */
> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> + reg = READL(mfc_regs->e_gop_config);
> reg &= ~(0x3 << 16);
> reg |= ((p->num_b_frame & 0x3) << 16);
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* profile & level */
> reg = 0;
> @@ -1051,18 +1057,19 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_mpeg4->level & 0xFF) << 8);
> /** profile - 0 ~ 1 */
> reg |= p_mpeg4->profile & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
> +
> /** frame QP */
> reg &= ~(0x3F);
> reg |= p_mpeg4->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* max & min value of QP */
> reg = 0;
> @@ -1070,16 +1077,16 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_mpeg4->rc_max_qp & 0x3F) << 8);
> /** min QP */
> reg |= p_mpeg4->rc_min_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_mpeg4->rc_b_frame_qp & 0x3F) << 16);
> reg |= ((p_mpeg4->rc_p_frame_qp & 0x3F) << 8);
> reg |= p_mpeg4->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* frame rate */
> @@ -1087,21 +1094,21 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> /* Disable HEC */
> - WRITEL(0x0, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> - WRITEL(0x0, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> + WRITEL(0x0, mfc_regs->e_mpeg4_options);
> + WRITEL(0x0, mfc_regs->e_mpeg4_hec_period);
>
> mfc_debug_leave();
>
> @@ -1111,6 +1118,7 @@ static int s5p_mfc_set_enc_params_mpeg4(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_mpeg4_enc_params *p_h263 = &p->codec.mpeg4;
> unsigned int reg = 0;
> @@ -1123,18 +1131,19 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> /** profile */
> reg |= (0x1 << 4);
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
> +
> /** frame QP */
> reg &= ~(0x3F);
> reg |= p_h263->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* max & min value of QP */
> reg = 0;
> @@ -1142,16 +1151,16 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> reg |= ((p_h263->rc_max_qp & 0x3F) << 8);
> /** min QP */
> reg |= p_h263->rc_min_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_h263->rc_b_frame_qp & 0x3F) << 16);
> reg |= ((p_h263->rc_p_frame_qp & 0x3F) << 8);
> reg |= p_h263->rc_frame_qp & 0x3F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* frame rate */
> @@ -1159,16 +1168,16 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> mfc_debug_leave();
> @@ -1179,6 +1188,7 @@ static int s5p_mfc_set_enc_params_h263(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_vp8_enc_params *p_vp8 = &p->codec.vp8;
> unsigned int reg = 0;
> @@ -1189,57 +1199,57 @@ static int s5p_mfc_set_enc_params_vp8(struct
> s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params(ctx);
>
> /* pictype : number of B */
> - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> + reg = READL(mfc_regs->e_gop_config);
> reg &= ~(0x3 << 16);
> reg |= ((p->num_b_frame & 0x3) << 16);
> - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_gop_config);
>
> /* profile - 0 ~ 3 */
> reg = p_vp8->profile & 0x3;
> - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + WRITEL(reg, mfc_regs->e_picture_profile);
>
> /* rate control config. */
> - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> + reg = READL(mfc_regs->e_rc_config);
> /** macroblock level rate control */
> reg &= ~(0x1 << 8);
> reg |= ((p->rc_mb & 0x1) << 8);
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* frame rate */
> if (p->rc_frame && p->rc_framerate_num && p->rc_framerate_denom)
> {
> reg = 0;
> reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> reg |= p->rc_framerate_denom & 0xFFFF;
> - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> }
>
> /* frame QP */
> reg &= ~(0x7F);
> reg |= p_vp8->rc_frame_qp & 0x7F;
> - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> + WRITEL(reg, mfc_regs->e_rc_config);
>
> /* other QPs */
> - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> if (!p->rc_frame && !p->rc_mb) {
> reg = 0;
> reg |= ((p_vp8->rc_p_frame_qp & 0x7F) << 8);
> reg |= p_vp8->rc_frame_qp & 0x7F;
> - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> }
>
> /* max QP */
> reg = ((p_vp8->rc_max_qp & 0x7F) << 8);
> /* min QP */
> reg |= p_vp8->rc_min_qp & 0x7F;
> - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> + WRITEL(reg, mfc_regs->e_rc_qp_bound);
>
> /* vbv buffer size */
> if (p->frame_skip_mode ==
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> - WRITEL(p->vbv_size & 0xFFFF, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + WRITEL(p->vbv_size & 0xFFFF, mfc_regs->e_vbv_buffer_size);
>
> if (p->rc_frame)
> - WRITEL(p->vbv_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + WRITEL(p->vbv_delay, mfc_regs->e_vbv_init_delay);
> }
>
> /* VP8 specific params */
> @@ -1263,7 +1273,7 @@ static int s5p_mfc_set_enc_params_vp8(struct
> s5p_mfc_ctx *ctx)
> }
> reg |= (val & 0xF) << 3;
> reg |= (p_vp8->num_ref & 0x2);
> - WRITEL(reg, S5P_FIMV_E_VP8_OPTIONS_V7);
> + WRITEL(reg, mfc_regs->e_vp8_options);
>
> mfc_debug_leave();
>
> @@ -1297,6 +1307,7 @@ static bool s5p_mfc_is_v6_new(struct s5p_mfc_dev
> *dev)
> static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> unsigned int reg = 0;
> int fmo_aso_ctrl = 0;
>
> @@ -1304,9 +1315,9 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> mfc_debug(2, "InstNo: %d/%d\n", ctx->inst_no,
> S5P_FIMV_CH_SEQ_HEADER_V6);
> mfc_debug(2, "BUFs: %08x %08x %08x\n",
> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6));
> + READL(mfc_regs->d_cpb_buffer_addr),
> + READL(mfc_regs->d_cpb_buffer_addr),
> + READL(mfc_regs->d_cpb_buffer_addr));
>
> /* FMO_ASO_CTRL - 0: Enable, 1: Disable */
> reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6);
> @@ -1317,11 +1328,11 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> * set to negative value. */
> if (ctx->display_delay >= 0) {
> reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6);
> - WRITEL(ctx->display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> + WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
> }
>
> if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
> - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->d_dec_options);
> reg = 0;
> }
>
> @@ -1336,21 +1347,21 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
>
> if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
> - WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->d_init_buffer_options);
> else
> - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> + WRITEL(reg, mfc_regs->d_dec_options);
>
> /* 0: NV12(CbCr), 1: NV21(CrCb) */
> if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV21M)
> - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x1, mfc_regs->pixel_format);
> else
> - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> + WRITEL(0x0, mfc_regs->pixel_format);
>
>
> /* sei parse */
> - WRITEL(ctx->sei_fp_parse & 0x1, S5P_FIMV_D_SEI_ENABLE_V6);
> + WRITEL(ctx->sei_fp_parse & 0x1, mfc_regs->d_sei_enable);
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
>
> @@ -1361,11 +1372,12 @@ static int s5p_mfc_init_decode_v6(struct
> s5p_mfc_ctx *ctx)
> static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int
> flush)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> if (flush) {
> dev->curr_ctx = ctx->num;
> s5p_mfc_clean_ctx_int_flags(ctx);
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
> }
> @@ -1376,11 +1388,12 @@ static int s5p_mfc_decode_one_frame_v6(struct
> s5p_mfc_ctx *ctx,
> enum s5p_mfc_decode_arg last_frame)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> - WRITEL(ctx->dec_dst_flag, S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> - WRITEL(ctx->slice_interface & 0x1, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> + WRITEL(ctx->dec_dst_flag, mfc_regs->d_available_dpb_flag_lower);
> + WRITEL(ctx->slice_interface & 0x1, mfc_regs->d_slice_if_enable);
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> /* Issue different commands to instance basing on whether it
> * is the last frame or not. */
> switch (last_frame) {
> @@ -1404,6 +1417,7 @@ static int s5p_mfc_decode_one_frame_v6(struct
> s5p_mfc_ctx *ctx,
> static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> if (ctx->codec_mode == S5P_MFC_CODEC_H264_ENC)
> s5p_mfc_set_enc_params_h264(ctx);
> @@ -1419,13 +1433,13 @@ static int s5p_mfc_init_encode_v6(struct
> s5p_mfc_ctx *ctx)
> return -EINVAL;
> }
>
> - /* Set stride lengths */
> + /* Set stride lengths for v7 & above */
> if (IS_MFCV7(dev)) {
> - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> - WRITEL(ctx->img_width, S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> + WRITEL(ctx->img_width, mfc_regs-
> >e_source_first_plane_stride);
> + WRITEL(ctx->img_width, mfc_regs-
> >e_source_second_plane_stride);
> }
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
>
> @@ -1435,14 +1449,16 @@ static int s5p_mfc_init_encode_v6(struct
> s5p_mfc_ctx *ctx)
> static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> struct s5p_mfc_enc_params *p = &ctx->enc_params;
> struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> int i;
>
> if (p_h264->aso) {
> - for (i = 0; i < 8; i++)
> + for (i = 0; i < ARRAY_SIZE(p_h264->aso_slice_order); i++) {
> WRITEL(p_h264->aso_slice_order[i],
> - S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6 + i *
4);
> + mfc_regs->e_h264_aso_slice_order_0 + i * 4);
> + }
> }
> return 0;
> }
> @@ -1451,6 +1467,7 @@ static int
> s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
> {
> struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
>
> mfc_debug(2, "++\n");
>
> @@ -1461,7 +1478,7 @@ static int s5p_mfc_encode_one_frame_v6(struct
> s5p_mfc_ctx *ctx)
>
> s5p_mfc_set_slice_mode(ctx);
>
> - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> S5P_FIMV_CH_FRAME_START_V6, NULL);
>
> @@ -1836,28 +1853,26 @@ static void s5p_mfc_cleanup_queue_v6(struct
> list_head *lh, struct vb2_queue *vq)
>
> static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
> {
> - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
> - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_INT_V6);
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> + WRITEL(0, mfc_regs->risc2host_command);
> + WRITEL(0, mfc_regs->risc2host_int);
> }
>
> static void s5p_mfc_write_info_v6(struct s5p_mfc_ctx *ctx, unsigned
> int data,
> unsigned int ofs)
> {
> - struct s5p_mfc_dev *dev = ctx->dev;
> -
> s5p_mfc_clock_on();
> - WRITEL(data, ofs);
> + WRITEL(data, (void *)ofs);
> s5p_mfc_clock_off();
> }
>
> static unsigned int
> s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
> {
> - struct s5p_mfc_dev *dev = ctx->dev;
> int ret;
>
> s5p_mfc_clock_on();
> - ret = READL(ofs);
> + ret = READL((void *)ofs);
> s5p_mfc_clock_off();
>
> return ret;
> @@ -1865,50 +1880,51 @@ s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx,
> unsigned int ofs)
>
> static int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> + return READL(dev->mfc_regs->d_display_first_plane_addr);
> }
>
> static int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> + return READL(dev->mfc_regs->d_decoded_first_plane_addr);
> }
>
> static int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_STATUS_V6);
> + return READL(dev->mfc_regs->d_display_status);
> }
>
> static int s5p_mfc_get_dec_status_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_STATUS_V6);
> + return READL(dev->mfc_regs->d_decoded_status);
> }
>
> static int s5p_mfc_get_dec_frame_type_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_FRAME_TYPE_V6) &
> + return READL(dev->mfc_regs->d_decoded_frame_type) &
> S5P_FIMV_DECODE_FRAME_MASK_V6;
> }
>
> static int s5p_mfc_get_disp_frame_type_v6(struct s5p_mfc_ctx *ctx)
> {
> - return mfc_read(ctx->dev, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6) &
> + struct s5p_mfc_dev *dev = ctx->dev;
> + return READL(dev->mfc_regs->d_display_frame_type) &
> S5P_FIMV_DECODE_FRAME_MASK_V6;
> }
>
> static int s5p_mfc_get_consumed_stream_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> + return READL(dev->mfc_regs->d_decoded_nal_size);
> }
>
> static int s5p_mfc_get_int_reason_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_RISC2HOST_CMD_V6) &
> + return READL(dev->mfc_regs->risc2host_command) &
> S5P_FIMV_RISC2HOST_CMD_MASK;
> }
>
> static int s5p_mfc_get_int_err_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_ERROR_CODE_V6);
> + return READL(dev->mfc_regs->error_code);
> }
>
> static int s5p_mfc_err_dec_v6(unsigned int err)
> @@ -1923,82 +1939,263 @@ static int s5p_mfc_err_dspl_v6(unsigned int
> err)
>
> static int s5p_mfc_get_img_width_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> + return READL(dev->mfc_regs->d_display_frame_width);
> }
>
> static int s5p_mfc_get_img_height_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> + return READL(dev->mfc_regs->d_display_frame_height);
> }
>
> static int s5p_mfc_get_dpb_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_DPB_V6);
> + return READL(dev->mfc_regs->d_min_num_dpb);
> }
>
> static int s5p_mfc_get_mv_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_MV_V6);
> + return READL(dev->mfc_regs->d_min_num_mv);
> }
>
> static int s5p_mfc_get_inst_no_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_RET_INSTANCE_ID_V6);
> + return READL(dev->mfc_regs->ret_instance_id);
> }
>
> static int s5p_mfc_get_enc_dpb_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_NUM_DPB_V6);
> + return READL(dev->mfc_regs->e_num_dpb);
> }
>
> static int s5p_mfc_get_enc_strm_size_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_STREAM_SIZE_V6);
> + return READL(dev->mfc_regs->e_stream_size);
> }
>
> static int s5p_mfc_get_enc_slice_type_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_SLICE_TYPE_V6);
> + return READL(dev->mfc_regs->e_slice_type);
> }
>
> static int s5p_mfc_get_enc_pic_count_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_E_PICTURE_COUNT_V6);
> + return READL(dev->mfc_regs->e_picture_count);
> }
>
> static int s5p_mfc_get_sei_avail_status_v6(struct s5p_mfc_ctx *ctx)
> {
> - return mfc_read(ctx->dev, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> + struct s5p_mfc_dev *dev = ctx->dev;
> + return READL(dev->mfc_regs->d_frame_pack_sei_avail);
> }
>
> static int s5p_mfc_get_mvc_num_views_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> + return READL(dev->mfc_regs->d_mvc_num_views);
> }
>
> static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
> {
> - return mfc_read(dev, S5P_FIMV_D_MVC_VIEW_ID_V6);
> + return READL(dev->mfc_regs->d_mvc_view_id);
> }
>
> static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx
> *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, PIC_TIME_TOP_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top);
> }
>
> static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx
> *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, PIC_TIME_BOT_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot);
> }
>
> static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, CROP_INFO_H_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
> }
>
> static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
> {
> - return s5p_mfc_read_info_v6(ctx, CROP_INFO_V_V6);
> + return s5p_mfc_read_info_v6(ctx,
> + (unsigned int) ctx->dev->mfc_regs->d_display_crop_info2);
> +}
> +
> +static struct s5p_mfc_regs mfc_regs;
> +
> +/* Initialize registers for MFC v6 onwards */
> +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> s5p_mfc_dev *dev)
> +{
> + memset(&mfc_regs, 0, sizeof(mfc_regs));
> +
> +#define S5P_MFC_REG_ADDR(dev, reg) ((dev)->regs_base + (reg))
> +#define R(m, r) mfc_regs.m = S5P_MFC_REG_ADDR(dev, r)
> + /* codec common registers */
> + R(risc_on, S5P_FIMV_RISC_ON_V6);
> + R(risc2host_int, S5P_FIMV_RISC2HOST_INT_V6);
> + R(host2risc_int, S5P_FIMV_HOST2RISC_INT_V6);
> + R(risc_base_address, S5P_FIMV_RISC_BASE_ADDRESS_V6);
> + R(mfc_reset, S5P_FIMV_MFC_RESET_V6);
> + R(host2risc_command, S5P_FIMV_HOST2RISC_CMD_V6);
> + R(risc2host_command, S5P_FIMV_RISC2HOST_CMD_V6);
> + R(firmware_version, S5P_FIMV_FW_VERSION_V6);
> + R(instance_id, S5P_FIMV_INSTANCE_ID_V6);
> + R(codec_type, S5P_FIMV_CODEC_TYPE_V6);
> + R(context_mem_addr, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
> + R(context_mem_size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
> + R(pixel_format, S5P_FIMV_PIXEL_FORMAT_V6);
> + R(ret_instance_id, S5P_FIMV_RET_INSTANCE_ID_V6);
> + R(error_code, S5P_FIMV_ERROR_CODE_V6);
> +
> + /* decoder registers */
> + R(d_crc_ctrl, S5P_FIMV_D_CRC_CTRL_V6);
> + R(d_dec_options, S5P_FIMV_D_DEC_OPTIONS_V6);
> + R(d_display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> + R(d_sei_enable, S5P_FIMV_D_SEI_ENABLE_V6);
> + R(d_min_num_dpb, S5P_FIMV_D_MIN_NUM_DPB_V6);
> + R(d_min_num_mv, S5P_FIMV_D_MIN_NUM_MV_V6);
> + R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> + R(d_num_dpb, S5P_FIMV_D_NUM_DPB_V6);
> + R(d_num_mv, S5P_FIMV_D_NUM_MV_V6);
> + R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> + R(d_first_plane_dpb_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> + R(d_second_plane_dpb_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> + R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> + R(d_first_plane_dpb, S5P_FIMV_D_LUMA_DPB_V6);
> + R(d_second_plane_dpb, S5P_FIMV_D_CHROMA_DPB_V6);
> + R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V6);
> + R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> + R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> + R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> + R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> + R(d_available_dpb_flag_lower,
> S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> + R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> + R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> + R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> + R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> + R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> + R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V6);
> + R(d_display_first_plane_addr, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> + R(d_display_second_plane_addr, S5P_FIMV_D_DISPLAY_CHROMA_ADDR_V6);
> + R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6);
> + R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V6);
> + R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V6);
> + R(d_display_aspect_ratio, S5P_FIMV_D_DISPLAY_ASPECT_RATIO_V6);
> + R(d_display_extended_ar, S5P_FIMV_D_DISPLAY_EXTENDED_AR_V6);
> + R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V6);
> + R(d_decoded_first_plane_addr, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> + R(d_decoded_second_plane_addr, S5P_FIMV_D_DECODED_CHROMA_ADDR_V6);
> + R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V6);
> + R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> + R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6);
> + R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6);
> + R(d_h264_info, S5P_FIMV_D_H264_INFO_V6);
> + R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V6);
> + R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> +
> + /* encoder registers */
> + R(e_frame_width, S5P_FIMV_E_FRAME_WIDTH_V6);
> + R(e_frame_height, S5P_FIMV_E_FRAME_HEIGHT_V6);
> + R(e_cropped_frame_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> + R(e_cropped_frame_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> + R(e_frame_crop_offset, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> + R(e_enc_options, S5P_FIMV_E_ENC_OPTIONS_V6);
> + R(e_picture_profile, S5P_FIMV_E_PICTURE_PROFILE_V6);
> + R(e_vbv_buffer_size, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> + R(e_vbv_init_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> + R(e_fixed_picture_qp, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> + R(e_rc_config, S5P_FIMV_E_RC_CONFIG_V6);
> + R(e_rc_qp_bound, S5P_FIMV_E_RC_QP_BOUND_V6);
> + R(e_rc_mode, S5P_FIMV_E_RC_RPARAM_V6);
> + R(e_mb_rc_config, S5P_FIMV_E_MB_RC_CONFIG_V6);
> + R(e_padding_ctrl, S5P_FIMV_E_PADDING_CTRL_V6);
> + R(e_mv_hor_range, S5P_FIMV_E_MV_HOR_RANGE_V6);
> + R(e_mv_ver_range, S5P_FIMV_E_MV_VER_RANGE_V6);
> + R(e_num_dpb, S5P_FIMV_E_NUM_DPB_V6);
> + R(e_luma_dpb, S5P_FIMV_E_LUMA_DPB_V6);
> + R(e_chroma_dpb, S5P_FIMV_E_CHROMA_DPB_V6);
> + R(e_me_buffer, S5P_FIMV_E_ME_BUFFER_V6);
> + R(e_scratch_buffer_addr, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> + R(e_scratch_buffer_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> + R(e_tmv_buffer0, S5P_FIMV_E_TMV_BUFFER0_V6);
> + R(e_tmv_buffer1, S5P_FIMV_E_TMV_BUFFER1_V6);
> + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> + R(e_stream_buffer_addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6);
> + R(e_stream_buffer_size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> + R(e_roi_buffer_addr, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> + R(e_param_change, S5P_FIMV_E_PARAM_CHANGE_V6);
> + R(e_ir_size, S5P_FIMV_E_IR_SIZE_V6);
> + R(e_gop_config, S5P_FIMV_E_GOP_CONFIG_V6);
> + R(e_mslice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> + R(e_mslice_size_mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> + R(e_mslice_size_bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> + R(e_frame_insertion, S5P_FIMV_E_FRAME_INSERTION_V6);
> + R(e_rc_frame_rate, S5P_FIMV_E_RC_FRAME_RATE_V6);
> + R(e_rc_bit_rate, S5P_FIMV_E_RC_BIT_RATE_V6);
> + R(e_rc_roi_ctrl, S5P_FIMV_E_RC_ROI_CTRL_V6);
> + R(e_picture_tag, S5P_FIMV_E_PICTURE_TAG_V6);
> + R(e_bit_count_enable, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> + R(e_max_bit_count, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> + R(e_min_bit_count, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> + R(e_metadata_buffer_addr, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> + R(e_metadata_buffer_size, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> + R(e_encoded_source_first_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> + R(e_encoded_source_second_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> + R(e_stream_size, S5P_FIMV_E_STREAM_SIZE_V6);
> + R(e_slice_type, S5P_FIMV_E_SLICE_TYPE_V6);
> + R(e_picture_count, S5P_FIMV_E_PICTURE_COUNT_V6);
> + R(e_ret_picture_tag, S5P_FIMV_E_RET_PICTURE_TAG_V6);
> + R(e_recon_luma_dpb_addr, S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> + R(e_recon_chroma_dpb_addr, S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> + R(e_mpeg4_options, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> + R(e_mpeg4_hec_period, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> + R(e_aspect_ratio, S5P_FIMV_E_ASPECT_RATIO_V6);
> + R(e_extended_sar, S5P_FIMV_E_EXTENDED_SAR_V6);
> + R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V6);
> + R(e_h264_lf_alpha_offset, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> + R(e_h264_lf_beta_offset, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> + R(e_h264_i_period, S5P_FIMV_E_H264_I_PERIOD_V6);
> + R(e_h264_fmo_slice_grp_map_type,
> + S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> + R(e_h264_fmo_num_slice_grp_minus1,
> + S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> + R(e_h264_fmo_slice_grp_change_dir,
> + S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> + R(e_h264_fmo_slice_grp_change_rate_minus1,
> +
S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> + R(e_h264_fmo_run_length_minus1_0,
> + S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6);
> + R(e_h264_aso_slice_order_0, S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6);
> + R(e_h264_num_t_layer, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> + R(e_h264_hierarchical_qp_layer0,
> + S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6);
> + R(e_h264_frame_packing_sei_info,
> + S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> +
> + if (!IS_MFCV7(dev))
> + goto done;
> +
> + /* Initialize registers used in MFC v7 */
> + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> + R(e_source_second_plane_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> + R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
> + R(e_source_first_plane_stride, S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> + R(e_source_second_plane_stride,
> S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> + R(e_source_third_plane_stride, S5P_FIMV_E_SOURCE_THIRD_STRIDE_V7);
> + R(e_encoded_source_first_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> + R(e_encoded_source_second_plane_addr,
> + S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> + R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
> +
> +done:
> + return &mfc_regs;
> +#undef S5P_MFC_REG_ADDR
> +#undef R
> }
>
> /* Initialize opr function pointers for MFC v6 */
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> index ab164ef..8055848 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> @@ -40,11 +40,6 @@
> #define FRAME_DELTA_H264_H263 1
> #define TIGHT_CBR_MAX 10
>
> -/* Definitions for shared memory compatibility */
> -#define PIC_TIME_TOP_V6 S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6
> -#define PIC_TIME_BOT_V6 S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6
> -#define CROP_INFO_H_V6 S5P_FIMV_D_DISPLAY_CROP_INFO1_V6
> -#define CROP_INFO_V_V6 S5P_FIMV_D_DISPLAY_CROP_INFO2_V6
> -
> struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
> +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> s5p_mfc_dev *dev);
> #endif /* S5P_MFC_OPR_V6_H_ */
> --
> 1.7.9.5
Best wishes,
--
Kamil Debski
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-05-09 1:00 ` Pawel Osciak
2014-05-09 4:49 ` Arun Kumar K
@ 2014-05-13 10:33 ` Kamil Debski
1 sibling, 0 replies; 16+ messages in thread
From: Kamil Debski @ 2014-05-13 10:33 UTC (permalink / raw)
To: 'Pawel Osciak'
Cc: 'Arun Kumar K', linux-media, 'linux-samsung-soc',
Sylwester Nawrocki, 'Kiran Avnd', 'Arun Kumar'
Hi Pawel,
> From: Pawel Osciak [mailto:posciak@chromium.org]
> Sent: Friday, May 09, 2014 3:01 AM
>
> Hi Kamil,
>
> On Fri, May 9, 2014 at 1:31 AM, Kamil Debski <k.debski@samsung.com>
> wrote:
> >
> > Hi Arun,
> >
> > I think that this driver is getting too complicated now.
> >
> > First there are separate files for MFC versions, but in addition
> there are
> > many
> > IF_MFCVx in there.
>
> The intention of this patch is to actually get rid of IF_MFCVx
> conditionals wherever possible.
>
> >
> > I am curious how many additional lines it would take to
> > add s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.*.
> >
> > I get the point that this approach may result in less lines added,
> but
> > having a callback specific for version use register pointers specific
> for
> > another version makes the code look unreadable and difficult to
> maintain.
>
> Could you please give an example of how this reduces readability?
> I personally feel this patch makes things much more readable (see
> below).
I focused on the large s5p_mfc_init_regs function and the newly added struct
and this gave me the impression that this isn't looking too good.
I gave a second thought to this approach over the weekend, also with
some discussion with Tomasz Figa. I think that with the help of the
people who design and write firmware the situation could be improved.
For example by keeping the layout of registers for each codec consistent
between version, but adding a "codec offset" for each such group of registers.
Nevertheless, I think that your approach is indeed justified. Having
more IF_MFCx is not a good option.
>
> On the other hand, if we continued without the current method, we
> would have to sprinkle
> IF_MFCVx macros all around actual functions/operations, instead of
> just containing this
> to the regs structure, and the only difference in each path would be
> register name defines.
> I don't feel this would be a better direction to be honest.
>
> Compare, new, after this patch:
>
> > + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
> > + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
>
> vs previously, before this patch:
>
> > - if (IS_MFCV7(dev)) {
> > - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> > - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> > - } else {
> > - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> > - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> > - }
>
> And of course adding V8 more would make it even worse with yet another
> else if case.
>
>
> > Please give your opinion on another way to add support for v8.
> > s5p_mfc_cmd_v8.* and s5p_mfc_opr_v8.* ?
>
> If we add v7 and v8 files, a majority of their code will look like this:
>
> s5p_mfc_opr_v6.c:
> (...)
> void foo_v6(args)
> {
> foofun(REGISTER_A_V6);
> barfun(REGISTER_B_V6);
> }
> (...)
>
> s5p_mfc_opr_v7.c:
> (...)
> void foo_v7(args)
> {
> foofun(REGISTER_A_V7);
> barfun(REGISTER_B_V7);
> }
> (...)
>
> s5p_mfc_opr_v8.c:
> (...)
> void foo_v8(args)
> {
> foofun(REGISTER_A_V8);
> barfun(REGISTER_B_V8);
> }
> (...)
>
> I'm not sure this is less error prone and less code...
> Thanks,
> Pawel
Thank you for you comments.
Best wishes,
--
Kamil Debski
Samsung R&D Institute Poland
>
> >
> > Best wishes,
> > --
> > Kamil Debski
> > Samsung R&D Institute Poland
> >
> >
> > > From: Arun Kumar K [mailto:arunkk.samsung@gmail.com] On Behalf Of
> Arun
> > > Kumar K
> > > Sent: Wednesday, April 23, 2014 2:58 PM
> > > To: linux-media@vger.kernel.org; linux-samsung-soc@vger.kernel.org
> > > Cc: k.debski@samsung.com; s.nawrocki@samsung.com;
> posciak@chromium.org;
> > > avnd.kiran@samsung.com; arunkk.samsung@gmail.com
> > > Subject: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc
> > > registers
> > >
> > > From: Kiran AVND <avnd.kiran@samsung.com>
> > >
> > > This patch is needed in preparation to add MFC V8
> > > where the register offsets are changed w.r.t MFC V6/V7.
> > >
> > > This patch adds variants of MFC V6 and V7 while
> > > accessing MFC registers. Registers are kept in mfc context
> > > and are initialized to a particular MFC variant during probe,
> > > which is used instead of macros.
> > >
> > > This avoids duplication of the code for MFC variants
> > > V6 & V7, and reduces the if_else checks while accessing
> > > registers of different MFC variants.
> > >
> > > Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
> > > Signed-off-by: Pawel Osciak <posciak@chromium.org>
> > > Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> > > ---
> > > drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
> > > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> > > drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
> > > drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
> > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697
> > > +++++++++++++++--------
> > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
> > > 6 files changed, 710 insertions(+), 256 deletions(-)
> > >
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > > b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > > index 4f9d37a..07ebac8 100644
> > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> > > @@ -1223,6 +1223,7 @@ static int s5p_mfc_probe(struct
> platform_device
> > > *pdev)
> > > /* Initialize HW ops and commands based on MFC version */
> > > s5p_mfc_init_hw_ops(dev);
> > > s5p_mfc_init_hw_cmds(dev);
> > > + s5p_mfc_init_regs(dev);
> > >
> > > pr_debug("%s--\n", __func__);
> > > return 0;
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > > b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > > index f5404a6..48a14b5 100644
> > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > > @@ -332,6 +332,7 @@ struct s5p_mfc_dev {
> > > struct s5p_mfc_hw_ops *mfc_ops;
> > > struct s5p_mfc_hw_cmds *mfc_cmds;
> > > int ver;
> > > + const struct s5p_mfc_regs *mfc_regs;
> > > };
> > >
> > > /**
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > > index 3c01c33..c9a2274 100644
> > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
> > > @@ -31,6 +31,12 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
> > > dev->mfc_ops = s5p_mfc_ops;
> > > }
> > >
> > > +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev)
> > > +{
> > > + if (IS_MFCV6_PLUS(dev))
> > > + dev->mfc_regs = s5p_mfc_init_regs_v6_plus(dev);
> > > +}
> > > +
> > > int s5p_mfc_alloc_priv_buf(struct device *dev,
> > > struct s5p_mfc_priv_buf *b)
> > > {
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > > index 754c540..7a7ad32 100644
> > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> > > @@ -17,6 +17,259 @@
> > >
> > > #include "s5p_mfc_common.h"
> > >
> > > +struct s5p_mfc_regs {
> > > +
> > > + /* codec common registers */
> > > + void *risc_on;
> > > + void *risc2host_int;
> > > + void *host2risc_int;
> > > + void *risc_base_address;
> > > + void *mfc_reset;
> > > + void *host2risc_command;
> > > + void *risc2host_command;
> > > + void *mfc_bus_reset_ctrl;
> > > + void *firmware_version;
> > > + void *instance_id;
> > > + void *codec_type;
> > > + void *context_mem_addr;
> > > + void *context_mem_size;
> > > + void *pixel_format;
> > > + void *metadata_enable;
> > > + void *mfc_version;
> > > + void *dbg_info_enable;
> > > + void *dbg_buffer_addr;
> > > + void *dbg_buffer_size;
> > > + void *hed_control;
> > > + void *mfc_timeout_value;
> > > + void *hed_shared_mem_addr;
> > > + void *dis_shared_mem_addr;/* only v7 */
> > > + void *ret_instance_id;
> > > + void *error_code;
> > > + void *dbg_buffer_output_size;
> > > + void *metadata_status;
> > > + void *metadata_addr_mb_info;
> > > + void *metadata_size_mb_info;
> > > + void *dbg_info_stage_counter;
> > > +
> > > + /* decoder registers */
> > > + void *d_crc_ctrl;
> > > + void *d_dec_options;
> > > + void *d_display_delay;
> > > + void *d_set_frame_width;
> > > + void *d_set_frame_height;
> > > + void *d_sei_enable;
> > > + void *d_min_num_dpb;
> > > + void *d_min_first_plane_dpb_size;
> > > + void *d_min_second_plane_dpb_size;
> > > + void *d_min_third_plane_dpb_size;/* only v8 */
> > > + void *d_min_num_mv;
> > > + void *d_mvc_num_views;
> > > + void *d_min_num_dis;/* only v7 */
> > > + void *d_min_first_dis_size;/* only v7 */
> > > + void *d_min_second_dis_size;/* only v7 */
> > > + void *d_min_third_dis_size;/* only v7 */
> > > + void *d_post_filter_luma_dpb0;/* v7 and v8 */
> > > + void *d_post_filter_luma_dpb1;/* v7 and v8 */
> > > + void *d_post_filter_luma_dpb2;/* only v7 */
> > > + void *d_post_filter_chroma_dpb0;/* v7 and v8 */
> > > + void *d_post_filter_chroma_dpb1;/* v7 and v8 */
> > > + void *d_post_filter_chroma_dpb2;/* only v7 */
> > > + void *d_num_dpb;
> > > + void *d_num_mv;
> > > + void *d_init_buffer_options;
> > > + void *d_first_plane_dpb_stride_size;/* only v8 */
> > > + void *d_second_plane_dpb_stride_size;/* only v8 */
> > > + void *d_third_plane_dpb_stride_size;/* only v8 */
> > > + void *d_first_plane_dpb_size;
> > > + void *d_second_plane_dpb_size;
> > > + void *d_third_plane_dpb_size;/* only v8 */
> > > + void *d_mv_buffer_size;
> > > + void *d_first_plane_dpb;
> > > + void *d_second_plane_dpb;
> > > + void *d_third_plane_dpb;
> > > + void *d_mv_buffer;
> > > + void *d_scratch_buffer_addr;
> > > + void *d_scratch_buffer_size;
> > > + void *d_metadata_buffer_addr;
> > > + void *d_metadata_buffer_size;
> > > + void *d_nal_start_options;/* v7 and v8 */
> > > + void *d_cpb_buffer_addr;
> > > + void *d_cpb_buffer_size;
> > > + void *d_available_dpb_flag_upper;
> > > + void *d_available_dpb_flag_lower;
> > > + void *d_cpb_buffer_offset;
> > > + void *d_slice_if_enable;
> > > + void *d_picture_tag;
> > > + void *d_stream_data_size;
> > > + void *d_dynamic_dpb_flag_upper;/* v7 and v8 */
> > > + void *d_dynamic_dpb_flag_lower;/* v7 and v8 */
> > > + void *d_display_frame_width;
> > > + void *d_display_frame_height;
> > > + void *d_display_status;
> > > + void *d_display_first_plane_addr;
> > > + void *d_display_second_plane_addr;
> > > + void *d_display_third_plane_addr;/* only v8 */
> > > + void *d_display_frame_type;
> > > + void *d_display_crop_info1;
> > > + void *d_display_crop_info2;
> > > + void *d_display_picture_profile;
> > > + void *d_display_luma_crc;/* v7 and v8 */
> > > + void *d_display_chroma0_crc;/* v7 and v8 */
> > > + void *d_display_chroma1_crc;/* only v8 */
> > > + void *d_display_luma_crc_top;/* only v6 */
> > > + void *d_display_chroma_crc_top;/* only v6 */
> > > + void *d_display_luma_crc_bot;/* only v6 */
> > > + void *d_display_chroma_crc_bot;/* only v6 */
> > > + void *d_display_aspect_ratio;
> > > + void *d_display_extended_ar;
> > > + void *d_decoded_frame_width;
> > > + void *d_decoded_frame_height;
> > > + void *d_decoded_status;
> > > + void *d_decoded_first_plane_addr;
> > > + void *d_decoded_second_plane_addr;
> > > + void *d_decoded_third_plane_addr;/* only v8 */
> > > + void *d_decoded_frame_type;
> > > + void *d_decoded_crop_info1;
> > > + void *d_decoded_crop_info2;
> > > + void *d_decoded_picture_profile;
> > > + void *d_decoded_nal_size;
> > > + void *d_decoded_luma_crc;
> > > + void *d_decoded_chroma0_crc;
> > > + void *d_decoded_chroma1_crc;/* only v8 */
> > > + void *d_ret_picture_tag_top;
> > > + void *d_ret_picture_tag_bot;
> > > + void *d_ret_picture_time_top;
> > > + void *d_ret_picture_time_bot;
> > > + void *d_chroma_format;
> > > + void *d_vc1_info;/* v7 and v8 */
> > > + void *d_mpeg4_info;
> > > + void *d_h264_info;
> > > + void *d_metadata_addr_concealed_mb;
> > > + void *d_metadata_size_concealed_mb;
> > > + void *d_metadata_addr_vc1_param;
> > > + void *d_metadata_size_vc1_param;
> > > + void *d_metadata_addr_sei_nal;
> > > + void *d_metadata_size_sei_nal;
> > > + void *d_metadata_addr_vui;
> > > + void *d_metadata_size_vui;
> > > + void *d_metadata_addr_mvcvui;/* v7 and v8 */
> > > + void *d_metadata_size_mvcvui;/* v7 and v8 */
> > > + void *d_mvc_view_id;
> > > + void *d_frame_pack_sei_avail;
> > > + void *d_frame_pack_arrgment_id;
> > > + void *d_frame_pack_sei_info;
> > > + void *d_frame_pack_grid_pos;
> > > + void *d_display_recovery_sei_info;/* v7 and v8 */
> > > + void *d_decoded_recovery_sei_info;/* v7 and v8 */
> > > + void *d_display_first_addr;/* only v7 */
> > > + void *d_display_second_addr;/* only v7 */
> > > + void *d_display_third_addr;/* only v7 */
> > > + void *d_decoded_first_addr;/* only v7 */
> > > + void *d_decoded_second_addr;/* only v7 */
> > > + void *d_decoded_third_addr;/* only v7 */
> > > + void *d_used_dpb_flag_upper;/* v7 and v8 */
> > > + void *d_used_dpb_flag_lower;/* v7 and v8 */
> > > +
> > > + /* encoder registers */
> > > + void *e_frame_width;
> > > + void *e_frame_height;
> > > + void *e_cropped_frame_width;
> > > + void *e_cropped_frame_height;
> > > + void *e_frame_crop_offset;
> > > + void *e_enc_options;
> > > + void *e_picture_profile;
> > > + void *e_vbv_buffer_size;
> > > + void *e_vbv_init_delay;
> > > + void *e_fixed_picture_qp;
> > > + void *e_rc_config;
> > > + void *e_rc_qp_bound;
> > > + void *e_rc_qp_bound_pb;/* v7 and v8 */
> > > + void *e_rc_mode;
> > > + void *e_mb_rc_config;
> > > + void *e_padding_ctrl;
> > > + void *e_air_threshold;
> > > + void *e_mv_hor_range;
> > > + void *e_mv_ver_range;
> > > + void *e_num_dpb;
> > > + void *e_luma_dpb;
> > > + void *e_chroma_dpb;
> > > + void *e_me_buffer;
> > > + void *e_scratch_buffer_addr;
> > > + void *e_scratch_buffer_size;
> > > + void *e_tmv_buffer0;
> > > + void *e_tmv_buffer1;
> > > + void *e_ir_buffer_addr;/* v7 and v8 */
> > > + void *e_source_first_plane_addr;
> > > + void *e_source_second_plane_addr;
> > > + void *e_source_third_plane_addr;/* v7 and v8 */
> > > + void *e_source_first_plane_stride;/* v7 and v8 */
> > > + void *e_source_second_plane_stride;/* v7 and v8 */
> > > + void *e_source_third_plane_stride;/* v7 and v8 */
> > > + void *e_stream_buffer_addr;
> > > + void *e_stream_buffer_size;
> > > + void *e_roi_buffer_addr;
> > > + void *e_param_change;
> > > + void *e_ir_size;
> > > + void *e_gop_config;
> > > + void *e_mslice_mode;
> > > + void *e_mslice_size_mb;
> > > + void *e_mslice_size_bits;
> > > + void *e_frame_insertion;
> > > + void *e_rc_frame_rate;
> > > + void *e_rc_bit_rate;
> > > + void *e_rc_roi_ctrl;
> > > + void *e_picture_tag;
> > > + void *e_bit_count_enable;
> > > + void *e_max_bit_count;
> > > + void *e_min_bit_count;
> > > + void *e_metadata_buffer_addr;
> > > + void *e_metadata_buffer_size;
> > > + void *e_encoded_source_first_plane_addr;
> > > + void *e_encoded_source_second_plane_addr;
> > > + void *e_encoded_source_third_plane_addr;/* v7 and v8 */
> > > + void *e_stream_size;
> > > + void *e_slice_type;
> > > + void *e_picture_count;
> > > + void *e_ret_picture_tag;
> > > + void *e_stream_buffer_write_pointer; /* only v6 */
> > > + void *e_recon_luma_dpb_addr;
> > > + void *e_recon_chroma_dpb_addr;
> > > + void *e_metadata_addr_enc_slice;
> > > + void *e_metadata_size_enc_slice;
> > > + void *e_mpeg4_options;
> > > + void *e_mpeg4_hec_period;
> > > + void *e_aspect_ratio;
> > > + void *e_extended_sar;
> > > + void *e_h264_options;
> > > + void *e_h264_options_2;/* v7 and v8 */
> > > + void *e_h264_lf_alpha_offset;
> > > + void *e_h264_lf_beta_offset;
> > > + void *e_h264_i_period;
> > > + void *e_h264_fmo_slice_grp_map_type;
> > > + void *e_h264_fmo_num_slice_grp_minus1;
> > > + void *e_h264_fmo_slice_grp_change_dir;
> > > + void *e_h264_fmo_slice_grp_change_rate_minus1;
> > > + void *e_h264_fmo_run_length_minus1_0;
> > > + void *e_h264_aso_slice_order_0;
> > > + void *e_h264_chroma_qp_offset;
> > > + void *e_h264_num_t_layer;
> > > + void *e_h264_hierarchical_qp_layer0;
> > > + void *e_h264_frame_packing_sei_info;
> > > + void *e_h264_nal_control;/* v7 and v8 */
> > > + void *e_mvc_frame_qp_view1;
> > > + void *e_mvc_rc_bit_rate_view1;
> > > + void *e_mvc_rc_qbound_view1;
> > > + void *e_mvc_rc_mode_view1;
> > > + void *e_mvc_inter_view_prediction_on;
> > > + void *e_vp8_options;/* v7 and v8 */
> > > + void *e_vp8_filter_options;/* v7 and v8 */
> > > + void *e_vp8_golden_frame_option;/* v7 and v8 */
> > > + void *e_vp8_num_t_layer;/* v7 and v8 */
> > > + void *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
> > > + void *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
> > > + void *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
> > > +};
> > > +
> > > struct s5p_mfc_hw_ops {
> > > int (*alloc_dec_temp_buffers)(struct s5p_mfc_ctx *ctx);
> > > void (*release_dec_desc_buffer)(struct s5p_mfc_ctx *ctx);
> > > @@ -80,6 +333,7 @@ struct s5p_mfc_hw_ops {
> > > };
> > >
> > > void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
> > > +void s5p_mfc_init_regs(struct s5p_mfc_dev *dev);
> > > int s5p_mfc_alloc_priv_buf(struct device *dev,
> > > struct s5p_mfc_priv_buf *b);
> > > void s5p_mfc_release_priv_buf(struct device *dev,
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > > index 356cfe5..65b8d20 100644
> > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > > @@ -44,10 +44,10 @@
> > > } while (0)
> > > #endif /* S5P_MFC_DEBUG_REGWRITE */
> > >
> > > -#define READL(offset) readl(dev->regs_base +
> (offset))
> > > -#define WRITEL(data, offset) writel((data), dev->regs_base +
> (offset))
> > > -#define OFFSETA(x) (((x) - dev->port_a) >>
> > > S5P_FIMV_MEM_OFFSET)
> > > -#define OFFSETB(x) (((x) - dev->port_b) >>
> > > S5P_FIMV_MEM_OFFSET)
> > > +#define READL(reg) \
> > > + (WARN_ON_ONCE(!(reg)) ? 0 : readl(reg))
> > > +#define WRITEL(data, reg) \
> > > + (WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))
> > >
> > > /* Allocate temporary buffers for decoding */
> > > static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx
> *ctx)
> > > @@ -367,16 +367,17 @@ static int
> > > s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx,
> > > unsigned int strm_size)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
> > >
> > > mfc_debug_enter();
> > > mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n"
> > > "buf_size: 0x%08x (%d)\n",
> > > ctx->inst_no, buf_addr, strm_size, strm_size);
> > > - WRITEL(strm_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> > > - WRITEL(buf_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> > > - WRITEL(buf_size->cpb, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> > > - WRITEL(start_num_byte, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> > > + WRITEL(strm_size, mfc_regs->d_stream_data_size);
> > > + WRITEL(buf_addr, mfc_regs->d_cpb_buffer_addr);
> > > + WRITEL(buf_size->cpb, mfc_regs->d_cpb_buffer_size);
> > > + WRITEL(start_num_byte, mfc_regs->d_cpb_buffer_offset);
> > >
> > > mfc_debug_leave();
> > > return 0;
> > > @@ -388,6 +389,7 @@ static int
> s5p_mfc_set_dec_frame_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > unsigned int frame_size, i;
> > > unsigned int frame_size_ch, frame_size_mv;
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > size_t buf_addr1;
> > > int buf_size1;
> > > int align_gap;
> > > @@ -399,19 +401,19 @@ static int
> s5p_mfc_set_dec_frame_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
> > > mfc_debug(2, "Setting display delay to %d\n", ctx-
> >display_delay);
> > >
> > > - WRITEL(ctx->total_dpb_count, S5P_FIMV_D_NUM_DPB_V6);
> > > - WRITEL(ctx->luma_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> > > - WRITEL(ctx->chroma_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> > > + WRITEL(ctx->total_dpb_count, mfc_regs->d_num_dpb);
> > > + WRITEL(ctx->luma_size, mfc_regs->d_first_plane_dpb_size);
> > > + WRITEL(ctx->chroma_size, mfc_regs->d_second_plane_dpb_size);
> > >
> > > - WRITEL(buf_addr1, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> > > - WRITEL(ctx->scratch_buf_size,
> S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> > > + WRITEL(buf_addr1, mfc_regs->d_scratch_buffer_addr);
> > > + WRITEL(ctx->scratch_buf_size, mfc_regs-
> >d_scratch_buffer_size);
> > > buf_addr1 += ctx->scratch_buf_size;
> > > buf_size1 -= ctx->scratch_buf_size;
> > >
> > > if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||
> > > ctx->codec_mode ==
> S5P_FIMV_CODEC_H264_MVC_DEC){
> > > - WRITEL(ctx->mv_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> > > - WRITEL(ctx->mv_count, S5P_FIMV_D_NUM_MV_V6);
> > > + WRITEL(ctx->mv_size, mfc_regs->d_mv_buffer_size);
> > > + WRITEL(ctx->mv_count, mfc_regs->d_num_mv);
> > > }
> > >
> > > frame_size = ctx->luma_size;
> > > @@ -425,11 +427,11 @@ static int
> s5p_mfc_set_dec_frame_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > mfc_debug(2, "Luma %d: %x\n", i,
> > > ctx-
> >dst_bufs[i].cookie.raw.luma);
> > > WRITEL(ctx->dst_bufs[i].cookie.raw.luma,
> > > - S5P_FIMV_D_LUMA_DPB_V6 + i * 4);
> > > + mfc_regs->d_first_plane_dpb + i * 4);
> > > mfc_debug(2, "\tChroma %d: %x\n", i,
> > > ctx-
> >dst_bufs[i].cookie.raw.chroma);
> > > WRITEL(ctx->dst_bufs[i].cookie.raw.chroma,
> > > - S5P_FIMV_D_CHROMA_DPB_V6 + i * 4);
> > > + mfc_regs->d_second_plane_dpb + i * 4);
> > > }
> > > if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
> > > ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC)
> {
> > > @@ -442,7 +444,7 @@ static int
> s5p_mfc_set_dec_frame_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > >
> > > mfc_debug(2, "\tBuf1: %x, size: %d\n",
> > > buf_addr1, buf_size1);
> > > - WRITEL(buf_addr1, S5P_FIMV_D_MV_BUFFER_V6 + i
> * 4);
> > > + WRITEL(buf_addr1, mfc_regs->d_mv_buffer + i *
> 4);
> > > buf_addr1 += frame_size_mv;
> > > buf_size1 -= frame_size_mv;
> > > }
> > > @@ -455,7 +457,7 @@ static int
> s5p_mfc_set_dec_frame_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > return -ENOMEM;
> > > }
> > >
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > > S5P_FIMV_CH_INIT_BUFS_V6, NULL);
> > >
> > > @@ -468,9 +470,10 @@ static int
> s5p_mfc_set_enc_stream_buffer_v6(struct
> > > s5p_mfc_ctx *ctx,
> > > unsigned long addr, unsigned int size)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > - WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align
> */
> > > - WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> > > + WRITEL(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */
> > > + WRITEL(size, mfc_regs->e_stream_buffer_size);
> > >
> > > mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",
> > > addr, size);
> > > @@ -482,14 +485,10 @@ static void
> > > s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> > > unsigned long y_addr, unsigned long c_addr)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > - if (IS_MFCV7(dev)) {
> > > - WRITEL(y_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> > > - WRITEL(c_addr, S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> > > - } else {
> > > - WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> > > - WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> > > - }
> > > + WRITEL(y_addr, mfc_regs->e_source_first_plane_addr);
> > > + WRITEL(c_addr, mfc_regs->e_source_second_plane_addr);
> > >
> > > mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);
> > > mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);
> > > @@ -499,18 +498,14 @@ static void
> > > s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
> > > unsigned long *y_addr, unsigned long *c_addr)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > unsigned long enc_recon_y_addr, enc_recon_c_addr;
> > >
> > > - if (IS_MFCV7(dev)) {
> > > - *y_addr =
> READL(S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> > > - *c_addr =
> READL(S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> > > - } else {
> > > - *y_addr =
> READL(S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> > > - *c_addr =
> READL(S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> > > - }
> > > + *y_addr = READL(mfc_regs->e_encoded_source_first_plane_addr);
> > > + *c_addr = READL(mfc_regs->e_encoded_source_second_plane_addr);
> > >
> > > - enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> > > - enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> > > + enc_recon_y_addr = READL(mfc_regs->e_recon_luma_dpb_addr);
> > > + enc_recon_c_addr = READL(mfc_regs->e_recon_chroma_dpb_addr);
> > >
> > > mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);
> > > mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);
> > > @@ -520,6 +515,7 @@ static void
> s5p_mfc_get_enc_frame_buffer_v6(struct
> > > s5p_mfc_ctx *ctx,
> > > static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > size_t buf_addr1;
> > > int i, buf_size1;
> > >
> > > @@ -531,24 +527,24 @@ static int
> s5p_mfc_set_enc_ref_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
> > >
> > > for (i = 0; i < ctx->pb_count; i++) {
> > > - WRITEL(buf_addr1, S5P_FIMV_E_LUMA_DPB_V6 + (4 * i));
> > > + WRITEL(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
> > > buf_addr1 += ctx->luma_dpb_size;
> > > - WRITEL(buf_addr1, S5P_FIMV_E_CHROMA_DPB_V6 + (4 * i));
> > > + WRITEL(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i));
> > > buf_addr1 += ctx->chroma_dpb_size;
> > > - WRITEL(buf_addr1, S5P_FIMV_E_ME_BUFFER_V6 + (4 * i));
> > > + WRITEL(buf_addr1, mfc_regs->e_me_buffer + (4 * i));
> > > buf_addr1 += ctx->me_buffer_size;
> > > buf_size1 -= (ctx->luma_dpb_size + ctx-
> >chroma_dpb_size +
> > > ctx->me_buffer_size);
> > > }
> > >
> > > - WRITEL(buf_addr1, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> > > - WRITEL(ctx->scratch_buf_size,
> S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> > > + WRITEL(buf_addr1, mfc_regs->e_scratch_buffer_addr);
> > > + WRITEL(ctx->scratch_buf_size, mfc_regs-
> >e_scratch_buffer_size);
> > > buf_addr1 += ctx->scratch_buf_size;
> > > buf_size1 -= ctx->scratch_buf_size;
> > >
> > > - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER0_V6);
> > > + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer0);
> > > buf_addr1 += ctx->tmv_buffer_size >> 1;
> > > - WRITEL(buf_addr1, S5P_FIMV_E_TMV_BUFFER1_V6);
> > > + WRITEL(buf_addr1, mfc_regs->e_tmv_buffer1);
> > > buf_addr1 += ctx->tmv_buffer_size >> 1;
> > > buf_size1 -= ctx->tmv_buffer_size;
> > >
> > > @@ -559,7 +555,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > return -ENOMEM;
> > > }
> > >
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > > S5P_FIMV_CH_INIT_BUFS_V6, NULL);
> > >
> > > @@ -571,18 +567,19 @@ static int
> s5p_mfc_set_enc_ref_buffer_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > /* multi-slice control */
> > > /* multi-slice MB number or bit size */
> > > - WRITEL(ctx->slice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> > > + WRITEL(ctx->slice_mode, mfc_regs->e_mslice_mode);
> > > if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB)
> {
> > > - WRITEL(ctx->slice_size.mb,
> S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> > > + WRITEL(ctx->slice_size.mb, mfc_regs-
> >e_mslice_size_mb);
> > > } else if (ctx->slice_mode ==
> > > V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> > > - WRITEL(ctx->slice_size.bits,
> > > S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> > > + WRITEL(ctx->slice_size.bits, mfc_regs-
> >e_mslice_size_bits);
> > > } else {
> > > - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> > > + WRITEL(0x0, mfc_regs->e_mslice_size_mb);
> > > + WRITEL(0x0, mfc_regs->e_mslice_size_bits);
> > > }
> > >
> > > return 0;
> > > @@ -591,27 +588,28 @@ static int s5p_mfc_set_slice_mode(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > > unsigned int reg = 0;
> > >
> > > mfc_debug_enter();
> > >
> > > /* width */
> > > - WRITEL(ctx->img_width, S5P_FIMV_E_FRAME_WIDTH_V6); /* 16
> align */
> > > + WRITEL(ctx->img_width, mfc_regs->e_frame_width); /* 16 align
> */
> > > /* height */
> > > - WRITEL(ctx->img_height, S5P_FIMV_E_FRAME_HEIGHT_V6); /* 16
> align
> > > */
> > > + WRITEL(ctx->img_height, mfc_regs->e_frame_height); /* 16
> align */
> > >
> > > /* cropped width */
> > > - WRITEL(ctx->img_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> > > + WRITEL(ctx->img_width, mfc_regs->e_cropped_frame_width);
> > > /* cropped height */
> > > - WRITEL(ctx->img_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> > > + WRITEL(ctx->img_height, mfc_regs->e_cropped_frame_height);
> > > /* cropped offset */
> > > - WRITEL(0x0, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> > > + WRITEL(0x0, mfc_regs->e_frame_crop_offset);
> > >
> > > /* pictype : IDR period */
> > > reg = 0;
> > > reg |= p->gop_size & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_gop_config);
> > >
> > > /* multi-slice control */
> > > /* multi-slice MB number or bit size */
> > > @@ -619,65 +617,65 @@ static int s5p_mfc_set_enc_params(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0;
> > > if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB)
> {
> > > reg |= (0x1 << 3);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > > ctx->slice_size.mb = p->slice_mb;
> > > } else if (p->slice_mode ==
> > > V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
> > > reg |= (0x1 << 3);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > > ctx->slice_size.bits = p->slice_bit;
> > > } else {
> > > reg &= ~(0x1 << 3);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > > }
> > >
> > > s5p_mfc_set_slice_mode(ctx);
> > >
> > > /* cyclic intra refresh */
> > > - WRITEL(p->intra_refresh_mb, S5P_FIMV_E_IR_SIZE_V6);
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(p->intra_refresh_mb, mfc_regs->e_ir_size);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > if (p->intra_refresh_mb == 0)
> > > reg &= ~(0x1 << 4);
> > > else
> > > reg |= (0x1 << 4);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > >
> > > /* 'NON_REFERENCE_STORE_ENABLE' for debugging */
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > reg &= ~(0x1 << 9);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > >
> > > /* memory structure cur. frame */
> > > if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12M) {
> > > /* 0: Linear, 1: 2D tiled*/
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > reg &= ~(0x1 << 7);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > > - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> > > + WRITEL(0x0, mfc_regs->pixel_format);
> > > } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV21M) {
> > > /* 0: Linear, 1: 2D tiled*/
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > reg &= ~(0x1 << 7);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > > - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> > > + WRITEL(0x1, mfc_regs->pixel_format);
> > > } else if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16)
> {
> > > /* 0: Linear, 1: 2D tiled*/
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > reg |= (0x1 << 7);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > > - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> > > + WRITEL(0x0, mfc_regs->pixel_format);
> > > }
> > >
> > > /* memory structure recon. frame */
> > > /* 0: Linear, 1: 2D tiled */
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > reg |= (0x1 << 8);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > >
> > > /* padding control & value */
> > > - WRITEL(0x0, S5P_FIMV_E_PADDING_CTRL_V6);
> > > + WRITEL(0x0, mfc_regs->e_padding_ctrl);
> > > if (p->pad) {
> > > reg = 0;
> > > /** enable */
> > > @@ -688,64 +686,64 @@ static int s5p_mfc_set_enc_params(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p->pad_cb & 0xFF) << 8);
> > > /** y value */
> > > reg |= p->pad_luma & 0xFF;
> > > - WRITEL(reg, S5P_FIMV_E_PADDING_CTRL_V6);
> > > + WRITEL(reg, mfc_regs->e_padding_ctrl);
> > > }
> > >
> > > /* rate control config. */
> > > reg = 0;
> > > /* frame-level rate control */
> > > reg |= ((p->rc_frame & 0x1) << 9);
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* bit rate */
> > > if (p->rc_frame)
> > > WRITEL(p->rc_bitrate,
> > > - S5P_FIMV_E_RC_BIT_RATE_V6);
> > > + mfc_regs->e_rc_bit_rate);
> > > else
> > > - WRITEL(1, S5P_FIMV_E_RC_BIT_RATE_V6);
> > > + WRITEL(1, mfc_regs->e_rc_bit_rate);
> > >
> > > /* reaction coefficient */
> > > if (p->rc_frame) {
> > > if (p->rc_reaction_coeff < TIGHT_CBR_MAX) /* tight
> CBR */
> > > - WRITEL(1, S5P_FIMV_E_RC_RPARAM_V6);
> > > + WRITEL(1, mfc_regs->e_rc_mode);
> > > else /* loose
> CBR */
> > > - WRITEL(2, S5P_FIMV_E_RC_RPARAM_V6);
> > > + WRITEL(2, mfc_regs->e_rc_mode);
> > > }
> > >
> > > /* seq header ctrl */
> > > - reg = READL(S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_enc_options);
> > > reg &= ~(0x1 << 2);
> > > reg |= ((p->seq_hdr_mode & 0x1) << 2);
> > >
> > > /* frame skip mode */
> > > reg &= ~(0x3);
> > > reg |= (p->frame_skip_mode & 0x3);
> > > - WRITEL(reg, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_enc_options);
> > >
> > > /* 'DROP_CONTROL_ENABLE', disable */
> > > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_rc_config);
> > > reg &= ~(0x1 << 10);
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* setting for MV range [16, 256] */
> > > reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> > > - WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6);
> > > + WRITEL(reg, mfc_regs->e_mv_hor_range);
> > >
> > > reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK);
> > > - WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6);
> > > + WRITEL(reg, mfc_regs->e_mv_ver_range);
> > >
> > > - WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_PARAM_CHANGE_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_RC_ROI_CTRL_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_PICTURE_TAG_V6);
> > > + WRITEL(0x0, mfc_regs->e_frame_insertion);
> > > + WRITEL(0x0, mfc_regs->e_roi_buffer_addr);
> > > + WRITEL(0x0, mfc_regs->e_param_change);
> > > + WRITEL(0x0, mfc_regs->e_rc_roi_ctrl);
> > > + WRITEL(0x0, mfc_regs->e_picture_tag);
> > >
> > > - WRITEL(0x0, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> > > + WRITEL(0x0, mfc_regs->e_bit_count_enable);
> > > + WRITEL(0x0, mfc_regs->e_max_bit_count);
> > > + WRITEL(0x0, mfc_regs->e_min_bit_count);
> > >
> > > - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> > > + WRITEL(0x0, mfc_regs->e_metadata_buffer_addr);
> > > + WRITEL(0x0, mfc_regs->e_metadata_buffer_size);
> > >
> > > mfc_debug_leave();
> > >
> > > @@ -755,6 +753,7 @@ static int s5p_mfc_set_enc_params(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > > struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> > > unsigned int reg = 0;
> > > @@ -765,10 +764,10 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > s5p_mfc_set_enc_params(ctx);
> > >
> > > /* pictype : number of B */
> > > - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_gop_config);
> > > reg &= ~(0x3 << 16);
> > > reg |= ((p->num_b_frame & 0x3) << 16);
> > > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_gop_config);
> > >
> > > /* profile & level */
> > > reg = 0;
> > > @@ -776,18 +775,19 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p_h264->level & 0xFF) << 8);
> > > /** profile - 0 ~ 3 */
> > > reg |= p_h264->profile & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > > + WRITEL(reg, mfc_regs->e_picture_profile);
> > >
> > > /* rate control config. */
> > > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_rc_config);
> > > /** macroblock level rate control */
> > > reg &= ~(0x1 << 8);
> > > reg |= ((p->rc_mb & 0x1) << 8);
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > > +
> > > /** frame QP */
> > > reg &= ~(0x3F);
> > > reg |= p_h264->rc_frame_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* max & min value of QP */
> > > reg = 0;
> > > @@ -795,16 +795,16 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p_h264->rc_max_qp & 0x3F) << 8);
> > > /** min QP */
> > > reg |= p_h264->rc_min_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> > >
> > > /* other QPs */
> > > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > > if (!p->rc_frame && !p->rc_mb) {
> > > reg = 0;
> > > reg |= ((p_h264->rc_b_frame_qp & 0x3F) << 16);
> > > reg |= ((p_h264->rc_p_frame_qp & 0x3F) << 8);
> > > reg |= p_h264->rc_frame_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > > }
> > >
> > > /* frame rate */
> > > @@ -812,38 +812,38 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0;
> > > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > > reg |= p->rc_framerate_denom & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > > }
> > >
> > > /* vbv buffer size */
> > > if (p->frame_skip_mode ==
> > >
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > > WRITEL(p_h264->cpb_size & 0xFFFF,
> > > - S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > > + mfc_regs->e_vbv_buffer_size);
> > >
> > > if (p->rc_frame)
> > > - WRITEL(p->vbv_delay,
> S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > > + WRITEL(p->vbv_delay, mfc_regs-
> >e_vbv_init_delay);
> > > }
> > >
> > > /* interlace */
> > > reg = 0;
> > > reg |= ((p_h264->interlace & 0x1) << 3);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* height */
> > > if (p_h264->interlace) {
> > > WRITEL(ctx->img_height >> 1,
> > > - S5P_FIMV_E_FRAME_HEIGHT_V6); /* 32
> align */
> > > + mfc_regs->e_frame_height); /* 32
> align */
> > > /* cropped height */
> > > WRITEL(ctx->img_height >> 1,
> > > - S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> > > + mfc_regs->e_cropped_frame_height);
> > > }
> > >
> > > /* loop filter ctrl */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x3 << 1);
> > > reg |= ((p_h264->loop_filter_mode & 0x3) << 1);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* loopfilter alpha offset */
> > > if (p_h264->loop_filter_alpha < 0) {
> > > @@ -853,7 +853,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0x00;
> > > reg |= (p_h264->loop_filter_alpha & 0xF);
> > > }
> > > - WRITEL(reg, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_lf_alpha_offset);
> > >
> > > /* loopfilter beta offset */
> > > if (p_h264->loop_filter_beta < 0) {
> > > @@ -863,28 +863,28 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0x00;
> > > reg |= (p_h264->loop_filter_beta & 0xF);
> > > }
> > > - WRITEL(reg, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_lf_beta_offset);
> > >
> > > /* entropy coding mode */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1);
> > > reg |= p_h264->entropy_mode & 0x1;
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* number of ref. picture */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 7);
> > > reg |= (((p_h264->num_ref_pic_4p - 1) & 0x1) << 7);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* 8x8 transform enable */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + reg = READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x3 << 12);
> > > reg |= ((p_h264->_8x8_transform & 0x3) << 12);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* macroblock adaptive scaling features */
> > > - WRITEL(0x0, S5P_FIMV_E_MB_RC_CONFIG_V6);
> > > + WRITEL(0x0, mfc_regs->e_mb_rc_config);
> > > if (p->rc_mb) {
> > > reg = 0;
> > > /** dark region */
> > > @@ -895,92 +895,95 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p_h264->rc_mb_static & 0x1) << 1);
> > > /** high activity region */
> > > reg |= p_h264->rc_mb_activity & 0x1;
> > > - WRITEL(reg, S5P_FIMV_E_MB_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_mb_rc_config);
> > > }
> > >
> > > /* aspect ratio VUI */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 5);
> > > reg |= ((p_h264->vui_sar & 0x1) << 5);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > - WRITEL(0x0, S5P_FIMV_E_ASPECT_RATIO_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_EXTENDED_SAR_V6);
> > > + WRITEL(0x0, mfc_regs->e_aspect_ratio);
> > > + WRITEL(0x0, mfc_regs->e_extended_sar);
> > > if (p_h264->vui_sar) {
> > > /* aspect ration IDC */
> > > reg = 0;
> > > reg |= p_h264->vui_sar_idc & 0xFF;
> > > - WRITEL(reg, S5P_FIMV_E_ASPECT_RATIO_V6);
> > > + WRITEL(reg, mfc_regs->e_aspect_ratio);
> > > if (p_h264->vui_sar_idc == 0xFF) {
> > > /* extended SAR */
> > > reg = 0;
> > > reg |= (p_h264->vui_ext_sar_width & 0xFFFF)
> << 16;
> > > reg |= p_h264->vui_ext_sar_height & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_EXTENDED_SAR_V6);
> > > + WRITEL(reg, mfc_regs->e_extended_sar);
> > > }
> > > }
> > >
> > > /* intra picture period for H.264 open GOP */
> > > /* control */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 4);
> > > reg |= ((p_h264->open_gop & 0x1) << 4);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > > +
> > > /* value */
> > > - WRITEL(0x0, S5P_FIMV_E_H264_I_PERIOD_V6);
> > > + WRITEL(0x0, mfc_regs->e_h264_i_period);
> > > if (p_h264->open_gop) {
> > > reg = 0;
> > > reg |= p_h264->open_gop_size & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_H264_I_PERIOD_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_i_period);
> > > }
> > >
> > > /* 'WEIGHTED_BI_PREDICTION' for B is disable */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x3 << 9);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 14);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* ASO */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 6);
> > > reg |= ((p_h264->aso & 0x1) << 6);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > >
> > > /* hier qp enable */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 8);
> > > reg |= ((p_h264->open_gop & 0x1) << 8);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > > reg = 0;
> > > if (p_h264->hier_qp && p_h264->hier_qp_layer) {
> > > reg |= (p_h264->hier_qp_type & 0x1) << 0x3;
> > > reg |= p_h264->hier_qp_layer & 0x7;
> > > - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
> > > /* QP value for each layer */
> > > - for (i = 0; i < (p_h264->hier_qp_layer & 0x7); i++)
> > > + for (i = 0; i < p_h264->hier_qp_layer &&
> > > + i < ARRAY_SIZE(p_h264-
> >hier_qp_layer_qp);
> > i++)
> > > {
> > > WRITEL(p_h264->hier_qp_layer_qp[i],
> > > -
> S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6 +
> > > - i * 4);
> > > + mfc_regs-
> >e_h264_hierarchical_qp_layer0
> > > + + i * 4);
> > > + }
> > > }
> > > /* number of coding layer should be zero when hierarchical is
> > > disable */
> > > - WRITEL(reg, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_num_t_layer);
> > >
> > > /* frame packing SEI generation */
> > > - reg = READL(S5P_FIMV_E_H264_OPTIONS_V6);
> > > + READL(mfc_regs->e_h264_options);
> > > reg &= ~(0x1 << 25);
> > > reg |= ((p_h264->sei_frame_packing & 0x1) << 25);
> > > - WRITEL(reg, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_options);
> > > if (p_h264->sei_frame_packing) {
> > > reg = 0;
> > > /** current frame0 flag */
> > > reg |= ((p_h264->sei_fp_curr_frame_0 & 0x1) << 2);
> > > /** arrangement type */
> > > reg |= p_h264->sei_fp_arrangement_type & 0x3;
> > > - WRITEL(reg,
> S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> > > + WRITEL(reg, mfc_regs->e_h264_frame_packing_sei_info);
> > > }
> > >
> > > if (p_h264->fmo) {
> > > @@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > case
> V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
> > > if (p_h264->fmo_slice_grp > 4)
> > > p_h264->fmo_slice_grp = 4;
> > > - for (i = 0; i < (p_h264->fmo_slice_grp & 0xF);
> i++)
> > > + for (i = 0; i < ARRAY_SIZE(p_h264-
> >fmo_run_len)
> > > + && i < p_h264->fmo_slice_grp;
> i++) {
> > > WRITEL(p_h264->fmo_run_len[i] - 1,
> > > -
> S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6 +
> > > - i * 4);
> > > +
> > mfc_regs->e_h264_fmo_run_length_minus1_0
> > > + + i * 4);
> > > + }
> > > break;
> > > case
> V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES:
> > > if (p_h264->fmo_slice_grp > 4)
> > > @@ -1002,10 +1007,10 @@ static int
> s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > if (p_h264->fmo_slice_grp > 2)
> > > p_h264->fmo_slice_grp = 2;
> > > WRITEL(p_h264->fmo_chg_dir & 0x1,
> > > -
> > S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> > > + mfc_regs-
> >e_h264_fmo_slice_grp_change_dir);
> > > /* the valid range is 0 ~ number of
> macroblocks -1
> > */
> > > WRITEL(p_h264->fmo_chg_rate,
> > > -
> > > S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> > > + mfc_regs-
> >e_h264_fmo_slice_grp_change_rate_minus1);
> > > break;
> > > default:
> > > mfc_err("Unsupported map type for FMO: %d\n",
> > > @@ -1016,11 +1021,11 @@ static int
> s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > }
> > >
> > > WRITEL(p_h264->fmo_map_type,
> > > -
> S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> > > + mfc_regs-
> >e_h264_fmo_slice_grp_map_type);
> > > WRITEL(p_h264->fmo_slice_grp - 1,
> > > -
> > S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> > > + mfc_regs-
> >e_h264_fmo_num_slice_grp_minus1);
> > > } else {
> > > - WRITEL(0,
> S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> > > + WRITEL(0, mfc_regs->e_h264_fmo_num_slice_grp_minus1);
> > > }
> > >
> > > mfc_debug_leave();
> > > @@ -1031,6 +1036,7 @@ static int s5p_mfc_set_enc_params_h264(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > > struct s5p_mfc_mpeg4_enc_params *p_mpeg4 = &p->codec.mpeg4;
> > > unsigned int reg = 0;
> > > @@ -1040,10 +1046,10 @@ static int
> s5p_mfc_set_enc_params_mpeg4(struct
> > > s5p_mfc_ctx *ctx)
> > > s5p_mfc_set_enc_params(ctx);
> > >
> > > /* pictype : number of B */
> > > - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_gop_config);
> > > reg &= ~(0x3 << 16);
> > > reg |= ((p->num_b_frame & 0x3) << 16);
> > > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_gop_config);
> > >
> > > /* profile & level */
> > > reg = 0;
> > > @@ -1051,18 +1057,19 @@ static int
> s5p_mfc_set_enc_params_mpeg4(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p_mpeg4->level & 0xFF) << 8);
> > > /** profile - 0 ~ 1 */
> > > reg |= p_mpeg4->profile & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > > + WRITEL(reg, mfc_regs->e_picture_profile);
> > >
> > > /* rate control config. */
> > > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_rc_config);
> > > /** macroblock level rate control */
> > > reg &= ~(0x1 << 8);
> > > reg |= ((p->rc_mb & 0x1) << 8);
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > > +
> > > /** frame QP */
> > > reg &= ~(0x3F);
> > > reg |= p_mpeg4->rc_frame_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* max & min value of QP */
> > > reg = 0;
> > > @@ -1070,16 +1077,16 @@ static int
> s5p_mfc_set_enc_params_mpeg4(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p_mpeg4->rc_max_qp & 0x3F) << 8);
> > > /** min QP */
> > > reg |= p_mpeg4->rc_min_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> > >
> > > /* other QPs */
> > > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > > if (!p->rc_frame && !p->rc_mb) {
> > > reg = 0;
> > > reg |= ((p_mpeg4->rc_b_frame_qp & 0x3F) << 16);
> > > reg |= ((p_mpeg4->rc_p_frame_qp & 0x3F) << 8);
> > > reg |= p_mpeg4->rc_frame_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > > }
> > >
> > > /* frame rate */
> > > @@ -1087,21 +1094,21 @@ static int
> s5p_mfc_set_enc_params_mpeg4(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0;
> > > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > > reg |= p->rc_framerate_denom & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > > }
> > >
> > > /* vbv buffer size */
> > > if (p->frame_skip_mode ==
> > >
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > > - WRITEL(p->vbv_size & 0xFFFF,
> S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > > + WRITEL(p->vbv_size & 0xFFFF, mfc_regs-
> >e_vbv_buffer_size);
> > >
> > > if (p->rc_frame)
> > > - WRITEL(p->vbv_delay,
> S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > > + WRITEL(p->vbv_delay, mfc_regs-
> >e_vbv_init_delay);
> > > }
> > >
> > > /* Disable HEC */
> > > - WRITEL(0x0, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> > > - WRITEL(0x0, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> > > + WRITEL(0x0, mfc_regs->e_mpeg4_options);
> > > + WRITEL(0x0, mfc_regs->e_mpeg4_hec_period);
> > >
> > > mfc_debug_leave();
> > >
> > > @@ -1111,6 +1118,7 @@ static int
> s5p_mfc_set_enc_params_mpeg4(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_set_enc_params_h263(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > > struct s5p_mfc_mpeg4_enc_params *p_h263 = &p->codec.mpeg4;
> > > unsigned int reg = 0;
> > > @@ -1123,18 +1131,19 @@ static int
> s5p_mfc_set_enc_params_h263(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0;
> > > /** profile */
> > > reg |= (0x1 << 4);
> > > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > > + WRITEL(reg, mfc_regs->e_picture_profile);
> > >
> > > /* rate control config. */
> > > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_rc_config);
> > > /** macroblock level rate control */
> > > reg &= ~(0x1 << 8);
> > > reg |= ((p->rc_mb & 0x1) << 8);
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > > +
> > > /** frame QP */
> > > reg &= ~(0x3F);
> > > reg |= p_h263->rc_frame_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* max & min value of QP */
> > > reg = 0;
> > > @@ -1142,16 +1151,16 @@ static int
> s5p_mfc_set_enc_params_h263(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= ((p_h263->rc_max_qp & 0x3F) << 8);
> > > /** min QP */
> > > reg |= p_h263->rc_min_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> > >
> > > /* other QPs */
> > > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > > if (!p->rc_frame && !p->rc_mb) {
> > > reg = 0;
> > > reg |= ((p_h263->rc_b_frame_qp & 0x3F) << 16);
> > > reg |= ((p_h263->rc_p_frame_qp & 0x3F) << 8);
> > > reg |= p_h263->rc_frame_qp & 0x3F;
> > > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > > }
> > >
> > > /* frame rate */
> > > @@ -1159,16 +1168,16 @@ static int
> s5p_mfc_set_enc_params_h263(struct
> > > s5p_mfc_ctx *ctx)
> > > reg = 0;
> > > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > > reg |= p->rc_framerate_denom & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > > }
> > >
> > > /* vbv buffer size */
> > > if (p->frame_skip_mode ==
> > >
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > > - WRITEL(p->vbv_size & 0xFFFF,
> S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > > + WRITEL(p->vbv_size & 0xFFFF, mfc_regs-
> >e_vbv_buffer_size);
> > >
> > > if (p->rc_frame)
> > > - WRITEL(p->vbv_delay,
> S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > > + WRITEL(p->vbv_delay, mfc_regs-
> >e_vbv_init_delay);
> > > }
> > >
> > > mfc_debug_leave();
> > > @@ -1179,6 +1188,7 @@ static int s5p_mfc_set_enc_params_h263(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > > struct s5p_mfc_vp8_enc_params *p_vp8 = &p->codec.vp8;
> > > unsigned int reg = 0;
> > > @@ -1189,57 +1199,57 @@ static int
> s5p_mfc_set_enc_params_vp8(struct
> > > s5p_mfc_ctx *ctx)
> > > s5p_mfc_set_enc_params(ctx);
> > >
> > > /* pictype : number of B */
> > > - reg = READL(S5P_FIMV_E_GOP_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_gop_config);
> > > reg &= ~(0x3 << 16);
> > > reg |= ((p->num_b_frame & 0x3) << 16);
> > > - WRITEL(reg, S5P_FIMV_E_GOP_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_gop_config);
> > >
> > > /* profile - 0 ~ 3 */
> > > reg = p_vp8->profile & 0x3;
> > > - WRITEL(reg, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > > + WRITEL(reg, mfc_regs->e_picture_profile);
> > >
> > > /* rate control config. */
> > > - reg = READL(S5P_FIMV_E_RC_CONFIG_V6);
> > > + reg = READL(mfc_regs->e_rc_config);
> > > /** macroblock level rate control */
> > > reg &= ~(0x1 << 8);
> > > reg |= ((p->rc_mb & 0x1) << 8);
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* frame rate */
> > > if (p->rc_frame && p->rc_framerate_num && p-
> >rc_framerate_denom)
> > > {
> > > reg = 0;
> > > reg |= ((p->rc_framerate_num & 0xFFFF) << 16);
> > > reg |= p->rc_framerate_denom & 0xFFFF;
> > > - WRITEL(reg, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_frame_rate);
> > > }
> > >
> > > /* frame QP */
> > > reg &= ~(0x7F);
> > > reg |= p_vp8->rc_frame_qp & 0x7F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_config);
> > >
> > > /* other QPs */
> > > - WRITEL(0x0, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(0x0, mfc_regs->e_fixed_picture_qp);
> > > if (!p->rc_frame && !p->rc_mb) {
> > > reg = 0;
> > > reg |= ((p_vp8->rc_p_frame_qp & 0x7F) << 8);
> > > reg |= p_vp8->rc_frame_qp & 0x7F;
> > > - WRITEL(reg, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + WRITEL(reg, mfc_regs->e_fixed_picture_qp);
> > > }
> > >
> > > /* max QP */
> > > reg = ((p_vp8->rc_max_qp & 0x7F) << 8);
> > > /* min QP */
> > > reg |= p_vp8->rc_min_qp & 0x7F;
> > > - WRITEL(reg, S5P_FIMV_E_RC_QP_BOUND_V6);
> > > + WRITEL(reg, mfc_regs->e_rc_qp_bound);
> > >
> > > /* vbv buffer size */
> > > if (p->frame_skip_mode ==
> > >
> V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT) {
> > > - WRITEL(p->vbv_size & 0xFFFF,
> S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > > + WRITEL(p->vbv_size & 0xFFFF, mfc_regs-
> >e_vbv_buffer_size);
> > >
> > > if (p->rc_frame)
> > > - WRITEL(p->vbv_delay,
> S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > > + WRITEL(p->vbv_delay, mfc_regs-
> >e_vbv_init_delay);
> > > }
> > >
> > > /* VP8 specific params */
> > > @@ -1263,7 +1273,7 @@ static int s5p_mfc_set_enc_params_vp8(struct
> > > s5p_mfc_ctx *ctx)
> > > }
> > > reg |= (val & 0xF) << 3;
> > > reg |= (p_vp8->num_ref & 0x2);
> > > - WRITEL(reg, S5P_FIMV_E_VP8_OPTIONS_V7);
> > > + WRITEL(reg, mfc_regs->e_vp8_options);
> > >
> > > mfc_debug_leave();
> > >
> > > @@ -1297,6 +1307,7 @@ static bool s5p_mfc_is_v6_new(struct
> s5p_mfc_dev
> > > *dev)
> > > static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > unsigned int reg = 0;
> > > int fmo_aso_ctrl = 0;
> > >
> > > @@ -1304,9 +1315,9 @@ static int s5p_mfc_init_decode_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > mfc_debug(2, "InstNo: %d/%d\n", ctx->inst_no,
> > > S5P_FIMV_CH_SEQ_HEADER_V6);
> > > mfc_debug(2, "BUFs: %08x %08x %08x\n",
> > > - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> > > - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6),
> > > - READL(S5P_FIMV_D_CPB_BUFFER_ADDR_V6));
> > > + READL(mfc_regs->d_cpb_buffer_addr),
> > > + READL(mfc_regs->d_cpb_buffer_addr),
> > > + READL(mfc_regs->d_cpb_buffer_addr));
> > >
> > > /* FMO_ASO_CTRL - 0: Enable, 1: Disable */
> > > reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6);
> > > @@ -1317,11 +1328,11 @@ static int s5p_mfc_init_decode_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > * set to negative value. */
> > > if (ctx->display_delay >= 0) {
> > > reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6);
> > > - WRITEL(ctx->display_delay,
> S5P_FIMV_D_DISPLAY_DELAY_V6);
> > > + WRITEL(ctx->display_delay, mfc_regs->d_display_delay);
> > > }
> > >
> > > if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev)) {
> > > - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->d_dec_options);
> > > reg = 0;
> > > }
> > >
> > > @@ -1336,21 +1347,21 @@ static int s5p_mfc_init_decode_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
> > >
> > > if (IS_MFCV7(dev) || s5p_mfc_is_v6_new(dev))
> > > - WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->d_init_buffer_options);
> > > else
> > > - WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
> > > + WRITEL(reg, mfc_regs->d_dec_options);
> > >
> > > /* 0: NV12(CbCr), 1: NV21(CrCb) */
> > > if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV21M)
> > > - WRITEL(0x1, S5P_FIMV_PIXEL_FORMAT_V6);
> > > + WRITEL(0x1, mfc_regs->pixel_format);
> > > else
> > > - WRITEL(0x0, S5P_FIMV_PIXEL_FORMAT_V6);
> > > + WRITEL(0x0, mfc_regs->pixel_format);
> > >
> > >
> > > /* sei parse */
> > > - WRITEL(ctx->sei_fp_parse & 0x1, S5P_FIMV_D_SEI_ENABLE_V6);
> > > + WRITEL(ctx->sei_fp_parse & 0x1, mfc_regs->d_sei_enable);
> > >
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > > S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
> > >
> > > @@ -1361,11 +1372,12 @@ static int s5p_mfc_init_decode_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int
> > > flush)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > if (flush) {
> > > dev->curr_ctx = ctx->num;
> > > s5p_mfc_clean_ctx_int_flags(ctx);
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > > S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
> > > }
> > > @@ -1376,11 +1388,12 @@ static int
> s5p_mfc_decode_one_frame_v6(struct
> > > s5p_mfc_ctx *ctx,
> > > enum s5p_mfc_decode_arg last_frame)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > - WRITEL(ctx->dec_dst_flag,
> S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> > > - WRITEL(ctx->slice_interface & 0x1,
> S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> > > + WRITEL(ctx->dec_dst_flag, mfc_regs-
> >d_available_dpb_flag_lower);
> > > + WRITEL(ctx->slice_interface & 0x1, mfc_regs-
> >d_slice_if_enable);
> > >
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > /* Issue different commands to instance basing on whether it
> > > * is the last frame or not. */
> > > switch (last_frame) {
> > > @@ -1404,6 +1417,7 @@ static int s5p_mfc_decode_one_frame_v6(struct
> > > s5p_mfc_ctx *ctx,
> > > static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > if (ctx->codec_mode == S5P_MFC_CODEC_H264_ENC)
> > > s5p_mfc_set_enc_params_h264(ctx);
> > > @@ -1419,13 +1433,13 @@ static int s5p_mfc_init_encode_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > return -EINVAL;
> > > }
> > >
> > > - /* Set stride lengths */
> > > + /* Set stride lengths for v7 & above */
> > > if (IS_MFCV7(dev)) {
> > > - WRITEL(ctx->img_width,
> S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> > > - WRITEL(ctx->img_width,
> S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> > > + WRITEL(ctx->img_width, mfc_regs-
> > > >e_source_first_plane_stride);
> > > + WRITEL(ctx->img_width, mfc_regs-
> > > >e_source_second_plane_stride);
> > > }
> > >
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > > S5P_FIMV_CH_SEQ_HEADER_V6, NULL);
> > >
> > > @@ -1435,14 +1449,16 @@ static int s5p_mfc_init_encode_v6(struct
> > > s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx
> *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > struct s5p_mfc_enc_params *p = &ctx->enc_params;
> > > struct s5p_mfc_h264_enc_params *p_h264 = &p->codec.h264;
> > > int i;
> > >
> > > if (p_h264->aso) {
> > > - for (i = 0; i < 8; i++)
> > > + for (i = 0; i < ARRAY_SIZE(p_h264->aso_slice_order);
> i++) {
> > > WRITEL(p_h264->aso_slice_order[i],
> > > - S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6
> + i *
> > 4);
> > > + mfc_regs->e_h264_aso_slice_order_0 +
> i * 4);
> > > + }
> > > }
> > > return 0;
> > > }
> > > @@ -1451,6 +1467,7 @@ static int
> > > s5p_mfc_h264_set_aso_slice_order_v6(struct s5p_mfc_ctx *ctx)
> > > static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx)
> > > {
> > > struct s5p_mfc_dev *dev = ctx->dev;
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > >
> > > mfc_debug(2, "++\n");
> > >
> > > @@ -1461,7 +1478,7 @@ static int s5p_mfc_encode_one_frame_v6(struct
> > > s5p_mfc_ctx *ctx)
> > >
> > > s5p_mfc_set_slice_mode(ctx);
> > >
> > > - WRITEL(ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6);
> > > + WRITEL(ctx->inst_no, mfc_regs->instance_id);
> > > s5p_mfc_hw_call(dev->mfc_cmds, cmd_host2risc, dev,
> > > S5P_FIMV_CH_FRAME_START_V6, NULL);
> > >
> > > @@ -1836,28 +1853,26 @@ static void s5p_mfc_cleanup_queue_v6(struct
> > > list_head *lh, struct vb2_queue *vq)
> > >
> > > static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
> > > - mfc_write(dev, 0, S5P_FIMV_RISC2HOST_INT_V6);
> > > + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> > > + WRITEL(0, mfc_regs->risc2host_command);
> > > + WRITEL(0, mfc_regs->risc2host_int);
> > > }
> > >
> > > static void s5p_mfc_write_info_v6(struct s5p_mfc_ctx *ctx,
> unsigned
> > > int data,
> > > unsigned int ofs)
> > > {
> > > - struct s5p_mfc_dev *dev = ctx->dev;
> > > -
> > > s5p_mfc_clock_on();
> > > - WRITEL(data, ofs);
> > > + WRITEL(data, (void *)ofs);
> > > s5p_mfc_clock_off();
> > > }
> > >
> > > static unsigned int
> > > s5p_mfc_read_info_v6(struct s5p_mfc_ctx *ctx, unsigned int ofs)
> > > {
> > > - struct s5p_mfc_dev *dev = ctx->dev;
> > > int ret;
> > >
> > > s5p_mfc_clock_on();
> > > - ret = READL(ofs);
> > > + ret = READL((void *)ofs);
> > > s5p_mfc_clock_off();
> > >
> > > return ret;
> > > @@ -1865,50 +1880,51 @@ s5p_mfc_read_info_v6(struct s5p_mfc_ctx
> *ctx,
> > > unsigned int ofs)
> > >
> > > static int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> > > + return READL(dev->mfc_regs->d_display_first_plane_addr);
> > > }
> > >
> > > static int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> > > + return READL(dev->mfc_regs->d_decoded_first_plane_addr);
> > > }
> > >
> > > static int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_STATUS_V6);
> > > + return READL(dev->mfc_regs->d_display_status);
> > > }
> > >
> > > static int s5p_mfc_get_dec_status_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DECODED_STATUS_V6);
> > > + return READL(dev->mfc_regs->d_decoded_status);
> > > }
> > >
> > > static int s5p_mfc_get_dec_frame_type_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DECODED_FRAME_TYPE_V6) &
> > > + return READL(dev->mfc_regs->d_decoded_frame_type) &
> > > S5P_FIMV_DECODE_FRAME_MASK_V6;
> > > }
> > >
> > > static int s5p_mfc_get_disp_frame_type_v6(struct s5p_mfc_ctx *ctx)
> > > {
> > > - return mfc_read(ctx->dev, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6) &
> > > + struct s5p_mfc_dev *dev = ctx->dev;
> > > + return READL(dev->mfc_regs->d_display_frame_type) &
> > > S5P_FIMV_DECODE_FRAME_MASK_V6;
> > > }
> > >
> > > static int s5p_mfc_get_consumed_stream_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> > > + return READL(dev->mfc_regs->d_decoded_nal_size);
> > > }
> > >
> > > static int s5p_mfc_get_int_reason_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_RISC2HOST_CMD_V6) &
> > > + return READL(dev->mfc_regs->risc2host_command) &
> > > S5P_FIMV_RISC2HOST_CMD_MASK;
> > > }
> > >
> > > static int s5p_mfc_get_int_err_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_ERROR_CODE_V6);
> > > + return READL(dev->mfc_regs->error_code);
> > > }
> > >
> > > static int s5p_mfc_err_dec_v6(unsigned int err)
> > > @@ -1923,82 +1939,263 @@ static int s5p_mfc_err_dspl_v6(unsigned
> int
> > > err)
> > >
> > > static int s5p_mfc_get_img_width_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> > > + return READL(dev->mfc_regs->d_display_frame_width);
> > > }
> > >
> > > static int s5p_mfc_get_img_height_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> > > + return READL(dev->mfc_regs->d_display_frame_height);
> > > }
> > >
> > > static int s5p_mfc_get_dpb_count_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_DPB_V6);
> > > + return READL(dev->mfc_regs->d_min_num_dpb);
> > > }
> > >
> > > static int s5p_mfc_get_mv_count_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_MIN_NUM_MV_V6);
> > > + return READL(dev->mfc_regs->d_min_num_mv);
> > > }
> > >
> > > static int s5p_mfc_get_inst_no_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_RET_INSTANCE_ID_V6);
> > > + return READL(dev->mfc_regs->ret_instance_id);
> > > }
> > >
> > > static int s5p_mfc_get_enc_dpb_count_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_E_NUM_DPB_V6);
> > > + return READL(dev->mfc_regs->e_num_dpb);
> > > }
> > >
> > > static int s5p_mfc_get_enc_strm_size_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_E_STREAM_SIZE_V6);
> > > + return READL(dev->mfc_regs->e_stream_size);
> > > }
> > >
> > > static int s5p_mfc_get_enc_slice_type_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_E_SLICE_TYPE_V6);
> > > + return READL(dev->mfc_regs->e_slice_type);
> > > }
> > >
> > > static int s5p_mfc_get_enc_pic_count_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_E_PICTURE_COUNT_V6);
> > > + return READL(dev->mfc_regs->e_picture_count);
> > > }
> > >
> > > static int s5p_mfc_get_sei_avail_status_v6(struct s5p_mfc_ctx *ctx)
> > > {
> > > - return mfc_read(ctx->dev, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> > > + struct s5p_mfc_dev *dev = ctx->dev;
> > > + return READL(dev->mfc_regs->d_frame_pack_sei_avail);
> > > }
> > >
> > > static int s5p_mfc_get_mvc_num_views_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> > > + return READL(dev->mfc_regs->d_mvc_num_views);
> > > }
> > >
> > > static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
> > > {
> > > - return mfc_read(dev, S5P_FIMV_D_MVC_VIEW_ID_V6);
> > > + return READL(dev->mfc_regs->d_mvc_view_id);
> > > }
> > >
> > > static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx
> > > *ctx)
> > > {
> > > - return s5p_mfc_read_info_v6(ctx, PIC_TIME_TOP_V6);
> > > + return s5p_mfc_read_info_v6(ctx,
> > > + (unsigned int) ctx->dev->mfc_regs-
> >d_ret_picture_tag_top);
> > > }
> > >
> > > static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx
> > > *ctx)
> > > {
> > > - return s5p_mfc_read_info_v6(ctx, PIC_TIME_BOT_V6);
> > > + return s5p_mfc_read_info_v6(ctx,
> > > + (unsigned int) ctx->dev->mfc_regs-
> >d_ret_picture_tag_bot);
> > > }
> > >
> > > static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx
> *ctx)
> > > {
> > > - return s5p_mfc_read_info_v6(ctx, CROP_INFO_H_V6);
> > > + return s5p_mfc_read_info_v6(ctx,
> > > + (unsigned int) ctx->dev->mfc_regs-
> >d_display_crop_info1);
> > > }
> > >
> > > static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx
> *ctx)
> > > {
> > > - return s5p_mfc_read_info_v6(ctx, CROP_INFO_V_V6);
> > > + return s5p_mfc_read_info_v6(ctx,
> > > + (unsigned int) ctx->dev->mfc_regs-
> >d_display_crop_info2);
> > > +}
> > > +
> > > +static struct s5p_mfc_regs mfc_regs;
> > > +
> > > +/* Initialize registers for MFC v6 onwards */
> > > +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> > > s5p_mfc_dev *dev)
> > > +{
> > > + memset(&mfc_regs, 0, sizeof(mfc_regs));
> > > +
> > > +#define S5P_MFC_REG_ADDR(dev, reg) ((dev)->regs_base + (reg))
> > > +#define R(m, r) mfc_regs.m = S5P_MFC_REG_ADDR(dev, r)
> > > + /* codec common registers */
> > > + R(risc_on, S5P_FIMV_RISC_ON_V6);
> > > + R(risc2host_int, S5P_FIMV_RISC2HOST_INT_V6);
> > > + R(host2risc_int, S5P_FIMV_HOST2RISC_INT_V6);
> > > + R(risc_base_address, S5P_FIMV_RISC_BASE_ADDRESS_V6);
> > > + R(mfc_reset, S5P_FIMV_MFC_RESET_V6);
> > > + R(host2risc_command, S5P_FIMV_HOST2RISC_CMD_V6);
> > > + R(risc2host_command, S5P_FIMV_RISC2HOST_CMD_V6);
> > > + R(firmware_version, S5P_FIMV_FW_VERSION_V6);
> > > + R(instance_id, S5P_FIMV_INSTANCE_ID_V6);
> > > + R(codec_type, S5P_FIMV_CODEC_TYPE_V6);
> > > + R(context_mem_addr, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
> > > + R(context_mem_size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
> > > + R(pixel_format, S5P_FIMV_PIXEL_FORMAT_V6);
> > > + R(ret_instance_id, S5P_FIMV_RET_INSTANCE_ID_V6);
> > > + R(error_code, S5P_FIMV_ERROR_CODE_V6);
> > > +
> > > + /* decoder registers */
> > > + R(d_crc_ctrl, S5P_FIMV_D_CRC_CTRL_V6);
> > > + R(d_dec_options, S5P_FIMV_D_DEC_OPTIONS_V6);
> > > + R(d_display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6);
> > > + R(d_sei_enable, S5P_FIMV_D_SEI_ENABLE_V6);
> > > + R(d_min_num_dpb, S5P_FIMV_D_MIN_NUM_DPB_V6);
> > > + R(d_min_num_mv, S5P_FIMV_D_MIN_NUM_MV_V6);
> > > + R(d_mvc_num_views, S5P_FIMV_D_MVC_NUM_VIEWS_V6);
> > > + R(d_num_dpb, S5P_FIMV_D_NUM_DPB_V6);
> > > + R(d_num_mv, S5P_FIMV_D_NUM_MV_V6);
> > > + R(d_init_buffer_options, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
> > > + R(d_first_plane_dpb_size, S5P_FIMV_D_LUMA_DPB_SIZE_V6);
> > > + R(d_second_plane_dpb_size, S5P_FIMV_D_CHROMA_DPB_SIZE_V6);
> > > + R(d_mv_buffer_size, S5P_FIMV_D_MV_BUFFER_SIZE_V6);
> > > + R(d_first_plane_dpb, S5P_FIMV_D_LUMA_DPB_V6);
> > > + R(d_second_plane_dpb, S5P_FIMV_D_CHROMA_DPB_V6);
> > > + R(d_mv_buffer, S5P_FIMV_D_MV_BUFFER_V6);
> > > + R(d_scratch_buffer_addr, S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V6);
> > > + R(d_scratch_buffer_size, S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V6);
> > > + R(d_cpb_buffer_addr, S5P_FIMV_D_CPB_BUFFER_ADDR_V6);
> > > + R(d_cpb_buffer_size, S5P_FIMV_D_CPB_BUFFER_SIZE_V6);
> > > + R(d_available_dpb_flag_lower,
> > > S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V6);
> > > + R(d_cpb_buffer_offset, S5P_FIMV_D_CPB_BUFFER_OFFSET_V6);
> > > + R(d_slice_if_enable, S5P_FIMV_D_SLICE_IF_ENABLE_V6);
> > > + R(d_stream_data_size, S5P_FIMV_D_STREAM_DATA_SIZE_V6);
> > > + R(d_display_frame_width, S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6);
> > > + R(d_display_frame_height, S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V6);
> > > + R(d_display_status, S5P_FIMV_D_DISPLAY_STATUS_V6);
> > > + R(d_display_first_plane_addr,
> S5P_FIMV_D_DISPLAY_LUMA_ADDR_V6);
> > > + R(d_display_second_plane_addr,
> S5P_FIMV_D_DISPLAY_CHROMA_ADDR_V6);
> > > + R(d_display_frame_type, S5P_FIMV_D_DISPLAY_FRAME_TYPE_V6);
> > > + R(d_display_crop_info1, S5P_FIMV_D_DISPLAY_CROP_INFO1_V6);
> > > + R(d_display_crop_info2, S5P_FIMV_D_DISPLAY_CROP_INFO2_V6);
> > > + R(d_display_aspect_ratio, S5P_FIMV_D_DISPLAY_ASPECT_RATIO_V6);
> > > + R(d_display_extended_ar, S5P_FIMV_D_DISPLAY_EXTENDED_AR_V6);
> > > + R(d_decoded_status, S5P_FIMV_D_DECODED_STATUS_V6);
> > > + R(d_decoded_first_plane_addr,
> S5P_FIMV_D_DECODED_LUMA_ADDR_V6);
> > > + R(d_decoded_second_plane_addr,
> S5P_FIMV_D_DECODED_CHROMA_ADDR_V6);
> > > + R(d_decoded_frame_type, S5P_FIMV_D_DECODED_FRAME_TYPE_V6);
> > > + R(d_decoded_nal_size, S5P_FIMV_D_DECODED_NAL_SIZE_V6);
> > > + R(d_ret_picture_tag_top, S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6);
> > > + R(d_ret_picture_tag_bot, S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6);
> > > + R(d_h264_info, S5P_FIMV_D_H264_INFO_V6);
> > > + R(d_mvc_view_id, S5P_FIMV_D_MVC_VIEW_ID_V6);
> > > + R(d_frame_pack_sei_avail, S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V6);
> > > +
> > > + /* encoder registers */
> > > + R(e_frame_width, S5P_FIMV_E_FRAME_WIDTH_V6);
> > > + R(e_frame_height, S5P_FIMV_E_FRAME_HEIGHT_V6);
> > > + R(e_cropped_frame_width, S5P_FIMV_E_CROPPED_FRAME_WIDTH_V6);
> > > + R(e_cropped_frame_height, S5P_FIMV_E_CROPPED_FRAME_HEIGHT_V6);
> > > + R(e_frame_crop_offset, S5P_FIMV_E_FRAME_CROP_OFFSET_V6);
> > > + R(e_enc_options, S5P_FIMV_E_ENC_OPTIONS_V6);
> > > + R(e_picture_profile, S5P_FIMV_E_PICTURE_PROFILE_V6);
> > > + R(e_vbv_buffer_size, S5P_FIMV_E_VBV_BUFFER_SIZE_V6);
> > > + R(e_vbv_init_delay, S5P_FIMV_E_VBV_INIT_DELAY_V6);
> > > + R(e_fixed_picture_qp, S5P_FIMV_E_FIXED_PICTURE_QP_V6);
> > > + R(e_rc_config, S5P_FIMV_E_RC_CONFIG_V6);
> > > + R(e_rc_qp_bound, S5P_FIMV_E_RC_QP_BOUND_V6);
> > > + R(e_rc_mode, S5P_FIMV_E_RC_RPARAM_V6);
> > > + R(e_mb_rc_config, S5P_FIMV_E_MB_RC_CONFIG_V6);
> > > + R(e_padding_ctrl, S5P_FIMV_E_PADDING_CTRL_V6);
> > > + R(e_mv_hor_range, S5P_FIMV_E_MV_HOR_RANGE_V6);
> > > + R(e_mv_ver_range, S5P_FIMV_E_MV_VER_RANGE_V6);
> > > + R(e_num_dpb, S5P_FIMV_E_NUM_DPB_V6);
> > > + R(e_luma_dpb, S5P_FIMV_E_LUMA_DPB_V6);
> > > + R(e_chroma_dpb, S5P_FIMV_E_CHROMA_DPB_V6);
> > > + R(e_me_buffer, S5P_FIMV_E_ME_BUFFER_V6);
> > > + R(e_scratch_buffer_addr, S5P_FIMV_E_SCRATCH_BUFFER_ADDR_V6);
> > > + R(e_scratch_buffer_size, S5P_FIMV_E_SCRATCH_BUFFER_SIZE_V6);
> > > + R(e_tmv_buffer0, S5P_FIMV_E_TMV_BUFFER0_V6);
> > > + R(e_tmv_buffer1, S5P_FIMV_E_TMV_BUFFER1_V6);
> > > + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6);
> > > + R(e_source_second_plane_addr,
> S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);
> > > + R(e_stream_buffer_addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6);
> > > + R(e_stream_buffer_size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);
> > > + R(e_roi_buffer_addr, S5P_FIMV_E_ROI_BUFFER_ADDR_V6);
> > > + R(e_param_change, S5P_FIMV_E_PARAM_CHANGE_V6);
> > > + R(e_ir_size, S5P_FIMV_E_IR_SIZE_V6);
> > > + R(e_gop_config, S5P_FIMV_E_GOP_CONFIG_V6);
> > > + R(e_mslice_mode, S5P_FIMV_E_MSLICE_MODE_V6);
> > > + R(e_mslice_size_mb, S5P_FIMV_E_MSLICE_SIZE_MB_V6);
> > > + R(e_mslice_size_bits, S5P_FIMV_E_MSLICE_SIZE_BITS_V6);
> > > + R(e_frame_insertion, S5P_FIMV_E_FRAME_INSERTION_V6);
> > > + R(e_rc_frame_rate, S5P_FIMV_E_RC_FRAME_RATE_V6);
> > > + R(e_rc_bit_rate, S5P_FIMV_E_RC_BIT_RATE_V6);
> > > + R(e_rc_roi_ctrl, S5P_FIMV_E_RC_ROI_CTRL_V6);
> > > + R(e_picture_tag, S5P_FIMV_E_PICTURE_TAG_V6);
> > > + R(e_bit_count_enable, S5P_FIMV_E_BIT_COUNT_ENABLE_V6);
> > > + R(e_max_bit_count, S5P_FIMV_E_MAX_BIT_COUNT_V6);
> > > + R(e_min_bit_count, S5P_FIMV_E_MIN_BIT_COUNT_V6);
> > > + R(e_metadata_buffer_addr, S5P_FIMV_E_METADATA_BUFFER_ADDR_V6);
> > > + R(e_metadata_buffer_size, S5P_FIMV_E_METADATA_BUFFER_SIZE_V6);
> > > + R(e_encoded_source_first_plane_addr,
> > > + S5P_FIMV_E_ENCODED_SOURCE_LUMA_ADDR_V6);
> > > + R(e_encoded_source_second_plane_addr,
> > > + S5P_FIMV_E_ENCODED_SOURCE_CHROMA_ADDR_V6);
> > > + R(e_stream_size, S5P_FIMV_E_STREAM_SIZE_V6);
> > > + R(e_slice_type, S5P_FIMV_E_SLICE_TYPE_V6);
> > > + R(e_picture_count, S5P_FIMV_E_PICTURE_COUNT_V6);
> > > + R(e_ret_picture_tag, S5P_FIMV_E_RET_PICTURE_TAG_V6);
> > > + R(e_recon_luma_dpb_addr, S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);
> > > + R(e_recon_chroma_dpb_addr,
> S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);
> > > + R(e_mpeg4_options, S5P_FIMV_E_MPEG4_OPTIONS_V6);
> > > + R(e_mpeg4_hec_period, S5P_FIMV_E_MPEG4_HEC_PERIOD_V6);
> > > + R(e_aspect_ratio, S5P_FIMV_E_ASPECT_RATIO_V6);
> > > + R(e_extended_sar, S5P_FIMV_E_EXTENDED_SAR_V6);
> > > + R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V6);
> > > + R(e_h264_lf_alpha_offset, S5P_FIMV_E_H264_LF_ALPHA_OFFSET_V6);
> > > + R(e_h264_lf_beta_offset, S5P_FIMV_E_H264_LF_BETA_OFFSET_V6);
> > > + R(e_h264_i_period, S5P_FIMV_E_H264_I_PERIOD_V6);
> > > + R(e_h264_fmo_slice_grp_map_type,
> > > + S5P_FIMV_E_H264_FMO_SLICE_GRP_MAP_TYPE_V6);
> > > + R(e_h264_fmo_num_slice_grp_minus1,
> > > + S5P_FIMV_E_H264_FMO_NUM_SLICE_GRP_MINUS1_V6);
> > > + R(e_h264_fmo_slice_grp_change_dir,
> > > + S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_DIR_V6);
> > > + R(e_h264_fmo_slice_grp_change_rate_minus1,
> > > +
> > S5P_FIMV_E_H264_FMO_SLICE_GRP_CHANGE_RATE_MINUS1_V6);
> > > + R(e_h264_fmo_run_length_minus1_0,
> > > + S5P_FIMV_E_H264_FMO_RUN_LENGTH_MINUS1_0_V6);
> > > + R(e_h264_aso_slice_order_0,
> S5P_FIMV_E_H264_ASO_SLICE_ORDER_0_V6);
> > > + R(e_h264_num_t_layer, S5P_FIMV_E_H264_NUM_T_LAYER_V6);
> > > + R(e_h264_hierarchical_qp_layer0,
> > > + S5P_FIMV_E_H264_HIERARCHICAL_QP_LAYER0_V6);
> > > + R(e_h264_frame_packing_sei_info,
> > > + S5P_FIMV_E_H264_FRAME_PACKING_SEI_INFO_V6);
> > > +
> > > + if (!IS_MFCV7(dev))
> > > + goto done;
> > > +
> > > + /* Initialize registers used in MFC v7 */
> > > + R(e_source_first_plane_addr, S5P_FIMV_E_SOURCE_FIRST_ADDR_V7);
> > > + R(e_source_second_plane_addr,
> S5P_FIMV_E_SOURCE_SECOND_ADDR_V7);
> > > + R(e_source_third_plane_addr, S5P_FIMV_E_SOURCE_THIRD_ADDR_V7);
> > > + R(e_source_first_plane_stride,
> S5P_FIMV_E_SOURCE_FIRST_STRIDE_V7);
> > > + R(e_source_second_plane_stride,
> > > S5P_FIMV_E_SOURCE_SECOND_STRIDE_V7);
> > > + R(e_source_third_plane_stride,
> S5P_FIMV_E_SOURCE_THIRD_STRIDE_V7);
> > > + R(e_encoded_source_first_plane_addr,
> > > + S5P_FIMV_E_ENCODED_SOURCE_FIRST_ADDR_V7);
> > > + R(e_encoded_source_second_plane_addr,
> > > + S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> > > + R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
> > > +
> > > +done:
> > > + return &mfc_regs;
> > > +#undef S5P_MFC_REG_ADDR
> > > +#undef R
> > > }
> > >
> > > /* Initialize opr function pointers for MFC v6 */
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > > b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > > index ab164ef..8055848 100644
> > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> > > @@ -40,11 +40,6 @@
> > > #define FRAME_DELTA_H264_H263 1
> > > #define TIGHT_CBR_MAX 10
> > >
> > > -/* Definitions for shared memory compatibility */
> > > -#define PIC_TIME_TOP_V6
> S5P_FIMV_D_RET_PICTURE_TAG_TOP_V6
> > > -#define PIC_TIME_BOT_V6
> S5P_FIMV_D_RET_PICTURE_TAG_BOT_V6
> > > -#define CROP_INFO_H_V6
> S5P_FIMV_D_DISPLAY_CROP_INFO1_V6
> > > -#define CROP_INFO_V_V6
> S5P_FIMV_D_DISPLAY_CROP_INFO2_V6
> > > -
> > > struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
> > > +const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct
> > > s5p_mfc_dev *dev);
> > > #endif /* S5P_MFC_OPR_V6_H_ */
> > > --
> > > 1.7.9.5
> >
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers
2014-05-13 10:32 ` Kamil Debski
@ 2014-05-13 11:24 ` Arun Kumar K
0 siblings, 0 replies; 16+ messages in thread
From: Arun Kumar K @ 2014-05-13 11:24 UTC (permalink / raw)
To: Kamil Debski, linux-media, linux-samsung-soc
Cc: Sylwester Nawrocki, posciak, avnd.kiran, arunkk.samsung
Hi Kamil,
On 05/13/14 16:02, Kamil Debski wrote:
> Hi,
>
> One small comment below,
>
>> -----Original Message-----
>> From: Arun Kumar K [mailto:arunkk.samsung@gmail.com] On Behalf Of Arun
>> Kumar K
>> Sent: Wednesday, April 23, 2014 2:58 PM
>> To: linux-media@vger.kernel.org; linux-samsung-soc@vger.kernel.org
>> Cc: k.debski@samsung.com; s.nawrocki@samsung.com; posciak@chromium.org;
>> avnd.kiran@samsung.com; arunkk.samsung@gmail.com
>> Subject: [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc
>> registers
>>
>> From: Kiran AVND <avnd.kiran@samsung.com>
>>
>> This patch is needed in preparation to add MFC V8
>> where the register offsets are changed w.r.t MFC V6/V7.
>>
>> This patch adds variants of MFC V6 and V7 while
>> accessing MFC registers. Registers are kept in mfc context
>> and are initialized to a particular MFC variant during probe,
>> which is used instead of macros.
>>
>> This avoids duplication of the code for MFC variants
>> V6 & V7, and reduces the if_else checks while accessing
>> registers of different MFC variants.
>>
>> Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
>> Signed-off-by: Pawel Osciak <posciak@chromium.org>
>> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
>> ---
>> drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
>> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
>> drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
>> drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 +++++++++
>> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 697
>> +++++++++++++++--------
>> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
>> 6 files changed, 710 insertions(+), 256 deletions(-)
>>
[snip]
>> if (p_h264->fmo) {
>> @@ -988,10 +991,12 @@ static int s5p_mfc_set_enc_params_h264(struct
>> s5p_mfc_ctx *ctx)
>> case V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES:
>> if (p_h264->fmo_slice_grp > 4)
>> p_h264->fmo_slice_grp = 4;
>> - for (i = 0; i < (p_h264->fmo_slice_grp & 0xF); i++)
>> + for (i = 0; i < ARRAY_SIZE(p_h264->fmo_run_len)
>> + && i < p_h264->fmo_slice_grp; i++) {
>
> What do you think about moving this to separate path? This seems
> like it slipped with the register patches.
>
Sure I will remove this change from this patch. Thanks for spotting this.
Regards
Arun
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-05-13 11:24 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-23 12:57 [PATCH 0/3] Add MFCv8 support Arun Kumar K
2014-04-23 12:57 ` [PATCH 1/3] [media] s5p-mfc: Add variants to access mfc registers Arun Kumar K
2014-05-08 16:31 ` Kamil Debski
2014-05-09 1:00 ` Pawel Osciak
2014-05-09 4:49 ` Arun Kumar K
2014-05-09 5:20 ` Tomasz Figa
2014-05-09 5:31 ` Arun Kumar K
2014-05-13 10:33 ` Kamil Debski
2014-05-13 10:32 ` Kamil Debski
2014-05-13 11:24 ` Arun Kumar K
2014-04-23 12:57 ` [PATCH 2/3] [media] s5p-mfc: Core support to add v8 decoder Arun Kumar K
2014-04-29 17:15 ` Sachin Kamat
2014-04-30 5:45 ` Arun Kumar K
2014-04-30 5:49 ` Sachin Kamat
2014-04-30 5:52 ` Arun Kumar K
2014-04-23 12:57 ` [PATCH 3/3] [media] s5p-mfc: Rename IS_MFCV7 macro Arun Kumar K
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).