From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AB6C2C80 for ; Wed, 20 Oct 2021 15:04:47 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id j15-20020a1c230f000000b00322f53b9bbfso786477wmj.3 for ; Wed, 20 Oct 2021 08:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iSI/ddQ6s8uFsqLKqgX7/KMZvCDEF1sF+QLFOwBijVo=; b=WSm/g6FJplp5819Ycmp7EY5PXwMqWIT80+Dfw1Bzdwjs+gcuSenIDggXdBNm9ELwaf am0FTewPLikgh806CvWSBxcCwpaIU4wBWzBj+lp+CQXRAyxnIsdnPzuUSKQPh8UpLNdf Ye6t8eTDDuVQT3Gxog2cTfYWSTXyHADlWbP7qYbqsfdvqRYyMwdivigB0iM+eGHwrfSR NmRPDAx90ouHf+vCm93C9NXSH6MXY0s4MugoIBPNDCOkPdwlJ08o/NdWfpLFFDKEIbfL T6OT+/UHeGkQXbn1hJU5vI/534YQlGHzNFqa38reEJvVCdgdhffHzeiD2IRxWhHO+cdu r4sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iSI/ddQ6s8uFsqLKqgX7/KMZvCDEF1sF+QLFOwBijVo=; b=b93eFzXvwjDPJ3+VBlNav4f/Z8xXpS+TcNyv2ziNB27YGvQtKyb3cm6n1ZfPKIYOZx ZufLwuhfNUaVn7IUkN/5JRbzmM+dYyWNLCyVGff12pF/NUoz5nwaT0UNGBNnhSodVM+t gwB5/XDYwOhwATdzl3h1M1H5YCtMMYGni/HwJeLR94IshIi9aHr42DyUTy54CcHwDmZG eXFSbPRtdjfpBlj0RtTFr4q1gh17JTRyQTV4uRm49r9Q9a1/1IcQcOt8rHlwrmZeI5Kq lVc1Ynu2t1WbFPzypMClCLvI4gkfgi3AyaM9LB7Z1PEc2zw640S9n9g1dFsDd9d40a23 61sA== X-Gm-Message-State: AOAM532+cDmnxC7gDPorEkc8BSPgBJv58YKQOcW8+bOieAdnGJDw9jSw D2IEV13jl95ZJOgkvViOWB8= X-Google-Smtp-Source: ABdhPJw64D36JEnPwgRzr7aOlj86IE7a8hmJHL9NuiHWy+N92KexNY7aIB/3nMuRzNPy/cl0iT3n4w== X-Received: by 2002:a1c:7415:: with SMTP id p21mr14082917wmc.159.1634742285129; Wed, 20 Oct 2021 08:04:45 -0700 (PDT) Received: from kista.localnet (cpe-86-58-29-253.static.triera.net. [86.58.29.253]) by smtp.gmail.com with ESMTPSA id r17sm2604269wmq.47.2021.10.20.08.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 08:04:44 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Ezequiel Garcia Cc: linux-media , linux-arm-kernel , Linux Kernel Mailing List , "open list:ARM/Rockchip SoC..." , "open list:STAGING SUBSYSTEM" , Andrzej Pietrasiewicz , Benjamin Gaignard , Boris Brezillon , Fabio Estevam , Greg Kroah-Hartman , Hans Verkuil , Heiko Stuebner , Mauro Carvalho Chehab , Nicolas Dufresne , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Sascha Hauer , Shawn Guo , Collabora Kernel ML , Ezequiel Garcia Subject: Re: Re: Re: [PATCH v7 11/11] media: hantro: Support NV12 on the G2 core Date: Wed, 20 Oct 2021 17:04:43 +0200 Message-ID: <4350097.LvFx2qVVIh@kista> In-Reply-To: References: <20210929160439.6601-1-andrzej.p@collabora.com> <11847752.O9o76ZdvQC@kista> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Dne sreda, 20. oktober 2021 ob 13:06:59 CEST je Ezequiel Garcia napisal(a): > Hi Jernej, >=20 > On Tue, 19 Oct 2021 at 13:38, Jernej =C5=A0krabec =20 wrote: > > > > Hi Andrzej! > > > > Dne petek, 15. oktober 2021 ob 19:19:47 CEST je Andrzej Pietrasiewicz > > napisal(a): > > > Hi Jernej, > > > > > > W dniu 14.10.2021 o 19:42, Jernej =C5=A0krabec pisze: > > > > Hi Andrzej! > > > > > > > > Dne sreda, 29. september 2021 ob 18:04:39 CEST je Andrzej=20 Pietrasiewicz > > > > napisal(a): > > > >> The G2 decoder block produces NV12 4x4 tiled format (NV12_4L4). > > > >> Enable the G2 post-processor block, in order to produce regular NV= 12. > > > >> > > > >> The logic in hantro_postproc.c is leveraged to take care of=20 allocating > > > >> the extra buffers and configure the post-processor, which is > > > >> significantly simpler than the one on the G1. > > > > > > > > Quick summary of discussion on LibreELEC Slack: > > > > When using NV12 format on Allwinner H6 variant of G2 (needs some=20 driver > > > > changes), I get frames out of order. If I use native NV12 tiled=20 format, > > frames > > > > are ordered correctly. > > > > > > > > Currently I'm not sure if this is issue with my changes or is this= =20 general > > > > issue. > > > > > > > > I would be grateful if anyone can test frame order with and without > > > > postprocessing enabled on imx8. Take some dynamic video with a lot = of > > short > > > > scenes. It's pretty obvious when frames are out of order. > > > > > > > > > > I checked on imx8 and cannot observe any such artifacts. > > > > I finally found the issue. As you mentioned on Slack, register write or= der=20 once > > already affected decoding. Well, it's the case again. I made hacky test= and > > moved postproc enable call after output buffers are set and it worked. = So,=20 this > > is actually core quirk which is obviously fixed in newer variants. > > >=20 > Ugh, good catch. >=20 > What happens if you move all the calls to HANTRO_PP_REG_WRITE_S > (HANTRO_PP_REG_WRITE does a relaxed write)? >=20 > Or what happens if the HANTRO_PP_REG_WRITE(vpu, out_luma_base, dst_dma) > is moved to be done after all the other registers? Those two macros aren't used on G2. Andrzej introduced new postproc helpers= =20 for G2. This commit solves issue for H6: https://github.com/jernejsk/linux-1/commit/ a783a977c0843bb4b555dc9d0b5d64915cd219e7 >=20 > > This makes this series with minor adaptations completely working on H6.= I=20 see > > no reason not to merge whole series. > > >=20 > Do you have plans to submit your H6 work on top of this? Of course, why would I work on this otherwise? :) But before I do that, I h= ave=20 to clean up and split one commit, which adapts VP9 G2 code for H6 variant. If you're interested in changes, take a look here: https://github.com/jernejsk/linux-1/commits/vp9 Best regards, Jernej >=20 > Thanks, > Ezequiel >=20 >=20 > > Thanks for testing. > > > > Best regards, > > Jernej > > > > > > > > Andrzej > > > > > > > However, given that frames themself are correctly decoded and witho= ut > > > > postprocessing in right order, that shouldn't block merging previous > > patches. > > > > I tried few different videos and frames were all decoded correctly. > > > > > > > > Best regards, > > > > Jernej > > > > > > > >> > > > >> Signed-off-by: Ezequiel Garcia > > > >> Signed-off-by: Andrzej Pietrasiewicz > > > >> --- > > > >> .../staging/media/hantro/hantro_g2_vp9_dec.c | 6 ++-- > > > >> drivers/staging/media/hantro/hantro_hw.h | 1 + > > > >> .../staging/media/hantro/hantro_postproc.c | 31 +++++++++++++= +++ +++ > > > >> drivers/staging/media/hantro/imx8m_vpu_hw.c | 11 +++++++ > > > >> 4 files changed, 46 insertions(+), 3 deletions(-) > > > >> > > > >> diff --git a/drivers/staging/media/hantro/hantro_g2_vp9_dec.c b/ drivers/ > > > > staging/media/hantro/hantro_g2_vp9_dec.c > > > >> index 7f827b9f0133..1a26be72c878 100644 > > > >> --- a/drivers/staging/media/hantro/hantro_g2_vp9_dec.c > > > >> +++ b/drivers/staging/media/hantro/hantro_g2_vp9_dec.c > > > >> @@ -152,7 +152,7 @@ static void config_output(struct hantro_ctx *c= tx, > > > >> hantro_reg_write(ctx->dev, &g2_out_dis, 0); > > > >> hantro_reg_write(ctx->dev, &g2_output_format, 0); > > > >> > > > >> - luma_addr =3D vb2_dma_contig_plane_dma_addr(&dst->base.vb.vb2_b= uf, > > > > 0); > > > >> + luma_addr =3D hantro_get_dec_buf_addr(ctx, &dst->base.vb.vb2_bu= f); > > > >> hantro_write_addr(ctx->dev, G2_OUT_LUMA_ADDR, luma_addr); > > > >> > > > >> chroma_addr =3D luma_addr + chroma_offset(ctx, dec_params); > > > >> @@ -191,7 +191,7 @@ static void config_ref(struct hantro_ctx *ctx, > > > >> hantro_reg_write(ctx->dev, &ref_reg->hor_scale, (refw << 14) / > > > > dst->vp9.width); > > > >> hantro_reg_write(ctx->dev, &ref_reg->ver_scale, (refh << 14) / > > > > dst->vp9.height); > > > >> > > > >> - luma_addr =3D vb2_dma_contig_plane_dma_addr(&buf->base.vb.vb2_b= uf, > > > > 0); > > > >> + luma_addr =3D hantro_get_dec_buf_addr(ctx, &buf->base.vb.vb2_bu= f); > > > >> hantro_write_addr(ctx->dev, ref_reg->y_base, luma_addr); > > > >> > > > >> chroma_addr =3D luma_addr + chroma_offset(ctx, dec_params); > > > >> @@ -236,7 +236,7 @@ static void config_ref_registers(struct hantro= _ctx > > *ctx, > > > >> config_ref(ctx, dst, &ref_regs[1], dec_params, dec_params- > > > >> golden_frame_ts); > > > >> config_ref(ctx, dst, &ref_regs[2], dec_params, dec_params- > > > >> alt_frame_ts); > > > >> > > > >> - mv_addr =3D vb2_dma_contig_plane_dma_addr(&mv_ref->base.vb.vb2_= buf, > > > > 0) + > > > >> + mv_addr =3D hantro_get_dec_buf_addr(ctx, &mv_ref->base.vb.vb2_b= uf) + > > > >> mv_offset(ctx, dec_params); > > > >> hantro_write_addr(ctx->dev, G2_REF_MV_ADDR(0), mv_addr); > > > >> > > > >> diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/ staging/ > > > > media/hantro/hantro_hw.h > > > >> index 2961d399fd60..3d4a5dc1e6d5 100644 > > > >> --- a/drivers/staging/media/hantro/hantro_hw.h > > > >> +++ b/drivers/staging/media/hantro/hantro_hw.h > > > >> @@ -274,6 +274,7 @@ extern const struct hantro_variant > > rk3399_vpu_variant; > > > >> extern const struct hantro_variant sama5d4_vdec_variant; > > > >> > > > >> extern const struct hantro_postproc_ops hantro_g1_postproc_ops; > > > >> +extern const struct hantro_postproc_ops hantro_g2_postproc_ops; > > > >> > > > >> extern const u32 hantro_vp8_dec_mc_filter[8][6]; > > > >> > > > >> diff --git a/drivers/staging/media/hantro/hantro_postproc.c b/driv= ers/ > > > > staging/media/hantro/hantro_postproc.c > > > >> index 4549aec08feb..79a66d001738 100644 > > > >> --- a/drivers/staging/media/hantro/hantro_postproc.c > > > >> +++ b/drivers/staging/media/hantro/hantro_postproc.c > > > >> @@ -11,6 +11,7 @@ > > > >> #include "hantro.h" > > > >> #include "hantro_hw.h" > > > >> #include "hantro_g1_regs.h" > > > >> +#include "hantro_g2_regs.h" > > > >> > > > >> #define HANTRO_PP_REG_WRITE(vpu, reg_name, val) \ > > > >> { \ > > > >> @@ -99,6 +100,21 @@ static void hantro_postproc_g1_enable(struct > > hantro_ctx > > > > *ctx) > > > >> HANTRO_PP_REG_WRITE(vpu, display_width, ctx->dst_fmt.width); > > > >> } > > > >> > > > >> +static void hantro_postproc_g2_enable(struct hantro_ctx *ctx) > > > >> +{ > > > >> + struct hantro_dev *vpu =3D ctx->dev; > > > >> + struct vb2_v4l2_buffer *dst_buf; > > > >> + size_t chroma_offset =3D ctx->dst_fmt.width * ctx->dst_fmt.heig= ht; > > > >> + dma_addr_t dst_dma; > > > >> + > > > >> + dst_buf =3D hantro_get_dst_buf(ctx); > > > >> + dst_dma =3D vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0); > > > >> + > > > >> + hantro_write_addr(vpu, G2_RS_OUT_LUMA_ADDR, dst_dma); > > > >> + hantro_write_addr(vpu, G2_RS_OUT_CHROMA_ADDR, dst_dma + > > > > chroma_offset); > > > >> + hantro_reg_write(vpu, &g2_out_rs_e, 1); > > > >> +} > > > >> + > > > >> void hantro_postproc_free(struct hantro_ctx *ctx) > > > >> { > > > >> struct hantro_dev *vpu =3D ctx->dev; > > > >> @@ -127,6 +143,9 @@ int hantro_postproc_alloc(struct hantro_ctx *c= tx) > > > >> if (ctx->vpu_src_fmt->fourcc =3D=3D V4L2_PIX_FMT_H264_SLICE) > > > >> buf_size +=3D hantro_h264_mv_size(ctx->dst_fmt.width, > > > >> ctx- > > > >> dst_fmt.height); > > > >> + else if (ctx->vpu_src_fmt->fourcc =3D=3D V4L2_PIX_FMT_VP9_FRAME) > > > >> + buf_size +=3D hantro_vp9_mv_size(ctx->dst_fmt.width, > > > >> + ctx- > > > >> dst_fmt.height); > > > >> > > > >> for (i =3D 0; i < num_buffers; ++i) { > > > >> struct hantro_aux_buf *priv =3D &ctx->postproc.dec_q[i]; > > > >> @@ -152,6 +171,13 @@ static void hantro_postproc_g1_disable(struct > > > > hantro_ctx *ctx) > > > >> HANTRO_PP_REG_WRITE_S(vpu, pipeline_en, 0x0); > > > >> } > > > >> > > > >> +static void hantro_postproc_g2_disable(struct hantro_ctx *ctx) > > > >> +{ > > > >> + struct hantro_dev *vpu =3D ctx->dev; > > > >> + > > > >> + hantro_reg_write(vpu, &g2_out_rs_e, 0); > > > >> +} > > > >> + > > > >> void hantro_postproc_disable(struct hantro_ctx *ctx) > > > >> { > > > >> struct hantro_dev *vpu =3D ctx->dev; > > > >> @@ -172,3 +198,8 @@ const struct hantro_postproc_ops > > hantro_g1_postproc_ops > > > > =3D { > > > >> .enable =3D hantro_postproc_g1_enable, > > > >> .disable =3D hantro_postproc_g1_disable, > > > >> }; > > > >> + > > > >> +const struct hantro_postproc_ops hantro_g2_postproc_ops =3D { > > > >> + .enable =3D hantro_postproc_g2_enable, > > > >> + .disable =3D hantro_postproc_g2_disable, > > > >> +}; > > > >> diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/ > > staging/ > > > > media/hantro/imx8m_vpu_hw.c > > > >> index 455a107ffb02..1a43f6fceef9 100644 > > > >> --- a/drivers/staging/media/hantro/imx8m_vpu_hw.c > > > >> +++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c > > > >> @@ -132,6 +132,14 @@ static const struct hantro_fmt=20 imx8m_vpu_dec_fmts[] > > =3D { > > > >> }, > > > >> }; > > > >> > > > >> +static const struct hantro_fmt imx8m_vpu_g2_postproc_fmts[] =3D { > > > >> + { > > > >> + .fourcc =3D V4L2_PIX_FMT_NV12, > > > >> + .codec_mode =3D HANTRO_MODE_NONE, > > > >> + .postprocessed =3D true, > > > >> + }, > > > >> +}; > > > >> + > > > >> static const struct hantro_fmt imx8m_vpu_g2_dec_fmts[] =3D { > > > >> { > > > >> .fourcc =3D V4L2_PIX_FMT_NV12_4L4, > > > >> @@ -301,6 +309,9 @@ const struct hantro_variant imx8mq_vpu_g2_vari= ant=20 =3D { > > > >> .dec_offset =3D 0x0, > > > >> .dec_fmts =3D imx8m_vpu_g2_dec_fmts, > > > >> .num_dec_fmts =3D ARRAY_SIZE(imx8m_vpu_g2_dec_fmts), > > > >> + .postproc_fmts =3D imx8m_vpu_g2_postproc_fmts, > > > >> + .num_postproc_fmts =3D ARRAY_SIZE(imx8m_vpu_g2_postproc_fmts), > > > >> + .postproc_ops =3D &hantro_g2_postproc_ops, > > > >> .codec =3D HANTRO_HEVC_DECODER | HANTRO_VP9_DECODER, > > > >> .codec_ops =3D imx8mq_vpu_g2_codec_ops, > > > >> .init =3D imx8mq_vpu_hw_init, > > > >> -- > > > >> 2.17.1 > > > >> > > > >> > > > > > > > > > > > > > > > > > > >=20