drm/meson: implement RDMA for AFBC reset on vsync
v2 cover drm/meson: implement RDMA for AFBC reset on vsync
The VPU embeds a "Register DMA" that can write a sequence of registers on the VPU AHB bus, either manually or triggered by an internal IRQ event like VSYNC or a line input counter.
The initial implementation handles a single channel (over 8), triggered by the VSYNC irq and does not handle the RDMA irq.
The RDMA will be usefull to reset and program the AFBC decoder unit on each vsync without involving the interrupt handler that can be masked for a long period of time, producing display glitches.
For this we use the meson_rdma_writel_sync() which adds the register write tuple (VPU register offset and register value) to the RDMA buffer and write the value to the HW.
When enabled, the RDMA is enabled to rewritte the same sequence at the next VSYNC event, until a new buffer is committed to the OSD plane.
The the Amlogic G12A is switched to RDMA, the Amlogic GXM Decoder doesn't need a reset/reprogram at each vsync.
Changes since v1 at [1]:
- Fixed a regression when AFBC was not used, adding a reset() call for the afbc module
- Added a define for the RDMA descriptor size
- Fixed overflow detection
[1] https://patchwork.freedesktop.org/series/68021/#rev1
Neil Armstrong (3):
drm/meson: add RDMA register bits defines drm/meson: add RDMA module driver drm/meson: use RDMA to reconfigure AFBC on vsync
drivers/gpu/drm/meson/Makefile | 2 +- drivers/gpu/drm/meson/meson_crtc.c | 27 ++--- drivers/gpu/drm/meson/meson_drv.c | 14 ++- drivers/gpu/drm/meson/meson_drv.h | 6 ++ drivers/gpu/drm/meson/meson_osd_afbcd.c | 100 ++++++++++-------- drivers/gpu/drm/meson/meson_rdma.c | 132 ++++++++++++++++++++++++ drivers/gpu/drm/meson/meson_rdma.h | 21 ++++ drivers/gpu/drm/meson/meson_registers.h | 48 +++++++++ 8 files changed, 283 insertions(+), 67 deletions(-) create mode 100644 drivers/gpu/drm/meson/meson_rdma.c create mode 100644 drivers/gpu/drm/meson/meson_rdma.h
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/3 drm/meson: add RDMA register bits defines
The Amlogic VPU embeds a "Register DMA" that can write a sequence of registers on the VPU AHB bus, either manually or triggered by an internal IRQ event like VSYNC or a line input counter.
This adds the register defines.
--- drivers/gpu/drm/meson/meson_registers.h | 48 +++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
drivers/gpu/drm/meson/meson_registers.h +48 -0
@@ -1211,11 +1211,59 @@#define RDMA_AHB_START_ADDR_7 0x110e#define RDMA_AHB_END_ADDR_7 0x110f#define RDMA_ACCESS_AUTO 0x1110 +#define RDMA_ACCESS_TRIGGER_CHAN3 GENMASK(31, 24) +#define RDMA_ACCESS_TRIGGER_CHAN2 GENMASK(23, 16) +#define RDMA_ACCESS_TRIGGER_CHAN1 GENMASK(15, 8) +#define RDMA_ACCESS_TRIGGER_STOP 0 +#define RDMA_ACCESS_TRIGGER_VSYNC 1 +#define RDMA_ACCESS_TRIGGER_LINE 32 +#define RDMA_ACCESS_RW_FLAG_CHAN3 BIT(7) +#define RDMA_ACCESS_RW_FLAG_CHAN2 BIT(6) +#define RDMA_ACCESS_RW_FLAG_CHAN1 BIT(5) +#define RDMA_ACCESS_ADDR_INC_CHAN3 BIT(3) +#define RDMA_ACCESS_ADDR_INC_CHAN2 BIT(2) +#define RDMA_ACCESS_ADDR_INC_CHAN1 BIT(1)#define RDMA_ACCESS_AUTO2 0x1111 +#define RDMA_ACCESS_RW_FLAG_CHAN7 BIT(7) +#define RDMA_ACCESS_RW_FLAG_CHAN6 BIT(6) +#define RDMA_ACCESS_RW_FLAG_CHAN5 BIT(5) +#define RDMA_ACCESS_RW_FLAG_CHAN4 BIT(4) +#define RDMA_ACCESS_ADDR_INC_CHAN7 BIT(3) +#define RDMA_ACCESS_ADDR_INC_CHAN6 BIT(2) +#define RDMA_ACCESS_ADDR_INC_CHAN5 BIT(1) +#define RDMA_ACCESS_ADDR_INC_CHAN4 BIT(0)#define RDMA_ACCESS_AUTO3 0x1112 +#define RDMA_ACCESS_TRIGGER_CHAN7 GENMASK(31, 24) +#define RDMA_ACCESS_TRIGGER_CHAN6 GENMASK(23, 16) +#define RDMA_ACCESS_TRIGGER_CHAN5 GENMASK(15, 8) +#define RDMA_ACCESS_TRIGGER_CHAN4 GENMASK(7, 0)#define RDMA_ACCESS_MAN 0x1113 +#define RDMA_ACCESS_MAN_RW_FLAG BIT(2) +#define RDMA_ACCESS_MAN_ADDR_INC BIT(1) +#define RDMA_ACCESS_MAN_START BIT(0)#define RDMA_CTRL 0x1114 +#define RDMA_IRQ_CLEAR_CHAN7 BIT(31) +#define RDMA_IRQ_CLEAR_CHAN6 BIT(30) +#define RDMA_IRQ_CLEAR_CHAN5 BIT(29) +#define RDMA_IRQ_CLEAR_CHAN4 BIT(28) +#define RDMA_IRQ_CLEAR_CHAN3 BIT(27) +#define RDMA_IRQ_CLEAR_CHAN2 BIT(26) +#define RDMA_IRQ_CLEAR_CHAN1 BIT(25) +#define RDMA_IRQ_CLEAR_CHAN_MAN BIT(24) +#define RDMA_DEFAULT_CONFIG (BIT(7) | BIT(6)) +#define RDMA_CTRL_AHB_WR_BURST GENMASK(5, 4) +#define RDMA_CTRL_AHB_RD_BURST GENMASK(3, 2) +#define RDMA_CTRL_SW_RESET BIT(1) +#define RDMA_CTRL_FREE_CLK_EN BIT(0)#define RDMA_STATUS 0x1115 +#define RDMA_IRQ_STAT_CHAN7 BIT(31) +#define RDMA_IRQ_STAT_CHAN6 BIT(30) +#define RDMA_IRQ_STAT_CHAN5 BIT(29) +#define RDMA_IRQ_STAT_CHAN4 BIT(28) +#define RDMA_IRQ_STAT_CHAN3 BIT(27) +#define RDMA_IRQ_STAT_CHAN2 BIT(26) +#define RDMA_IRQ_STAT_CHAN1 BIT(25) +#define RDMA_IRQ_STAT_CHAN_MAN BIT(24)#define RDMA_STATUS2 0x1116#define RDMA_STATUS3 0x1117#define L_GAMMA_CNTL_PORT 0x1400
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/3 drm/meson: add RDMA module driver
In reply to Neil ArmstrongThe VPU embeds a "Register DMA" that can write a sequence of registers on the VPU AHB bus, either manually or triggered by an internal IRQ event like VSYNC or a line input counter.
The initial implementation handles a single channel (over 8), triggered by the VSYNC irq and does not handle the RDMA irq.
The RDMA will be usefull to reset and program the AFBC decoder unit on each vsync without involving the interrupt handler that can be masked for a log period of time, producing display glitches.
--- drivers/gpu/drm/meson/Makefile | 2 +- drivers/gpu/drm/meson/meson_drv.c | 14 ++- drivers/gpu/drm/meson/meson_drv.h | 6 ++ drivers/gpu/drm/meson/meson_rdma.c | 132 +++++++++++++++++++++++++++++ drivers/gpu/drm/meson/meson_rdma.h | 21 +++++ 5 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/meson/meson_rdma.c create mode 100644 drivers/gpu/drm/meson/meson_rdma.h
drivers/gpu/drm/meson/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only meson-drm-y := meson_drv.o meson_plane.o meson_crtc.o meson_venc_cvbs.o meson-drm-y += meson_viu.o meson_vpp.o meson_venc.o meson_vclk.o meson_overlay.o -meson-drm-y += meson_osd_afbcd.o +meson-drm-y += meson_osd_afbcd.o meson_rdma.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o
drivers/gpu/drm/meson/meson_drv.c +11 -3
@@ -33,6 +33,7 @@#include "meson_venc_cvbs.h" #include "meson_viu.h" #include "meson_vpp.h" +#include "meson_rdma.h" #define DRIVER_NAME "meson"#define DRIVER_DESC "Amlogic Meson DRM driver"
@@ -295,8 +296,11 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)meson_venc_init (priv);meson_vpp_init (priv);meson_viu_init (priv); -if (priv->afbcd.ops) - priv->afbcd.ops->init (priv); +if (priv->afbcd.ops) { + ret = priv->afbcd.ops->init (priv); +if (ret) +return ret; + }/* Encoder Initialization */
@@ -367,12 +371,16 @@ static void meson_drv_unbind(struct device *dev)meson_canvas_free (priv->canvas, priv->canvas_id_vd1_2); } +if (priv->afbcd.ops) { + priv->afbcd.ops->reset (priv); +meson_rdma_free (priv); + } +drm_dev_unregister (drm);drm_irq_uninstall (drm);drm_kms_helper_poll_fini (drm);drm_mode_config_cleanup (drm);drm_dev_put (drm); - }static const struct component_master_ops meson_drv_master_ops = {
drivers/gpu/drm/meson/meson_drv.h +6 -0
@@ -139,6 +139,12 @@ struct meson_drm {u64 modifier;u32 format; } afbcd; + +struct { +dma_addr_t addr_phys; +uint32_t *addr; +unsigned int offset; + } rdma; }; static inline int meson_vpu_is_compatible(struct meson_drm *priv,
drivers/gpu/drm/meson/meson_rdma.c new file +132 -0
132 lines not on this page · raw message
drivers/gpu/drm/meson/meson_rdma.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2019 BayLibre, SAS +* Author: Neil Armstrong <[email protected]> +*/ + +#ifndef __MESON_RDMA_H +#define __MESON_RDMA_H + +#include "meson_drv.h" + +int meson_rdma_init (struct meson_drm *priv); +void meson_rdma_free (struct meson_drm *priv); +void meson_rdma_setup (struct meson_drm *priv); +void meson_rdma_reset (struct meson_drm *priv); +void meson_rdma_stop (struct meson_drm *priv); + +void meson_rdma_writel_sync (struct meson_drm *priv,uint32_t val,uint32_t reg); +void meson_rdma_flush (struct meson_drm *priv); + +#endif /* __MESON_RDMA_H */
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/3 drm/meson: use RDMA to reconfigure AFBC on vsync
In reply to Neil ArmstrongThe VPU embeds a "Register DMA" that can write a sequence of registers on the VPU AHB bus, either manually or triggered by an internal IRQ event like VSYNC or a line input counter.
The RDMA is used here to reset and program the AFBC decoder unit on each vsync without involving the interrupt handler that can be masked for a long period of time, producing display glitches.
For this we use the meson_rdma_writel_sync() which adds the register write tuple (VPU register offset and register value) to the RDMA buffer and write the value to the HW.
When enabled, the RDMA is enabled to rewritte the same sequence at the next VSYNC event, until a new buffer is committed to the OSD plane.
The the Amlogic G12A is switched to RDMA, the Amlogic GXM Decoder doesn't need a reset/reprogram at each vsync.
--- drivers/gpu/drm/meson/meson_crtc.c | 27 ++----- drivers/gpu/drm/meson/meson_osd_afbcd.c | 100 ++++++++++++++---------- 2 files changed, 64 insertions(+), 63 deletions(-)
drivers/gpu/drm/meson/meson_crtc.c +7 -20
@@ -23,6 +23,7 @@#include "meson_registers.h" #include "meson_venc.h" #include "meson_viu.h" +#include "meson_rdma.h" #include "meson_vpp.h" #include "meson_osd_afbcd.h"
@@ -39,8 +40,6 @@ struct meson_crtc {void (*enable_osd1_afbc)(struct meson_drm *priv);void (*disable_osd1_afbc)(struct meson_drm *priv);unsigned int viu_offset; -bool vsync_forced; -bool vsync_disabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)
@@ -51,7 +50,6 @@ static int meson_crtc_enable_vblank(struct drm_crtc *crtc)struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct meson_drm *priv = meson_crtc->priv; - meson_crtc->vsync_disabled = false;meson_venc_enable_vsync (priv);return 0 ;
@@ -62,10 +60,7 @@ static void meson_crtc_disable_vblank(struct drm_crtc *crtc)struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct meson_drm *priv = meson_crtc->priv; -if (!meson_crtc->vsync_forced) { - meson_crtc->vsync_disabled = true; -meson_venc_disable_vsync (priv); - } +meson_venc_disable_vsync (priv); }static const struct drm_crtc_funcs meson_crtc_funcs = {
@@ -368,10 +363,11 @@ void meson_crtc_irq(struct meson_drm *priv)if (meson_crtc->enable_osd1) meson_crtc->enable_osd1 (priv); -if (priv->viu.osd1_afbcd) - meson_crtc->vsync_forced = true; -else - meson_crtc->vsync_forced = false; +if (priv->viu.osd1_afbcd) { + priv->afbcd.ops->reset (priv); + priv->afbcd.ops->setup (priv); + priv->afbcd.ops->enable (priv); + } priv->viu.osd1_commit = false; }
@@ -595,15 +591,6 @@ void meson_crtc_irq(struct meson_drm *priv) priv->viu.vd1_commit = false; } -if (meson_crtc->vsync_forced && priv->viu.osd1_afbcd) { - priv->afbcd.ops->reset (priv); - priv->afbcd.ops->setup (priv); - priv->afbcd.ops->enable (priv); - } - -if (meson_crtc->vsync_disabled) -return ; -drm_crtc_handle_vblank (priv->crtc);spin_lock_irqsave (&priv->drm->event_lock, flags);
drivers/gpu/drm/meson/meson_osd_afbcd.c +57 -43
132 lines not on this page · raw message
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 18 lines · Neil Armstrong
The VPU embeds a "Register DMA" that can write a sequence of registers on the VPU AHB bus, either manually or triggered by an internal IRQ event like VSYNC or a line input counter.
The initial implementation handles a single channel (over 8), triggered by the VSYNC irq and does not handle the RDMA irq.
The RDMA will be usefull to reset and program the AFBC decoder unit on each vsync without involving the interrupt handler that can be masked for a long period of time, producing display glitches.
For this we use the
meson_rdma_writel_sync()which adds the register write tuple (VPU register offset and register value) to the RDMA buffer and write the value to the HW.When enabled, the RDMA is enabled to rewritte the same sequence at the next VSYNC event, until a new buffer is committed to the OSD plane.
Quoted 7 lines
The the Amlogic G12A is switched to RDMA, the Amlogic GXM Decoder doesn't need a reset/reprogram at each vsync.
Changes since v1 at [1]:
- Fixed a regression when AFBC was not used, adding areset()call for the afbc module
- Added a define for the RDMA descriptor size
- Fixed overflow detection
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel