From patchwork Mon May 10 10:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433074 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2723733jao; Mon, 10 May 2021 04:01:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC3f66bfEgukb5aBF0FUR+F03z4SoG5co002tDM6QB37AF4K9QyPuoEC0FugpkwIec9LB7 X-Received: by 2002:aa7:dbcd:: with SMTP id v13mr28484017edt.59.1620644489096; Mon, 10 May 2021 04:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620644489; cv=none; d=google.com; s=arc-20160816; b=B264vkUM2FxgVlMJ8Ac8mk7lRfRyqTRgMhrTYA01t4cHatdtbDzBA6Z5B2oFcBp1rB v8+/pA4aIHxEq+i9K+69FnDemBt5m3iRiLmHCAHrvrzfBaECiWPZtjM4txl5ZjHTbhGu fGRacOnmFOYVV1PZ+hGxmy+6WxIUemW1Sk3AuVwwSs1p9vIbzBalNwDn4WafACz5rj9D jmcJfEecX3xzti3iv9RVbctx+CiFzVQrv/VI/bPXpLFdju6VAXBu7rwFkAg+atQWaBPg tSGbjfH2hyQuKg+q8awrjePEX0f9ywOX9XBHujfmpcqNTffO1k8uWrzT9pyGu7LkR6ts Nlnw== 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=af10P2Coc5/v+6QxJxgb3pFALuZsucVRvqv0JuX17BcBNTAFnXaazEA/KDFzBUzWVA CVvFUWtInrC7HcPr6PE1mkbqCedXaWchqou5OBAGkQ/ckuKUr/8mMs+HiN8zB/UnnK+8 /6riwjb2JQUu1f2+93zcfBSnmCHRQ62WLJNrEej+Jew7i+kkx/rwQ9YNFLLQThFa+TaH r7bjKyGAEO8Cg1QjIW97LZIoDNuc5rKHLQibHCm2CDqzob7AUvD+a88yj71Xo3fTE+kc uYGowiI6AcGZCR9CdS2y6fp6warblmJXv12XZomL9rO7K+DTlknju0+k/rCYAR3KI+Ci JzoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XBpHrOD3; 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.04.01.28; Mon, 10 May 2021 04:01:29 -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=XBpHrOD3; 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 S233487AbhEJK7O (ORCPT + 12 others); Mon, 10 May 2021 06:59:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:46508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233791AbhEJKzN (ORCPT ); Mon, 10 May 2021 06:55:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 738B561C20; Mon, 10 May 2021 10:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643350; bh=w56GKKRSKsUXp2KwYjgoI/xukSB8s82weg6AdfZw8fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBpHrOD3Wy2x27lDmkuxLiOevsF4uxt+2g52KjyV4VzNmHHCCbU0cvwmc/EGgK8uF QY1eW0lhgYkeGERsPq8v7MHRfnv0dp4HY7n5CpBxCWRrlizVeYoXmsj+SQocZ+4m1r lPVz1Y+5f7JqtT81x0/b6/yNr7iJbyHmZzskNSW8= 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.10 280/299] media: venus: hfi_parser: Dont initialize parser on v1 Date: Mon, 10 May 2021 12:21:17 +0200 Message-Id: <20210510102014.181272991@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102004.821838356@linuxfoundation.org> References: <20210510102004.821838356@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;