Hi Yunfei,
On 5/12/22 04:19, Yunfei Dong wrote:
Mt8192 can use some of common code with mt8183. Moves them to a new file in order to reuse.
Signed-off-by: Yunfei Dong yunfei.dong@mediatek.com Reviewed-by: Nicolas Dufresne nicolas.dufresne@collabora.com
.../media/platform/mediatek/vcodec/Makefile | 1 + .../vcodec/vdec/vdec_h264_req_common.c | 310 +++++++++++++ .../vcodec/vdec/vdec_h264_req_common.h | 274 +++++++++++ .../mediatek/vcodec/vdec/vdec_h264_req_if.c | 427 ++---------------- 4 files changed, 629 insertions(+), 383 deletions(-) create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.c create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.h
diff --git a/drivers/media/platform/mediatek/vcodec/Makefile b/drivers/media/platform/mediatek/vcodec/Makefile index 359619653a0e..3f41d748eee5 100644 --- a/drivers/media/platform/mediatek/vcodec/Makefile +++ b/drivers/media/platform/mediatek/vcodec/Makefile @@ -9,6 +9,7 @@ mtk-vcodec-dec-y := vdec/vdec_h264_if.o \ vdec/vdec_vp8_if.o \ vdec/vdec_vp9_if.o \ vdec/vdec_h264_req_if.o \
vdec/vdec_h264_req_common.o \diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.c new file mode 100644 index 000000000000..4e7c9d47751d --- /dev/null +++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.c @@ -0,0 +1,310 @@
<snip>
Here there is still a cast to iomem:
+void mtk_vdec_h264_copy_scaling_matrix(struct slice_api_h264_scaling_matrix *dst_matrix,
const struct v4l2_ctrl_h264_scaling_matrix *src_matrix)+{
- memcpy_toio((void __iomem *)dst_matrix->scaling_list_4x4, src_matrix->scaling_list_4x4,
sizeof(dst_matrix->scaling_list_4x4));- memcpy_toio((void __iomem *)dst_matrix->scaling_list_8x8, src_matrix->scaling_list_8x8,
sizeof(dst_matrix->scaling_list_8x8));+}
<snip>
diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c index 27119aa31dd9..b055ceea481d 100644 --- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c +++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c
<snip>
-static void -get_h264_scaling_matrix(struct slice_api_h264_scaling_matrix *dst_matrix,
const struct v4l2_ctrl_h264_scaling_matrix *src_matrix)-{
- memcpy(dst_matrix->scaling_list_4x4, src_matrix->scaling_list_4x4,
sizeof(dst_matrix->scaling_list_4x4));- memcpy(dst_matrix->scaling_list_8x8, src_matrix->scaling_list_8x8,
sizeof(dst_matrix->scaling_list_8x8));-}
but that function was moved (AFAICT) from vdec_h264_req_if.c where a regular memcpy was used.
Did you miss one iomem case?
Can I change mtk_vdec_h264_copy_scaling_matrix() to:
void mtk_vdec_h264_copy_scaling_matrix(struct slice_api_h264_scaling_matrix *dst_matrix, const struct v4l2_ctrl_h264_scaling_matrix *src_matrix) { memcpy(dst_matrix->scaling_list_4x4, src_matrix->scaling_list_4x4, sizeof(dst_matrix->scaling_list_4x4));
memcpy(dst_matrix->scaling_list_8x8, src_matrix->scaling_list_8x8, sizeof(dst_matrix->scaling_list_8x8)); }
If that's OK, then I'll do that manually, so no need to post a v13.
Everything else looks fine, so this is the only issue that needs to be resolved.
Regards,
Hans