On Tue, Oct 8, 2019 at 7:42 PM Tomasz Figa <tf...@chromium.org> wrote: > > On Tue, Oct 8, 2019 at 3:31 PM Jonas Karlman <jo...@kwiboo.se> wrote: > > > > On 2019-10-08 07:27, Tomasz Figa wrote: > > > Hi Ezequiel, Jonas, > > > > > > On Tue, Oct 8, 2019 at 2:46 AM Ezequiel Garcia <ezequ...@collabora.com> > > > wrote: > > >> From: Jonas Karlman <jo...@kwiboo.se> > > >> > > >> 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 <jo...@kwiboo.se> > > >> --- > > >> 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.
Could you check the value of bits 10:0 in register at 0x0c8? That should be the maximum supported stream width in the units of 16 pixels. Best regards, Tomasz