diff options
author | Neil Armstrong <narmstrong@baylibre.com> | 2018-11-06 04:40:00 -0500 |
---|---|---|
committer | Neil Armstrong <narmstrong@baylibre.com> | 2018-11-13 07:27:51 -0500 |
commit | f9a2348196d1ab92e155bdba705db95d8177e886 (patch) | |
tree | 5dd9bd3c0ac1c1e923fe7e694c812b2eb20895fa /drivers/gpu/drm/meson/meson_canvas.c | |
parent | 9ef60bd673d1cd5bab882e0997cadc223670a801 (diff) |
drm/meson: Support Overlay plane for video rendering
The Amlogic Meson GX SoCs support an Overlay plane behind the primary
plane for video rendering.
This Overlay plane support various YUV layouts :
- YUYV
- NV12 / NV21
- YUV444 / 422 / 420 / 411 / 410
The scaler supports a wide range of scaling ratios, but for simplicity,
plane atomic check limits the scaling from x5 to /5 in vertical and
horizontal scaling.
The z-order is fixed and always behind the primary plane and cannot be changed.
The scaling parameter algorithm was taken from the Amlogic vendor kernel
code and rewritten to match the atomic universal plane requirements.
The video rendering using this overlay plane support has been tested using
the new Kodi DRM-KMS Prime rendering path along the in-review V4L2 Mem2Mem
Hardware Video Decoder up to 3840x2160 NV12 frames on various display modes.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Maxime Jourdan <mjourdan@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1541497202-20570-2-git-send-email-narmstrong@baylibre.com
Diffstat (limited to 'drivers/gpu/drm/meson/meson_canvas.c')
-rw-r--r-- | drivers/gpu/drm/meson/meson_canvas.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/meson/meson_canvas.c b/drivers/gpu/drm/meson/meson_canvas.c index 08f6073d967e..5de11aa7c775 100644 --- a/drivers/gpu/drm/meson/meson_canvas.c +++ b/drivers/gpu/drm/meson/meson_canvas.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #define CANVAS_WIDTH_HBIT 0 | 39 | #define CANVAS_WIDTH_HBIT 0 |
40 | #define CANVAS_HEIGHT_BIT 9 | 40 | #define CANVAS_HEIGHT_BIT 9 |
41 | #define CANVAS_BLKMODE_BIT 24 | 41 | #define CANVAS_BLKMODE_BIT 24 |
42 | #define CANVAS_ENDIAN_BIT 26 | ||
42 | #define DMC_CAV_LUT_ADDR 0x50 /* 0x14 offset in data sheet */ | 43 | #define DMC_CAV_LUT_ADDR 0x50 /* 0x14 offset in data sheet */ |
43 | #define CANVAS_LUT_WR_EN (0x2 << 8) | 44 | #define CANVAS_LUT_WR_EN (0x2 << 8) |
44 | #define CANVAS_LUT_RD_EN (0x1 << 8) | 45 | #define CANVAS_LUT_RD_EN (0x1 << 8) |
@@ -47,7 +48,8 @@ void meson_canvas_setup(struct meson_drm *priv, | |||
47 | uint32_t canvas_index, uint32_t addr, | 48 | uint32_t canvas_index, uint32_t addr, |
48 | uint32_t stride, uint32_t height, | 49 | uint32_t stride, uint32_t height, |
49 | unsigned int wrap, | 50 | unsigned int wrap, |
50 | unsigned int blkmode) | 51 | unsigned int blkmode, |
52 | unsigned int endian) | ||
51 | { | 53 | { |
52 | unsigned int val; | 54 | unsigned int val; |
53 | 55 | ||
@@ -60,7 +62,8 @@ void meson_canvas_setup(struct meson_drm *priv, | |||
60 | CANVAS_WIDTH_HBIT) | | 62 | CANVAS_WIDTH_HBIT) | |
61 | (height << CANVAS_HEIGHT_BIT) | | 63 | (height << CANVAS_HEIGHT_BIT) | |
62 | (wrap << 22) | | 64 | (wrap << 22) | |
63 | (blkmode << CANVAS_BLKMODE_BIT)); | 65 | (blkmode << CANVAS_BLKMODE_BIT) | |
66 | (endian << CANVAS_ENDIAN_BIT)); | ||
64 | 67 | ||
65 | regmap_write(priv->dmc, DMC_CAV_LUT_ADDR, | 68 | regmap_write(priv->dmc, DMC_CAV_LUT_ADDR, |
66 | CANVAS_LUT_WR_EN | canvas_index); | 69 | CANVAS_LUT_WR_EN | canvas_index); |