From patchwork Mon May 10 10:22:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 433137 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2823450jao; Mon, 10 May 2021 06:06:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjTWFKvLJE0APML7upqMFt88SVykw+jypZ9BRzljuT6SDjMfOqasRQVEe8QlGNOeqdQLlV X-Received: by 2002:a05:6602:229a:: with SMTP id d26mr17673656iod.201.1620651986458; Mon, 10 May 2021 06:06:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620651986; cv=none; d=google.com; s=arc-20160816; b=cYllFX6LtlF++aCQIkZRdMTqVt8CZel5akwEWeYoRjPCQi50fOlTmWSivcf1vyWdAL 5J0FuGWUSzY9wpGNUhzBoZ6eQnDuQWYY2seednqRuHtX5k4Yey0GqgyLx6KbUOQ41kOk LOHPRihv4ch9xq5UnBBXZUEGx/Jpro3OnhooR6GKUPiq+10inwGUvm0Oi0SieivDSwCm A/CWFPwHsfqi7sWcDl/u93HjLD8c+tWi4m6NctiCzs9Q0I5vtnKBzGkHazfovkTKi6wM rfmo4at8EpB8svSV+/OfrxJPeNN0kkdz6SN3pk83Ar4c8gf79e1LSDDbqL+IiGcstn4D Ejdw== 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=lUOnlqxqdTkMIqTBiZa7XQeFbDta01tdggaVknmDDu0=; b=D3SeVlgrmUcE03DKD00EgR4asMUF7XNgvLiWcl90e8Ol0HoccySIm79RwygroLAhx+ 5e2iO6E9p+stJNEcf8xzN3+X1CuW8eSnnfafpi/CE3+8wA2KL3jJzYIZW6bynCbo8idx vSuCG5CSTzWTh9aUEtjy5nnB7Sv80uqy/mlmwNPcIegsGInM6ieaVQsRPqronmzmti2E pM3IX6UCYNkgYSIuX4KuUoC3Sz0OKEi1gFMjGj1MqLy2upG6BQgjusKbfPXFtsaHeRlA J9AVjNTnEpNChgCCltO1vKRS9E3piFEFBQHCvEe/nDedpJhOI75f12l9Jv2ja2jmbEWx DHlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sf25gloB; 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 q8si16406157ior.12.2021.05.10.06.06.26; Mon, 10 May 2021 06:06:26 -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=sf25gloB; 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 S237780AbhEJLZf (ORCPT + 12 others); Mon, 10 May 2021 07:25:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:58594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237967AbhEJLQh (ORCPT ); Mon, 10 May 2021 07:16:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0561F61353; Mon, 10 May 2021 11:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620645110; bh=/iQjd1ykf2bloP9F7xz47ROi+StHkNhizecZjYWQNVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sf25gloBSJWsGc2HggboZ/oniBMOUxjnr8Xew+k1DzMYlXLpyOCwWTVhKZbeuv/og NRmAgFOySgrD8jJyw9SUeJQSY/Ln0+bwgV+28qtySFbSCRlelznUQB58HETy5dWzOV vqKl6DMra6BoVJNBJeonLpElBVwlZ/cExlGDGtjA= 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.12 357/384] media: venus: hfi_parser: Dont initialize parser on v1 Date: Mon, 10 May 2021 12:22:26 +0200 Message-Id: <20210510102026.527362776@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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 @@ -277,8 +277,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;