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_1 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 25236CA9ECE for ; Fri, 1 Nov 2019 08:37:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F14092080F for ; Fri, 1 Nov 2019 08:37:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726755AbfKAIhZ (ORCPT ); Fri, 1 Nov 2019 04:37:25 -0400 Received: from lb2-smtp-cloud9.xs4all.net ([194.109.24.26]:35515 "EHLO lb2-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726636AbfKAIhY (ORCPT ); Fri, 1 Nov 2019 04:37:24 -0400 Received: from [IPv6:2001:983:e9a7:1:8c66:a727:bbe6:d244] ([IPv6:2001:983:e9a7:1:8c66:a727:bbe6:d244]) by smtp-cloud9.xs4all.net with ESMTPA id QSQRik7i3sBskQSQSiTkxp; Fri, 01 Nov 2019 09:37:22 +0100 Subject: Re: [PATCH v2 01/10] media: hantro: Fix H264 max frmsize supported on RK3288 To: Boris Brezillon , Mauro Carvalho Chehab Cc: Jonas Karlman , Ezequiel Garcia , Tomasz Figa , Philipp Zabel , "linux-media@vger.kernel.org" , "linux-kernel@vger.kernel.org" References: <20191031095238.683b69d9@collabora.com> From: Hans Verkuil Message-ID: <77df1d5a-5c53-00c0-3d32-063341dde55e@xs4all.nl> Date: Fri, 1 Nov 2019 09:36:55 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191031095238.683b69d9@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfB2uUZXiFXXgr2vo17Eg+w/SoGCEqJ0WHo8JmU547gcfwnCu6lvTLAEdJ7bPHEpH3w2zRrZn1ZDEmyPvnEwwLdaAC/9x+9QlAyc0WCKlEo8uxBdBGie3 vorMjNj2O03EEVFxPlhJ6BzDckNeIit7s6pzlCUFLQ8/jkTXf4vlZxfA4CwfxmuRVq1OW1xLd5sHNDWTbdEmTnR4zNHwZ4eJhmrMtLs50hNAsclofc5yYNKj c+1lpqaCEbraOSa//0pG8mHDtFPtUYwfhZITStU/84u1yR/oVsf/xDpQloz/O4nYwEH3SIDmi4lIGUK4D3qcN/aPeSQ7zBUxDt70hFTY6WOAtuqWBtUNBpNM APWbAcK6Js+jsPgjGN6iK9M3LNdGRIaVDOqJy7FYUGzZpMZF1DG6s3majRbi77J5RK6ZeUue/DDG/i9CaS6AaWWzSuTRgXyAWq/6OE3/cEqumWlEMHo9/DVe zA/92x/K5aCl7tNDAPJ61nyHces0rD12k03yzcyKbC/8g65zMYk8ajc110Q= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/31/19 9:52 AM, Boris Brezillon wrote: > 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? Backport it later once it is merged in mainline. This patch doesn't fix a bug, it is really an enhancement, so I think this can safely be delayed. Regards, Hans > >> }, >> }, >