From patchwork Wed May 17 21:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13245703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DA10C7EE22 for ; Wed, 17 May 2023 21:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230008AbjEQVPS (ORCPT ); Wed, 17 May 2023 17:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229999AbjEQVO7 (ORCPT ); Wed, 17 May 2023 17:14:59 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBF587ABF for ; Wed, 17 May 2023 14:14:47 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2ac8cc8829fso13411281fa.3 for ; Wed, 17 May 2023 14:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684358087; x=1686950087; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nDGFzpmpMzEfdx1VC1Hii8Q1Q5+BqfzALqEO/TlStp0=; b=RVDZ3hYucDHtriDtggZ7B/vQ1NH6HgaCqdG8RdKUXujWODZJ7mMM41N1No5HaHDh45 6qnmqn+wibkOhyW6DJ2JUwKKcWwwkFQ00z6hk/AcpYVqDwnIcLBMPmxiUZPfm4o3Vgml J0NuUg0XFLPDwSpniYqpT/22Qj04euCFqdwqiiXfsoQIhwo5DXcGTNCsmYsSTZJdbV4e 8HWneU6OqoaxDRMK7x24HF5OkZfz0totOmbFvMRSziNUEVGgHDZ55rLJRY33Ydiy2zGF XVTyfximvcH1+rQiFL9hmN6Tm+yv3OuFF+i1s+0oTzFlsaTL9i0E11bDTeQgK5ZCYfFu C8gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684358087; x=1686950087; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nDGFzpmpMzEfdx1VC1Hii8Q1Q5+BqfzALqEO/TlStp0=; b=S+lluXY+aqtNViig3m5N/UK7wVIJzXqu5ShVtV88x+HwAQBZ8t128kael3yC7a6k6x QX3fCvv8yLW+fCR7cQ9ZKWqeEX2IjdDhelSqK7VNMDDZui/4cMbK5l3aNxiH6eKx1s8d HuJRLEWAao96MoBfWW79SZjWgjpENZHGnTcJ5cXbuZVq8FbxsLWCc7sYRsiIOYZDs9LP KMsRkWvB5Dcx9mFZvHHhslo34JdUsYCqMvX0D3AZFD/wn1Q1ENY+mA20Gp3uuv9fsuVz F1OpuO7WyYl/fc1kakqbGVs2wgOlXl2k1ElW5x0yXMWUTIhpHLd7KIcfLkuOsktXq/Iw /Ogw== X-Gm-Message-State: AC+VfDyvofxlhZ8N3HxGjkrMYDcMI93b+mN6RFcDqEJYsyJKKiudPKRu nTuGH+6oWZtsjvl2ScuvFlfGZw== X-Google-Smtp-Source: ACHHUZ6k21x2x6MNJETwjbepZirGO9oOGF82ibWO4x17Az088t+bnqa57caBVPNtXX2C6R2s7DrG3w== X-Received: by 2002:a2e:8513:0:b0:2af:3f7:53fe with SMTP id j19-20020a2e8513000000b002af03f753femr1564839lji.50.1684358087507; Wed, 17 May 2023 14:14:47 -0700 (PDT) Received: from [192.168.1.101] (abxi58.neoplus.adsl.tpnet.pl. [83.9.2.58]) by smtp.gmail.com with ESMTPSA id l5-20020a2e8345000000b002ac88e29049sm4781142ljh.43.2023.05.17.14.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 14:14:47 -0700 (PDT) From: Konrad Dybcio Date: Wed, 17 May 2023 23:14:27 +0200 Subject: [PATCH v3 14/17] media: venus: vdec: Sanitize vdec_set_work_route() per-VPU-version MIME-Version: 1.0 Message-Id: <20230228-topic-venus-v3-14-6092ae43b58f@linaro.org> References: <20230228-topic-venus-v3-0-6092ae43b58f@linaro.org> In-Reply-To: <20230228-topic-venus-v3-0-6092ae43b58f@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Dikshita Agarwal , Bryan O'Donoghue , Mansur Alisha Shaik , Jonathan Marek , Hans Verkuil , Dikshita Agarwal Cc: Mauro Carvalho Chehab , Stanimir Varbanov , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Marijn Suijten , Konrad Dybcio , Vikash Garodia X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1684358064; l=867; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=APaBO7FviqfKlqEiE3ehDGGYRc2ypqRE0QzbhTatWLQ=; b=MHxc67Qgwqs4bXALR1ab343Uesn0bN5RPPf+MTD3Ca1Bh3j1c0Onb/wdqus87N3lmoUWNgU71 CU860m4dWsGBVNaPPV8hW/bzYr3xoObI4Jj5jM6x7oaTHZnsy5Ee3Ba X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Replace the general IS_V6 checks with more specific VPU version checks. Reviewed-by: Bryan O'Donoghue Signed-off-by: Konrad Dybcio --- drivers/media/platform/qcom/venus/vdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 51a53bf82bd3..b880e290a62f 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -701,7 +701,7 @@ static int vdec_set_work_route(struct venus_inst *inst) u32 ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; struct hfi_video_work_route wr; - if (!IS_V6(inst->core)) + if (!(IS_IRIS2(inst->core) || IS_IRIS2_1(inst->core))) return 0; wr.video_work_route = inst->core->res->num_vpp_pipes;