Ezequiel, Boris, This is the v6 patch series minus the last patch since a bindings update is needed for that final patch as well. Regards, Hans The following changes since commit 39cb46751e2fbb72e0698f80e339db1fd4e1f50e: media: imx7-media-csi: Change imx7_csi_enable() to void (2019-05-28 14:20:12 -0400) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.3g for you to fetch changes up to e568d2cc1ef613dd5094f0ad69fbe60138688aa3: rockchip/vpu: Add support for MPEG-2 decoding on RK3288 (2019-05-29 09:42:52 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Boris Brezillon (8): media: v4l2-common: Fix v4l2_fill_pixfmt[_mp]() prototypes media: v4l2-common: Add an helper to apply frmsize constraints media: v4l2-common: Support custom imagesize in fill_pixfmt() rockchip/vpu: Use v4l2_apply_frmsize_constraints() where appropriate rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h rockchip/vpu: Move encoder logic to a common place rockchip/vpu: Provide a helper to reset both src and dst formats rockchip/vpu: Prepare things to support decoders Ezequiel Garcia (4): rockchip/vpu: Open-code media controller register rockchip/vpu: Support the Request API rockchip/vpu: Add decoder boilerplate rockchip/vpu: Add support for non-standard controls Jonas Karlman (3): rockchip/vpu: Add infra to support MPEG-2 decoding rockchip/vpu: Add MPEG2 decoding support to RK3399 rockchip/vpu: Add support for MPEG-2 decoding on RK3288 drivers/media/v4l2-core/v4l2-common.c | 90 ++++- drivers/staging/media/rockchip/vpu/Kconfig | 1 + drivers/staging/media/rockchip/vpu/Makefile | 7 +- drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c | 59 +++- drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 2 +- drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c | 261 ++++++++++++++ drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h | 1 + drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c | 59 +++- drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 8 +- drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c | 267 +++++++++++++++ drivers/staging/media/rockchip/vpu/rockchip_vpu.h | 110 +++++- drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c | 465 +++++++++++++++++++++---- drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c | 571 ------------------------------- drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h | 16 + drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c | 61 ++++ drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c | 692 ++++++++++++++++++++++++++++++++++++++ .../staging/media/rockchip/vpu/{rockchip_vpu_common.h => rockchip_vpu_v4l2.h} | 15 +- include/media/v4l2-common.h | 10 +- 18 files changed, 2012 insertions(+), 683 deletions(-) create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c rename drivers/staging/media/rockchip/vpu/{rockchip_vpu_common.h => rockchip_vpu_v4l2.h} (50%)