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 DA42DCA9EC3 for ; Thu, 31 Oct 2019 08:58:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B24E72083E for ; Thu, 31 Oct 2019 08:58:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727068AbfJaI6T (ORCPT ); Thu, 31 Oct 2019 04:58:19 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:44978 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726875AbfJaI6T (ORCPT ); Thu, 31 Oct 2019 04:58:19 -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 7076328FC69; Thu, 31 Oct 2019 08:58:17 +0000 (GMT) Date: Thu, 31 Oct 2019 09:58:14 +0100 From: Boris Brezillon To: Jonas Karlman , Tomasz Figa Cc: Mauro Carvalho Chehab , Ezequiel Garcia , Francois Buergisser , Hans Verkuil , Philipp Zabel , "linux-media@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2 02/10] media: hantro: Fix motion vectors usage condition Message-ID: <20191031095814.25112ba0@collabora.com> In-Reply-To: References: <20191029012430.24566-1-jonas@kwiboo.se> 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: > From: Francois Buergisser > > The setting of the motion vectors usage and the setting of motion > vectors address are currently done under different conditions. > > When decoding pre-recorded videos, this results of leaving the motion > vectors address unset, resulting in faulty memory accesses. Fix it > by using the same condition everywhere, which matches the profiles > that support motion vectors. > > Fixes: dea0a82f3d22 ("media: hantro: Add support for H264 decoding on G1") > Signed-off-by: Francois Buergisser > Signed-off-by: Ezequiel Garcia > Signed-off-by: Jonas Karlman Reviewed-by: Boris Brezillon Tested-by: Boris Brezillon This fix should apply cleanly to media/fixes. Would be great to have it queued for 5.4-rc6 so we don't have to backport it manually. > --- > drivers/staging/media/hantro/hantro_g1_h264_dec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c > index 29130946dea4..a1cb18680200 100644 > --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c > +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c > @@ -35,7 +35,7 @@ static void set_params(struct hantro_ctx *ctx) > if (sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD) > reg |= G1_REG_DEC_CTRL0_SEQ_MBAFF_E; > reg |= G1_REG_DEC_CTRL0_PICORD_COUNT_E; > - if (dec_param->nal_ref_idc) > + if (sps->profile_idc > 66 && dec_param->nal_ref_idc) > reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E; > > if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY) && > @@ -245,7 +245,7 @@ static void set_buffers(struct hantro_ctx *ctx) > vdpu_write_relaxed(vpu, dst_dma, G1_REG_ADDR_DST); > > /* Higher profiles require DMV buffer appended to reference frames. */ > - if (ctrls->sps->profile_idc > 66) { > + if (ctrls->sps->profile_idc > 66 && ctrls->decode->nal_ref_idc) { > size_t pic_size = ctx->h264_dec.pic_size; > size_t mv_offset = round_up(pic_size, 8); >