Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull new experimental media request API from Mauro Carvalho Chehab:
 "A new media request API

  This API is needed to support device drivers that can dynamically
  change their parameters for each new frame. The latest versions of
  Google camera and codec HAL depends on such feature.

  At this stage, it supports only stateless codecs.

  It has been discussed for a long time (at least over the last 3-4
  years), and we finally reached to something that seem to work.

  This series contain both the API and core changes required to support
  it and a new m2m decoder driver (cedrus).

  As the current API is still experimental, the only real driver using
  it (cedrus) was added at staging[1]. We intend to keep it there for a
  while, in order to test the API. Only when we're sure that this API
  works for other cases (like encoders), we'll move this driver out of
  staging and set the API into a stone.

  [1] We added support for the vivid virtual driver (used only for
  testing) to it too, as it makes easier to test the API for the ones
  that don't have the cedrus hardware"

* tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (53 commits)
  media: dt-bindings: Document the Rockchip VPU bindings
  media: platform: Add Cedrus VPU decoder driver
  media: dt-bindings: media: Document bindings for the Cedrus VPU driver
  media: v4l: Add definition for the Sunxi tiled NV12 format
  media: v4l: Add definitions for MPEG-2 slice format and metadata
  media: videobuf2-core: Rework and rename helper for request buffer count
  media: v4l2-ctrls.c: initialize an error return code with zero
  media: v4l2-compat-ioctl32.c: add missing documentation for a field
  media: media-request: update documentation
  media: media-request: EPERM -> EACCES/EBUSY
  media: v4l2-ctrls: improve media_request_(un)lock_for_update
  media: v4l2-ctrls: use media_request_(un)lock_for_access
  media: media-request: add media_request_(un)lock_for_access
  media: vb2: set reqbufs/create_bufs capabilities
  media: videodev2.h: add new capabilities for buffer types
  media: buffer.rst: only set V4L2_BUF_FLAG_REQUEST_FD for QBUF
  media: v4l2-ctrls: return -EACCES if request wasn't completed
  media: media-request: return -EINVAL for invalid request_fds
  media: vivid: add request support
  media: vivid: add mc
  ...

diff --cc Documentation/media/videodev2.h.rst.exceptions
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/common/videobuf2/videobuf2-core.c
Simple merge

diff --cc drivers/media/dvb-core/dvb_vb2.c
Simple merge

diff --cc drivers/media/dvb-frontends/rtl2832_sdr.c
Simple merge

diff --cc drivers/media/media-device.c
Simple merge

diff --cc drivers/media/pci/bt8xx/bttv-driver.c
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885-417.c
Simple merge

diff --cc drivers/media/pci/cx88/cx88-blackbird.c
Simple merge

diff --cc drivers/media/pci/cx88/cx88-video.c
Simple merge

diff --cc drivers/media/pci/saa7134/saa7134-empress.c
Simple merge

diff --cc drivers/media/pci/saa7134/saa7134-video.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-capture.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispvideo.c
Simple merge

diff --cc drivers/media/platform/rcar-vin/rcar-core.c
Simple merge

diff --cc drivers/media/platform/rcar_drif.c
Simple merge

diff --cc drivers/media/platform/s3c-camif/camif-capture.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
Simple merge

diff --cc drivers/media/platform/soc_camera/soc_camera.c
Simple merge

diff --cc drivers/media/platform/vim2m.c
index 60c522ee2e0368ea31efb3d0583ef52dfee9447b,40fbb1e429af34ede51043502c28778fb60c19c0..af150a0395dfb55ef55bf606df4825ec5b807912
--- 1/drivers/media/platform/vim2m.c
--- 2/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@@ -1038,8 -1058,9 +1058,9 @@@ static int vim2m_probe(struct platform_
  
  #ifdef CONFIG_MEDIA_CONTROLLER
        dev->mdev.dev = &pdev->dev;
 -      strlcpy(dev->mdev.model, "vim2m", sizeof(dev->mdev.model));
 +      strscpy(dev->mdev.model, "vim2m", sizeof(dev->mdev.model));
        media_device_init(&dev->mdev);
+       dev->mdev.ops = &m2m_media_ops;
        dev->v4l2_dev.mdev = &dev->mdev;
  
        ret = v4l2_m2m_register_media_controller(dev->m2m_dev,

diff --cc drivers/media/platform/vivid/vivid-core.c
Simple merge

diff --cc drivers/media/platform/vivid/vivid-core.h
Simple merge

diff --cc drivers/media/platform/vivid/vivid-ctrls.c
Simple merge

diff --cc drivers/media/platform/vivid/vivid-sdr-cap.c
Simple merge

diff --cc drivers/media/platform/vivid/vivid-vid-cap.c
Simple merge

diff --cc drivers/media/platform/vivid/vivid-vid-out.c
Simple merge

diff --cc drivers/media/usb/cpia2/cpia2_v4l.c
Simple merge

diff --cc drivers/media/usb/cx231xx/cx231xx-417.c
Simple merge

diff --cc drivers/media/usb/cx231xx/cx231xx-video.c
Simple merge

diff --cc drivers/media/usb/msi2500/msi2500.c
Simple merge

diff --cc drivers/media/usb/tm6000/tm6000-video.c
Simple merge

diff --cc drivers/media/usb/uvc/uvc_v4l2.c
Simple merge

diff --cc drivers/media/usb/uvc/uvcvideo.h
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ctrls.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-device.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-subdev.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/vpfe_video.c
Simple merge

diff --cc drivers/staging/media/imx/imx-media-dev.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_video.c
Simple merge

diff --cc include/media/v4l2-ctrls.h
Simple merge

diff --cc include/uapi/linux/videodev2.h
Simple merge