Skip to content

drm/meson: add support for Amlogic Video FBC

Neil Armstrong dri-devel linux-amlogic linux-arm-kernel lkml 8 versions – Applied

Status from this message: This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v9 Latest6 patches 3 repliesApplied
  2. v86 patches 7 repliesSuperseded
  3. v76 patches 0 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v66 patches1 replySuperseded
v58 patches7 repliesSuperseded
v48 patches7 repliesSuperseded
v37 patches3 repliesSuperseded
v14 patches11 repliesSuperseded

Patches in v9 Applied

#Subject and filesSizeRepliesApplied
1/6drm/fourcc: Add modifier definitions for describing Amlogic Video Framebuffer Compressioninclude/uapi/drm/drm_fourcc.h+81 -02 replies
2/6drm/meson: add Amlogic Video FBC registersdrivers/gpu/drm/meson/meson_registers.h+22 -00 replies
3/6drm/meson: overlay: setup overlay for Amlogic FBCdrivers/gpu/drm/meson/meson_drv.h drivers/gpu/drm/meson/meson_overlay.c+259 -80 replies
4/6drm/meson: overlay: setup overlay for Amlogic FBC Memory Saving modedrivers/gpu/drm/meson/meson_overlay.c+23 -20 replies
5/6drm/meson: overlay: setup overlay for Amlogic FBC Scatter Memory layoutdrivers/gpu/drm/meson/meson_overlay.c+35 -180 replies
6/6drm/meson: crtc: handle commit of Amlogic FBC framesdrivers/gpu/drm/meson/meson_crtc.c+88 -300 replies

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchKevin HilmanDaniel VetterSimon Ser
1/6T-b R-b A-b A-b
2/6T-b R-b
3/6T-b R-b
4/6T-b R-b
5/6T-b R-b
6/6T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v9 thread

Cover letter [PATCH v9 0/6] drm/meson: add support for Amlogic Video FBC

Amlogic uses a proprietary lossless image compression protocol and format for their hardware video codec accelerators, either video decoders or video input encoders.

It considerably reduces memory bandwidth while writing and reading frames in memory.

The underlying storage is considered to be 3 components, 8bit or 10-bit per component, YCbCr 420, single plane :
- DRM_FORMAT_YUV420_8BIT
- DRM_FORMAT_YUV420_10BIT

This modifier will be notably added to DMA-BUF frames imported from the V4L2 Amlogic VDEC decoder.

At least two layout are supported :
- Basic: composed of a body and a header
- Scatter: the buffer is filled with a IOMMU scatter table referring to the encoder current memory layout. This mode if more efficient in terms of memory allocation but frames are not dumpable and only valid during until the buffer is freed and back in control of the encoder

At least two options are supported :
- Memory saving: when the pixel bpp is 8b, the size of the superblock can be reduced, thus saving memory.

This serie adds the missing register, updated the FBC decoder registers content to be committed by the crtc code.

The Amlogic FBC has been tested with compressed content from the Amlogic HW VP9 decoder on S905X (GXL), S905D2 (G12A) and S905X3 (SM1) in 8bit (Scatter+Mem Saving on G12A/SM1, Mem Saving on GXL) and 10bit (Scatter on G12A/SM1, default on GXL).

It's expected to work as-is on GXM and G12B SoCs.

Changes since v8 at [8]:
- added clarification of scatter mmap behavior as suggested by daniel
- added ack and review tags

Changes since v7 at [7]:
- rebased on drm-misc-next
- removed spurious DEBUG in drivers/gpu/drm/meson/meson_overlay.c

Changes since v6 at [6]:
- rebased on drm-misc-next (after drm-misc-next-2020-05-14)
- updated patch 1 commit log for completion

Changes since v5 at [5]:
- merged all fourcc patches in 1
- fixed fourcc definition to have only a single DRM_MOD_
- fixed 2 checkpatch issues

Changes since v4 at [4]:
- added layout and options mask
- cosmetic changes in fourcc.h
- fixed mod check using the masks
- fixed plane apply using the masks

Changes since v3 at [3]:
- added dropped fourcc patch for scatter
- fixed build of last patch

Changes since v2 at [2]:
- Added "BASIC" layout and moved the SCATTER mode as layout, making BASIC and SCATTER layout exclusives
- Moved the Memory Saving at bit 8 for options fields
- Split fourcc and overlay patch to introduce basic, mem saving and then scatter in separate patches
- Added comment about "transferability" of the buffers

Changes since v1 at [1]:
- s/VD1_AXI_SEL_AFB/VD1_AXI_SEL_AFBC/ into meson_registers.h

[1] https://patchwork.freedesktop.org/series/73722/#rev1
[2] https://patchwork.freedesktop.org/series/73722/#rev2
[3] https://patchwork.freedesktop.org/series/73722/#rev3
[4] https://patchwork.freedesktop.org/series/73722/#rev4
[5] https://patchwork.freedesktop.org/series/73722/#rev5
[6] https://patchwork.freedesktop.org/series/73722/#rev6
[7] https://patchwork.freedesktop.org/series/73722/#rev7
[7] https://patchwork.freedesktop.org/series/73722/#rev8

Neil Armstrong (6):
drm/fourcc: Add modifier definitions for describing Amlogic Video
Framebuffer Compression
drm/meson: add Amlogic Video FBC registers
drm/meson: overlay: setup overlay for Amlogic FBC drm/meson: overlay: setup overlay for Amlogic FBC Memory Saving mode drm/meson: overlay: setup overlay for Amlogic FBC Scatter Memory
layout
drm/meson: crtc: handle commit of Amlogic FBC frames

 drivers/gpu/drm/meson/meson_crtc.c      | 118 +++++++---
 drivers/gpu/drm/meson/meson_drv.h       |  16 ++
 drivers/gpu/drm/meson/meson_overlay.c   | 289 +++++++++++++++++++++++-
 drivers/gpu/drm/meson/meson_registers.h |  22 ++
 include/uapi/drm/drm_fourcc.h           |  81 +++++++
 5 files changed, 488 insertions(+), 38 deletions(-)
Signature · 6 lines
2.22.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel