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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 D1369ECE58E for ; Tue, 8 Oct 2019 10:42:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2EFC20815 for ; Tue, 8 Oct 2019 10:42:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Nz5DCDDh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730375AbfJHKm0 (ORCPT ); Tue, 8 Oct 2019 06:42:26 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45170 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730016AbfJHKm0 (ORCPT ); Tue, 8 Oct 2019 06:42:26 -0400 Received: by mail-ed1-f65.google.com with SMTP id h33so15150611edh.12 for ; Tue, 08 Oct 2019 03:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GlbSEHsat/uhnrc6ji92FO04rhx1+BWt+c9sCRWvAxU=; b=Nz5DCDDhGBHxplALcQZGaCTG5mV3Z4jpVK314QjWtvnqS7b/x79n6UlR6EKH0pSuUQ Ta/sGeucBtoOKc+GGpsFuh0ci0OIaG75nGDsmjab/9c8JpYDC99GMBB80ipOn3+cbiHW Dl8tvsmwndue4YZ60xP4Q3cHJpGZlDwOeSr0s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GlbSEHsat/uhnrc6ji92FO04rhx1+BWt+c9sCRWvAxU=; b=BsJdgUrMYiAj8zogBUaFagrVj+5AENJNOUPheSFCZSaZeml4FH4yFBhOfxQC0jb1sg MGWqpl4+Dt20nqj6E6EOFhYumKPFQhIk6tvx1oV8elvctLD9Gg1+fAy/k8+67z9uvJQm jjaXco6AhqtPJwiEiAnKZWBN6gTKvBiKhLsRRaiBD3rXao4TvAGp/guQX4PN5doqM93L mEKH4wTwBx15d896qgiSXI1B1k9SWK9g8sKuzG24+FIzD4TTgnI/ck0fmPcEF6h6zzxb XFPWbGJGLG8OVXGQqXcBSKoZNmbZHBbQR8pHs75RzIt5fhmHQhG8I4E8mC7GC98axCCu /gug== X-Gm-Message-State: APjAAAVLQb21Lq6EbHDjq0vG84UzUPGSaZ7cbqiQHHxsluasCtK0Nm7f d9ZlGZe/8SF09yYe9PtA0vHWOVAKckN+Tw== X-Google-Smtp-Source: APXvYqzUMIwzZNMT2+WaenCPba9HinxNapifRSjXyXwqdMFVEz0IQE/VkLyAU3L/qQ1YSSCYphB2qA== X-Received: by 2002:a17:906:c7d4:: with SMTP id dc20mr28124558ejb.235.1570531342912; Tue, 08 Oct 2019 03:42:22 -0700 (PDT) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com. [209.85.221.42]) by smtp.gmail.com with ESMTPSA id gx14sm2231236ejb.38.2019.10.08.03.42.20 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Oct 2019 03:42:21 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id r5so18735704wrm.12 for ; Tue, 08 Oct 2019 03:42:20 -0700 (PDT) X-Received: by 2002:a5d:4b47:: with SMTP id w7mr20090970wrs.7.1570531340404; Tue, 08 Oct 2019 03:42:20 -0700 (PDT) MIME-Version: 1.0 References: <20191007174505.10681-1-ezequiel@collabora.com> <20191007174505.10681-3-ezequiel@collabora.com> In-Reply-To: From: Tomasz Figa Date: Tue, 8 Oct 2019 19:42:09 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 for 5.4 2/4] media: hantro: Fix H264 max frmsize supported on RK3288 To: Jonas Karlman Cc: Ezequiel Garcia , Linux Media Mailing List , "kernel@collabora.com" , Nicolas Dufresne , "open list:ARM/Rockchip SoC..." , Heiko Stuebner , Philipp Zabel , Boris Brezillon , Alexandre Courbot , "fbuergisser@chromium.org" , Linux Kernel Mailing List , Douglas Anderson Content-Type: text/plain; charset="UTF-8" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Tue, Oct 8, 2019 at 3:31 PM Jonas Karlman wrote: > > On 2019-10-08 07:27, Tomasz Figa wrote: > > Hi Ezequiel, Jonas, > > > > On Tue, Oct 8, 2019 at 2:46 AM Ezequiel Garcia wrote: > >> From: Jonas Karlman > >> > >> TRM specify supported image size 48x48 to 4096x2304 at step size 16 pixels, > >> change frmsize max_width/max_height to match TRM. > >> > >> Fixes: 760327930e10 ("media: hantro: Enable H264 decoding on rk3288") > >> Signed-off-by: Jonas Karlman > >> --- > >> v2: > >> * No changes. > >> > >> 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 6bfcc47d1e58..ebb017b8a334 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 = H264_MB_DIM, > >> .min_height = 48, > >> - .max_height = 2160, > >> + .max_height = 2304, > > This doesn't match the datasheet I have, which is RK3288 Datasheet Rev > > 1.4 and which has the values as in current code. What's the one you > > got the values from? > > The RK3288 TRM vcodec chapter from [1], unknown revision and date, lists 48x48 to 4096x2304 step size 16 pixels under 25.5.1 H.264 decoder. > > I can also confirm that one of my test samples (PUPPIES BATH IN 4K) is 4096x2304 and can be decoded after this patch. > However the decoding speed is not optimal at 400Mhz, if I recall correctly you need to set the VPU1 clock to 600Mhz for 4K decoding on RK3288. > > I am not sure if I should include a v2 of this patch in my v2 series, as-is this patch do not apply on master (H264_MB_DIM has changed to MB_DIM in master). > > [1] http://www.t-firefly.com/download/firefly-rk3288/docs/TRM/rk3288-chapter-25-video-encoder-decoder-unit-(vcodec).pdf I checked the RK3288 TRM V1.1 too and it refers to 3840x2160@24fps as the maximum. As for performance, we've actually been getting around 33 fps at 400 MHz with 3840x2160 on our devices (the old RK3288 Asus Chromebook Flip). I guess we might want to check that with Hantro. Best regards, Tomasz