The following changes since commit 9a538b83612c8b5848bf840c2ddcd86dda1c8c76: media: venus: core: Add support for opp tables/perf voting (2020-08-18 15:55:56 +0200) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-mtk-jpeg for you to fetch changes up to 3142a903c2299f362e48125615d116bdd37eb68b: media: platform: Add jpeg enc feature (2020-08-19 13:21:23 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Pi-Hsun Shih (1): media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume Xia Jiang (27): media: platform: Improve subscribe event flow for bug fixing media: platform: Improve queue set up flow for bug fixing media: platform: Improve getting and requesting irq flow for bug fixing media: platform: Change the fixed device node number to unfixed value media: platform: Improve power on and power off flow media: platform: Delete the resetting hardware flow in the system PM ops media: platform: Improve the implementation of the system PM ops media: platform: Add mechanism to handle jpeg hardware's locking up media: platform: Cancel the last frame handling flow media: platform: Delete zeroing the reserved fields media: platform: Stylistic changes for improving code quality media: platform: Use generic rounding helpers media: platform: Change MTK_JPEG_COMP_MAX macro definition location media: platform: Delete redundant code and add annotation for an enum media: platform: Delete vidioc_s_selection ioctl of jpeg dec media: platform: Change the maximum width and height supported by JPEG dec media: platform: Refactor mtk_jpeg_try_fmt_mplane() media: platform: Refactor mtk_jpeg_find_format() media: platform: Redefinition of mtk_jpeg_q_data structure media: platform: Change the colorspace of jpeg to the fixed value media: platform: Refactor mtk_jpeg_set_default_params() media: platform: Change the call functions of getting/enable/disable the jpeg's clock media: dt-bindings: Add jpeg enc device tree node document media: platform: Rename jpeg dec file name media: platform: Rename existing functions/defines/variables media: platform: Using the variant structure to contain the varability between dec and enc media: platform: Add jpeg enc feature Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt | 35 ++ drivers/media/platform/mtk-jpeg/Makefile | 5 +- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 930 +++++++++++++++++++++------------ drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 106 ++-- drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 10 +- drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 12 +- .../media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 2 +- .../media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} | 2 +- drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 19 +- drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 154 ++++++ drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 91 ++++ drivers/media/v4l2-core/v4l2-mem2mem.c | 41 ++ include/media/v4l2-mem2mem.h | 22 + 13 files changed, 1046 insertions(+), 383 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (98%) rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (91%) rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (98%) rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (92%) rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (77%) create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h