This pull request contains patches 1-10 of the "[PATCH v4 00/21] Add MPEG-2 decoding to Rockchip VPU" series. These are all fixes and are independent of the mpeg-2 support. Regards, Hans The following changes since commit a4dfc8a24796ff312d1d307e11f26f8ca466e938: media: MAINTAINERS: Update AO CEC with ao-cec-g12a driver (2019-04-22 13:16:35 -0400) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.2j for you to fetch changes up to 7634fd32f5d0e78e6e386f93cb35013b85b0b070: rockchip/vpu: Fix/re-order probe-error/remove path (2019-04-25 14:39:40 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Boris Brezillon (3): rockchip/vpu: Remove a useless test rockchip/vpu: Get vdev from the file arg in vidioc_querycap() rockchip/vpu: Initialize mdev->bus_info Ezequiel Garcia (4): rockchip/vpu: Use pixel format helpers rockchip/vpu: Use v4l2_m2m_buf_copy_metadata rockchip/vpu: Cleanup macroblock alignment rockchip/vpu: Cleanup JPEG bounce buffer management Jonas Karlman (3): rockchip/vpu: Do not request id 0 for our video device rockchip/vpu: Add missing dont_use_autosuspend() calls rockchip/vpu: Fix/re-order probe-error/remove path drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c | 2 ++ drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 4 +-- drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c | 2 ++ drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 4 +-- drivers/staging/media/rockchip/vpu/rockchip_vpu.h | 12 +++---- drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c | 38 +++++++++++----------- drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c | 137 +++++++++++------------------------------------------------------------------- drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h | 28 ++++++++++++++++ drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.c | 29 +++++++++++++++++ 9 files changed, 109 insertions(+), 147 deletions(-)