From patchwork Mon May 10 10:21:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433098 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2775054jao; Mon, 10 May 2021 05:06:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG/ziquboTsiGh9SIW4T3QpxUxmai7g9gAZrImUhZy2Ff+6idRtFqmjFvOIGBWAumXNjHU X-Received: by 2002:a05:6402:3546:: with SMTP id f6mr29166373edd.267.1620648382415; Mon, 10 May 2021 05:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620648382; cv=none; d=google.com; s=arc-20160816; b=Uz53tN2HERRg27XsAjpLU+e35RQuAAm6scyALqNv+rPfa2dd0Pseaq48rb5lfCtjOp iUvn5i+eJxR3w5q9/9LTFa22ruLCq8czj9ZLuy6mpkO+dsyWXBpAS9iYmM6kitz62yUm NwQuTmpuebJlGVosOTz8zmOfNn01HYFws9KD3dobA2venMKE37/smYho1M38QLjZl5PJ G09YzwvxlcVMZ0jyJD9+tN5EA+Xp+nXGYbwRylShU1/HfMK8uIsht85WvMjXA7TMbAZZ qEMNRAd/P8ssfpapReYrgv5PtBx8cvMt7Gy9s9g/Q57BkA1alFhCvVz5wfYxkwPo+H3s 53Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U1UN/X9GFJyB3g8rLIGh+fPPjSS6soSgfm+tlnK5b/0=; b=ORfuy+zO+TuS5RvlOUQ9nSW7yEbx9rixqSeHHuGpDJ9LScHVRDRPGezKuuL3TLRvmY qDJsLytn6he2mnj0VuJGyMMMrbZ+TIqNyOmOHG8Njic3/vOp96F+TjZmD/OVCCOdk+vU KA17qQc8QkY37RyQaG9MvAzhj1LvnVSjsEr4YeblvKbRgFiSxA9vmVbugjC2zeSg2Zmg B96ZoFO+mAzJbMxumKfZVm9Oc2QUDLu5s7G0Kawa38hw6TA1di6/RxgwjzUiqNfxxbDr ayh1s3p/0r4McKg5Y31K/qS5vNMcp+dA74RpMkUfbVejG4vi7wElQSU4gvQp/hzGuZh5 Xj9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R7WylEer; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.05.06.22; Mon, 10 May 2021 05:06:22 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R7WylEer; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236172AbhEJLTz (ORCPT + 12 others); Mon, 10 May 2021 07:19:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:45604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236029AbhEJLHS (ORCPT ); Mon, 10 May 2021 07:07:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C94661936; Mon, 10 May 2021 10:57:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644255; bh=w56GKKRSKsUXp2KwYjgoI/xukSB8s82weg6AdfZw8fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R7WylEerVNtDBtjac9Lzo/8pIc+BR/1rEFHV559btb8UC7LgCPMj9wEDAx+KXdQPy nMZfl+/LEqZPFsPzwG2rhTF5ZwKua2ZYCXK0SIkL6mjEXFvy0NEv5tPGnlbmhnuITT AaJfi3+YuAM7Zb4QlFTIdhtwiZGDzbjbKjW/Nq2I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanimir Varbanov , Bryan ODonoghue , Mauro Carvalho Chehab Subject: [PATCH 5.11 321/342] media: venus: hfi_parser: Dont initialize parser on v1 Date: Mon, 10 May 2021 12:21:51 +0200 Message-Id: <20210510102020.724146053@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanimir Varbanov commit 834124c596e2dddbbdba06620835710ccca32fd0 upstream. The Venus v1 behaves differently comparing with the other Venus version in respect to capability parsing and when they are send to the driver. So we don't need to initialize hfi parser for multiple invocations like what we do for > v1 Venus versions. Fixes: 10865c98986b ("media: venus: parser: Prepare parser for multiple invocations") Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Stanimir Varbanov Tested-by: Bryan O'Donoghue Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/hfi_parser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/media/platform/qcom/venus/hfi_parser.c +++ b/drivers/media/platform/qcom/venus/hfi_parser.c @@ -239,8 +239,10 @@ u32 hfi_parser(struct venus_core *core, parser_init(inst, &codecs, &domain); - core->codecs_count = 0; - memset(core->caps, 0, sizeof(core->caps)); + if (core->res->hfi_version > HFI_VERSION_1XX) { + core->codecs_count = 0; + memset(core->caps, 0, sizeof(core->caps)); + } while (words_count) { data = word + 1;