Commit b3491d84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
  ...
parents 59fc453b e4183d32

Documentation/devicetree/bindings/media/cedrus.txt

0 → 100644
+54 −0
Original line number Diff line number Diff line 
Device-tree bindings for the VPU found in Allwinner SoCs, referred to as the

Video Engine (VE) in Allwinner literature.



The VPU can only access the first 256 MiB of DRAM, that are DMA-mapped starting

from the DRAM base. This requires specific memory allocation and handling.



Required properties:

- compatible		: must be one of the following compatibles:

			- "allwinner,sun4i-a10-video-engine"

			- "allwinner,sun5i-a13-video-engine"

			- "allwinner,sun7i-a20-video-engine"

			- "allwinner,sun8i-a33-video-engine"

			- "allwinner,sun8i-h3-video-engine"

- reg			: register base and length of VE;

- clocks		: list of clock specifiers, corresponding to entries in

			  the clock-names property;

- clock-names		: should contain "ahb", "mod" and "ram" entries;

- resets		: phandle for reset;

- interrupts		: VE interrupt number;

- allwinner,sram	: SRAM region to use with the VE.



Optional properties:

- memory-region		: CMA pool to use for buffers allocation instead of the

			  default CMA pool.



Example:



reserved-memory {

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;



	/* Address must be kept in the lower 256 MiBs of DRAM for VE. */

	cma_pool: cma@4a000000 {

		compatible = "shared-dma-pool";

		size = <0x6000000>;

		alloc-ranges = <0x4a000000 0x6000000>;

		reusable;

		linux,cma-default;

	};

};



video-codec@1c0e000 {

	compatible = "allwinner,sun7i-a20-video-engine";

	reg = <0x01c0e000 0x1000>;



	clocks = <&ccu CLK_AHB_VE>, <&ccu CLK_VE>,

		 <&ccu CLK_DRAM_VE>;

	clock-names = "ahb", "mod", "ram";



	resets = <&ccu RST_VE>;

	interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

	allwinner,sram = <&ve_sram 1>;

};

Documentation/devicetree/bindings/media/rockchip-vpu.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
device-tree bindings for rockchip VPU codec



Rockchip (Video Processing Unit) present in various Rockchip platforms,

such as RK3288 and RK3399.



Required properties:

- compatible: value should be one of the following

		"rockchip,rk3288-vpu";

		"rockchip,rk3399-vpu";

- interrupts: encoding and decoding interrupt specifiers

- interrupt-names: should be "vepu" and "vdpu"

- clocks: phandle to VPU aclk, hclk clocks

- clock-names: should be "aclk" and "hclk"

- power-domains: phandle to power domain node

- iommus: phandle to a iommu node



Example:

SoC-specific DT entry:

	vpu: video-codec@ff9a0000 {

		compatible = "rockchip,rk3288-vpu";

		reg = <0x0 0xff9a0000 0x0 0x800>;

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vepu", "vdpu";

		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;

		clock-names = "aclk", "hclk";

		power-domains = <&power RK3288_PD_VIDEO>;

		iommus = <&vpu_mmu>;

	};

Documentation/media/kapi/mc-core.rst

+2 −0
Original line number Diff line number Diff line
@@ -262,3 +262,5 @@ in the end provide a way to use driver-specific callbacks. 
.. kernel-doc:: include/media/media-devnode.h



.. kernel-doc:: include/media/media-entity.h



.. kernel-doc:: include/media/media-request.h

Documentation/media/uapi/mediactl/media-controller.rst

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Part IV - Media Controller API 
    media-controller-intro

    media-controller-model

    media-types

    request-api

    media-funcs

    media-header

Documentation/media/uapi/mediactl/media-funcs.rst

+6 −0
Original line number Diff line number Diff line
@@ -16,3 +16,9 @@ Function Reference 
    media-ioc-enum-entities

    media-ioc-enum-links

    media-ioc-setup-link

    media-ioc-request-alloc

    request-func-close

    request-func-ioctl

    request-func-poll

    media-request-ioc-queue

    media-request-ioc-reinit

CRA Git | Maintained and supported by SUSTech CRA and CCSE