From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FD5BC3A5A7 for ; Wed, 4 Sep 2019 10:13:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F2132339D for ; Wed, 4 Sep 2019 10:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726495AbfIDKNf (ORCPT ); Wed, 4 Sep 2019 06:13:35 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:43565 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725840AbfIDKNf (ORCPT ); Wed, 4 Sep 2019 06:13:35 -0400 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1i5SIA-0000GT-8m; Wed, 04 Sep 2019 12:13:34 +0200 Message-ID: <1567592011.3041.1.camel@pengutronix.de> Subject: Re: [PATCH for 5.4] media: hantro: Fix s_fmt for dynamic resolution changes From: Philipp Zabel To: Ezequiel Garcia , linux-media@vger.kernel.org Cc: kernel@collabora.com, Nicolas Dufresne , Tomasz Figa , linux-rockchip@lists.infradead.org, Heiko Stuebner , Jonas Karlman , Boris Brezillon , Alexandre Courbot , fbuergisser@chromium.org, linux-kernel@vger.kernel.org Date: Wed, 04 Sep 2019 12:13:31 +0200 In-Reply-To: <20190903171256.25052-1-ezequiel@collabora.com> References: <20190903171256.25052-1-ezequiel@collabora.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Ezequiel, On Tue, 2019-09-03 at 14:12 -0300, Ezequiel Garcia wrote: > Commit 953aaa1492c53 ("media: rockchip/vpu: Prepare things to support decoders") > changed the conditions under S_FMT was allowed for OUTPUT > CAPTURE buffers. > > However, and according to the mem-to-mem stateless decoder specification, > in order to support dynamic resolution changes, S_FMT should be allowed > even if OUTPUT buffers have been allocated. > > Relax decoder S_FMT restrictions on OUTPUT buffers, allowing a resolution > modification, provided the pixel format stays the same. > > Tested on RK3288 platforms using ChromiumOS Video Decode/Encode Accelerator Unittests. > > Fixes: 953aaa1492c53 ("media: rockchip/vpu: Prepare things to support decoders") > Signed-off-by: Ezequiel Garcia > --- > drivers/staging/media/hantro/hantro_v4l2.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c > index 3dae52abb96c..d48b548842cf 100644 > --- a/drivers/staging/media/hantro/hantro_v4l2.c > +++ b/drivers/staging/media/hantro/hantro_v4l2.c > @@ -367,19 +367,22 @@ vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f) > { > struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; > struct hantro_ctx *ctx = fh_to_ctx(priv); > + struct vb2_queue *vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); > const struct hantro_fmt *formats; > unsigned int num_fmts; > - struct vb2_queue *vq; > int ret; > > - /* Change not allowed if queue is busy. */ > - vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); > - if (vb2_is_busy(vq)) > - return -EBUSY; > - > if (!hantro_is_encoder_ctx(ctx)) { > struct vb2_queue *peer_vq; > > + /* > + * In other to support dynamic resolution change, > + * the decoder admits a resolution change, as long > + * as the pixelformat remains. Can't be done if streaming. > + */ > + if (vb2_is_streaming(vq) || (vb2_is_busy(vq) && > + pix_mp->pixelformat != ctx->src_fmt.pixelformat)) Before using contents of the v4l2_format f for comparison, we should run vidioc_try_fmt_out_mplane over it. Also, besides pixelformat, sizeimage shouldn't change either, at least if this is a VB2_MMAP queue. > + return -EBUSY; > /* > * Since format change on the OUTPUT queue will reset > * the CAPTURE queue, we can't allow doing so > @@ -389,6 +392,13 @@ vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f) > V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); > if (vb2_is_busy(peer_vq)) > return -EBUSY; > + } else { > + /* > + * The encoder doesn't admit a format change if > + * there are OUTPUT buffers allocated. > + */ > + if (vb2_is_busy(vq)) > + return -EBUSY; > } > > ret = vidioc_try_fmt_out_mplane(file, priv, f); I think this needs to be moved up. regards Philipp