mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/meson: crtc: handle commit of Amlogic FBC frames 

Since the VD1 Amlogic FBC decoder is now configured by the overlay driver,
commit the right registers to decode the Amlogic FBC frame.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200703080728.25207-7-narmstrong@baylibre.com
This commit is contained in:
Neil Armstrong 2020-07-03 10:07:28 +02:00
parent be26a04bb7
commit bc84ee9481
1 changed files with 88 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
drivers/gpu/drm/meson/meson_crtc.c
View File

@ -291,6 +291,10 @@ static void meson_crtc_enable_vd1(struct meson_drm *priv)
VPP_VD1_PREBLEND | VPP_VD1_POSTBLEND | VPP_VD1_PREBLEND | VPP_VD1_POSTBLEND |
VPP_COLOR_MNG_ENABLE, VPP_COLOR_MNG_ENABLE,
priv->io_base + _REG(VPP_MISC)); priv->io_base + _REG(VPP_MISC));
writel_bits_relaxed(VIU_CTRL0_AFBC_TO_VD1,
priv->viu.vd1_afbc ? VIU_CTRL0_AFBC_TO_VD1 : 0,
priv->io_base + _REG(VIU_MISC_CTRL0));
} }
static void meson_g12a_crtc_enable_vd1(struct meson_drm *priv) static void meson_g12a_crtc_enable_vd1(struct meson_drm *priv)
@ -300,6 +304,10 @@ static void meson_g12a_crtc_enable_vd1(struct meson_drm *priv)
VD_BLEND_POSTBLD_SRC_VD1 | VD_BLEND_POSTBLD_SRC_VD1 |
VD_BLEND_POSTBLD_PREMULT_EN, VD_BLEND_POSTBLD_PREMULT_EN,
priv->io_base + _REG(VD1_BLEND_SRC_CTRL)); priv->io_base + _REG(VD1_BLEND_SRC_CTRL));
writel_relaxed(priv->viu.vd1_afbc ?
(VD1_AXI_SEL_AFBC | AFBC_VD1_SEL) : 0,
priv->io_base + _REG(VD1_AFBCD0_MISC_CTRL));
} }
void meson_crtc_irq(struct meson_drm *priv) void meson_crtc_irq(struct meson_drm *priv)
@ -383,36 +391,86 @@ void meson_crtc_irq(struct meson_drm *priv)
/* Update the VD1 registers */ /* Update the VD1 registers */
if (priv->viu.vd1_enabled && priv->viu.vd1_commit) { if (priv->viu.vd1_enabled && priv->viu.vd1_commit) {
switch (priv->viu.vd1_planes) { if (priv->viu.vd1_afbc) {
case 3: writel_relaxed(priv->viu.vd1_afbc_head_addr,
meson_canvas_config(priv->canvas, priv->io_base +
priv->canvas_id_vd1_2, _REG(AFBC_HEAD_BADDR));
priv->viu.vd1_addr2, writel_relaxed(priv->viu.vd1_afbc_body_addr,
priv->viu.vd1_stride2, priv->io_base +
priv->viu.vd1_height2, _REG(AFBC_BODY_BADDR));
MESON_CANVAS_WRAP_NONE, writel_relaxed(priv->viu.vd1_afbc_en,
MESON_CANVAS_BLKMODE_LINEAR, priv->io_base +
MESON_CANVAS_ENDIAN_SWAP64); _REG(AFBC_ENABLE));
/* fallthrough */ writel_relaxed(priv->viu.vd1_afbc_mode,
case 2: priv->io_base +
meson_canvas_config(priv->canvas, _REG(AFBC_MODE));
priv->canvas_id_vd1_1, writel_relaxed(priv->viu.vd1_afbc_size_in,
priv->viu.vd1_addr1, priv->io_base +
priv->viu.vd1_stride1, _REG(AFBC_SIZE_IN));
priv->viu.vd1_height1, writel_relaxed(priv->viu.vd1_afbc_dec_def_color,
MESON_CANVAS_WRAP_NONE, priv->io_base +
MESON_CANVAS_BLKMODE_LINEAR, _REG(AFBC_DEC_DEF_COLOR));
MESON_CANVAS_ENDIAN_SWAP64); writel_relaxed(priv->viu.vd1_afbc_conv_ctrl,
/* fallthrough */ priv->io_base +
case 1: _REG(AFBC_CONV_CTRL));
meson_canvas_config(priv->canvas, writel_relaxed(priv->viu.vd1_afbc_size_out,
priv->canvas_id_vd1_0, priv->io_base +
priv->viu.vd1_addr0, _REG(AFBC_SIZE_OUT));
priv->viu.vd1_stride0, writel_relaxed(priv->viu.vd1_afbc_vd_cfmt_ctrl,
priv->viu.vd1_height0, priv->io_base +
MESON_CANVAS_WRAP_NONE, _REG(AFBC_VD_CFMT_CTRL));
MESON_CANVAS_BLKMODE_LINEAR, writel_relaxed(priv->viu.vd1_afbc_vd_cfmt_w,
MESON_CANVAS_ENDIAN_SWAP64); priv->io_base +
_REG(AFBC_VD_CFMT_W));
writel_relaxed(priv->viu.vd1_afbc_mif_hor_scope,
priv->io_base +
_REG(AFBC_MIF_HOR_SCOPE));
writel_relaxed(priv->viu.vd1_afbc_mif_ver_scope,
priv->io_base +
_REG(AFBC_MIF_VER_SCOPE));
writel_relaxed(priv->viu.vd1_afbc_pixel_hor_scope,
priv->io_base+
_REG(AFBC_PIXEL_HOR_SCOPE));
writel_relaxed(priv->viu.vd1_afbc_pixel_ver_scope,
priv->io_base +
_REG(AFBC_PIXEL_VER_SCOPE));
writel_relaxed(priv->viu.vd1_afbc_vd_cfmt_h,
priv->io_base +
_REG(AFBC_VD_CFMT_H));
} else {
switch (priv->viu.vd1_planes) {
case 3:
meson_canvas_config(priv->canvas,
priv->canvas_id_vd1_2,
priv->viu.vd1_addr2,
priv->viu.vd1_stride2,
priv->viu.vd1_height2,
MESON_CANVAS_WRAP_NONE,
MESON_CANVAS_BLKMODE_LINEAR,
MESON_CANVAS_ENDIAN_SWAP64);
fallthrough;
case 2:
meson_canvas_config(priv->canvas,
priv->canvas_id_vd1_1,
priv->viu.vd1_addr1,
priv->viu.vd1_stride1,
priv->viu.vd1_height1,
MESON_CANVAS_WRAP_NONE,
MESON_CANVAS_BLKMODE_LINEAR,
MESON_CANVAS_ENDIAN_SWAP64);
fallthrough;
case 1:
meson_canvas_config(priv->canvas,
priv->canvas_id_vd1_0,
priv->viu.vd1_addr0,
priv->viu.vd1_stride0,
priv->viu.vd1_height0,
MESON_CANVAS_WRAP_NONE,
MESON_CANVAS_BLKMODE_LINEAR,
MESON_CANVAS_ENDIAN_SWAP64);
}
writel_relaxed(0, priv->io_base + _REG(AFBC_ENABLE));
} }
writel_relaxed(priv->viu.vd1_if0_gen_reg, writel_relaxed(priv->viu.vd1_if0_gen_reg,