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 346A1CA9EC3 for ; Thu, 31 Oct 2019 08:52:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 102B02087F for ; Thu, 31 Oct 2019 08:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727149AbfJaIwo (ORCPT ); Thu, 31 Oct 2019 04:52:44 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:44940 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbfJaIwo (ORCPT ); Thu, 31 Oct 2019 04:52:44 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id E06E028FA70; Thu, 31 Oct 2019 08:52:41 +0000 (GMT) Date: Thu, 31 Oct 2019 09:52:38 +0100 From: Boris Brezillon To: Mauro Carvalho Chehab , Hans Verkuil Cc: Jonas Karlman , Ezequiel Garcia , Tomasz Figa , Philipp Zabel , "linux-media@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2 01/10] media: hantro: Fix H264 max frmsize supported on RK3288 Message-ID: <20191031095238.683b69d9@collabora.com> In-Reply-To: References: Organization: Collabora X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 29 Oct 2019 01:24:47 +0000 Jonas Karlman wrote: > TRM specify supported image size 48x48 to 4096x2304 at step size 16 pixels, > change frmsize max_width/max_height to match TRM at [1]. > > This patch makes it possible to decode the 4096x2304 sample at [2]. > > [1] http://www.t-firefly.com/download/firefly-rk3288/docs/TRM/rk3288-chapter-25-video-encoder-decoder-unit-(vcodec).pdf > [2] https://4ksamples.com/puppies-bath-in-4k/ > > Fixes: 760327930e10 ("media: hantro: Enable H264 decoding on rk3288") > Signed-off-by: Jonas Karlman Reviewed-by: Boris Brezillon Tested-by: Boris Brezillon Let's also add Cc: just in case this patch doesn't make it to 5.4. > --- > Changes in v2: > - updated commit message with reference to TRM and sample video > --- > drivers/staging/media/hantro/rk3288_vpu_hw.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c > index c0bdd6c02520..f8db6fcaad73 100644 > --- a/drivers/staging/media/hantro/rk3288_vpu_hw.c > +++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c > @@ -67,10 +67,10 @@ static const struct hantro_fmt rk3288_vpu_dec_fmts[] = { > .max_depth = 2, > .frmsize = { > .min_width = 48, > - .max_width = 3840, > + .max_width = 4096, > .step_width = MB_DIM, > .min_height = 48, > - .max_height = 2160, > + .max_height = 2304, > .step_height = MB_DIM, Hans, Mauro, we were intending to have this fix merged in 5.4 or at the very least be backported to the 5.4 stable branch at some point, the problem is, this patch is based on media/master which contains the s/MB_DIM_H264/MB_DIM/ change. I can send a new version based on media/fixes, but that means Linus will have a conflict when merging the media 5.5 PR in his tree. Are you fine dealing with this conflict (letting Linus know about the expected resolution or backmerging the -rc containing the fix in media/master so that he doesn't even have to deal with it), or should we just let this patch go in media/master and backport it later? > }, > },