From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 396E733F589 for ; Thu, 7 May 2026 06:42:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778136153; cv=none; b=hFHlQ46wgFW+XHoCGwAMfmLaNoc3U6FpbSdm3J/YfRwEdtTLctRHAS0/MR9BErmL5KWU9zwpVPcDS7lOxBMngLE4DPAHUwGCmHxHrMtA/hvTDDali6s4hqxCx/OMkcHeEn/NXrqimG/ph3hwYUGmMD0QzMPcogvek0sdLoDDyiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778136153; c=relaxed/simple; bh=o3XqsC4SJ7IqrDgDbMC5Y6LAmP408Zs+Xm8uiMDGiL0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OV06tLSdgyT8pMiEngufbnJt4qcKwswHIpK766ij2qmI09HG671MF1S76x7SMX6rWsIfbGy/86rM0WHGe9SgRNMgqrGJDLI3nuHvzceC2jOosTnveKwd5fY3K0z2Etx7omRFryBlPqBW+ddIKYBUWwb0iuZmIQhXtLJpfWAqhSc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=IYCh8bcF; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=K0EPAnui; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="IYCh8bcF"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="K0EPAnui" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6475wTUF1926223 for ; Thu, 7 May 2026 06:42:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= qskiMoOslweReL5wBxh+b06iXecSi2WY42VOu1Wld30=; b=IYCh8bcFDB9Ozj7J CkXUYbbQvJfLWvDplfGoxm0Ru7PYIHhRQTNNelIYtAYegsBk5ZKFxhflDix3hOPc t88rYyjjldeLdelqAtT0MHlO8RQniSpx8+kqLLhnqfI1kQdDzYi/dLNarzhKkDpO 9hqFrajBhKT1G2w20Zeemuh1bW+Ff5kHo+QxOHam1AMJP+T6QzAkdKQUdEBgMQz+ 82Nq+TTckvlH7nA/T5zQTfhVPRvVWTJHk4gBrsa5X+LWD/gyVp3jYPrXSGKtFGfE 653eEQNWAG1ogE4ZwRp/wYRhKY6CGJ9fnzL2vRdArTTY+vmvxC8pkJaQpFsTMwI6 KYAgag== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e0n2g84yu-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 07 May 2026 06:42:31 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-50f817c3240so6957021cf.1 for ; Wed, 06 May 2026 23:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778136151; x=1778740951; darn=vger.kernel.org; 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=qskiMoOslweReL5wBxh+b06iXecSi2WY42VOu1Wld30=; b=K0EPAnui97DHqzsOKkqRX6KhbjcruaWuYJDzdPsTSi3Q80QRjGUnVcxd9nTO8zuSEt mGsUg++hri5xzIsbCJXVcYaIDg8zGXdzqD2RTr3kF9SdVjsWWr9QrOexa6MkmAYazsRS jXCFVG0ua9XWu8mvdCXrkho9AnItO51osOe7e+t4n1gEWGRM3m9RbkS7ND2X4ymmsMCw mGca3GKmlOhR5F0J1cY53Z5b1+n4v72TajwIRywrS6BT/+rYiQfBcsvxyJtZpbVSd8RM A1upiQMQQ+WRq63TcKzGjzNKxq+kWJVgefUa26gFit+9b60CRFmma9LptApiihYVuM1V 3tuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778136151; x=1778740951; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qskiMoOslweReL5wBxh+b06iXecSi2WY42VOu1Wld30=; b=p/+zbAdKyQ3dE3Npk69a0eim3Ss2lnYWKjlzAhjIJxVzC5Szug63wRbu1UXkwvSp9w yrfcGHy1zWSMwRzgeAKED+NpuG038RBjlaHcaSmhsSlUyXrCXOw3GnnQ/DwBnW2RC/7a qOhe4+apDxlK9vCz7xFzhPByEnC9zNcZZ2Q0efSnZ+4EcqN2S8suNtLrKtlPuIUp6ETF SDnxGcs+Ns1hE6DCTwVevPfJfjkvQp3vFKaFABfmKBNioK5RjHeU8TjdkGhHeeNK+pmz B1fD21M8qIT1fyuM+yL4TKFVmIidB0NDjhTo/15xgGKYzyWABKIDjQu0ubFVsR8AkFsg nqFQ== X-Forwarded-Encrypted: i=1; AFNElJ/wxlOqdEHKmUwI73PkH8CvWr0noxU9OXjeVgA9n1fAPWf4dbX3fcTtt2KgYvAjKwJis3d4QZ7RU2FDoHI=@vger.kernel.org X-Gm-Message-State: AOJu0YwfS0QuQlI1jjyGFOUNUlBBkZy7Ak/V7llhMGPTZ/W1ioQhszPH 7D3Bl/7gYc3047qLGQHKksadMLet9U+R08QNJfSa/aZEJtKsKR/H/wXxTHL2wMNb/cVKERy9BlB R2OEU1ZKSlnVMHSpLdPhLpEeliqY1VZ+YoXEn/trwcpfIX8ekSQOgoRkipIHvuom3dfc= X-Gm-Gg: AeBDiesrP7TMQiObzClAmXcBfXBPYvgMSPI0kJLZfIP9jPrSd/LIk/O9i1KM+RhSY9p mxTsR26UIr/EdswJS9FT5wsd2XmTWT7Pgdmi5boMdxtxSWTY+o5p5Zvsi8OXoLIn3WCFbTVDRdc s6FFjw4Oe5cCOfJOp8RxOITiEyonYyg7kCF5tPr39rlQAlYZ8lTy4d/1AscKcmsq4x8Jb5BeY39 PeuZ9LWxmWJLrHyIZpAa9FSi2fSxLFI8qkfbbKaL06BtMhNmr2k99BBuZWNO4J9Q3vfozhf6Kx8 lWefmNTSKl4K4HmI9q9Xde1fGkDg0h3uLVbamMin4Dks/xDJZoVW7gDk+PIMgrGyziC9sAF1y8F QqAdF6BFyKwCU3vZVK2ygLIPIdnsXxFrVQxI7UOv+ZPJeN6r0yQk9kctBtApzEGyLlhoxZBQKiT gIFR3t7hlQyiL8MXSxGYt1rry5zUR+8sRzdn71CgQeKnV/kg== X-Received: by 2002:a05:622a:188f:b0:510:1543:31e4 with SMTP id d75a77b69052e-514621e9218mr92456001cf.59.1778136150595; Wed, 06 May 2026 23:42:30 -0700 (PDT) X-Received: by 2002:a05:622a:188f:b0:510:1543:31e4 with SMTP id d75a77b69052e-514621e9218mr92455661cf.59.1778136150098; Wed, 06 May 2026 23:42:30 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a8722c2d43sm3334694e87.40.2026.05.06.23.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 23:42:28 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 07 May 2026 09:42:09 +0300 Subject: [PATCH 09/16] media: iris: Add framework support for AR50_LITE video core Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-iris-ar50lt-v1-9-d22cccedc3e2@oss.qualcomm.com> References: <20260507-iris-ar50lt-v1-0-d22cccedc3e2@oss.qualcomm.com> In-Reply-To: <20260507-iris-ar50lt-v1-0-d22cccedc3e2@oss.qualcomm.com> To: Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dikshita Agarwal X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=8136; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=z72H4ImX+0JDWWXrPRrLSHAWz84g1C7cxTNXO8PfGB8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBp/DQ+fFE7D7JOmtHoDPhepk3lg3ImaXaGna8PS OhouYHwf26JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCafw0PgAKCRCLPIo+Aiko 1WFxB/0TAHJkf94Z0bk4VSSgauAjLpuPqrMLUlasGnFo/N05JqbIBJCi32lXhoL+vwZQnJBRj2m HU9v3Wn9KqReaOnC/Wht67xjhrIz1R88O/FCNYc0kfspJFTqzndFgS6b4m+X4Sboy/oT139uf6t vBE3QeH7gkgK4gNR9ZBo6jXLKf/TgLPCXDj1A7/zkAqcCEB8EbIVXgXFN0pfbRCxTbOfoM93ufI eRv4zDYLuhHlN0p3XX62ptfoxN+1wejRBDMoxQvsvzVe5AJFcDneFg1bELdWsYrthoDvIAVfMhi sdfHgiTy2roAQq/XyuaoPROW9ToixnGsdJLAqvznc1GdJT5d X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=Wv4b99fv c=1 sm=1 tr=0 ts=69fc3457 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=x0nZcyIE9sK-8O7Lov0A:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-ORIG-GUID: x5uMIwt-TNBCQziJ9XGnF5FtT-BFVWWs X-Proofpoint-GUID: x5uMIwt-TNBCQziJ9XGnF5FtT-BFVWWs X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA3MDA2MyBTYWx0ZWRfX7MaV9MQVTxLA inzQQj5paQw2HZJA6Fp4EvupusL8YxZKdKAGbBu7QKRixd68TFQ9qTSEn5sPhz371JLhtgyyfrT W+L7o2cIFnkt3OgEyfiByjSEzrVHMj3qMzNBHWJ3oy1e/o+F95mKCO9jkEfjflAbwh9l7XvFgwo ua7pNomHj2ZNM3Ha0PWhocBa+rkk8GximKZEmjNV0Jqp6eG5XGosu1tj8Mdpq9WzqOjRs8/AwI1 VJSkSEaC57DWhlPzYEwCLRM1uEWiX9Fva4ZcKvNmYBQed0PSRKrZhKO1iEuwXmv8WjFBlOxA5ku V8RNJyC1gmL6bV35b+VpJuJeeXyp+IzqAgGl0gm9bX02HQfN0BZHSz836R+bb+Zdr/XMm/WESGk 5gN/ASBtCU0nLHt6WcTkB6MfN9i+MDXFpAKJr6EY51GX3BElQLocH4ZWN9hNE/1kdeGFCIiyA6X DZpulc0XGacqLB9TAyg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-06_02,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605070063 From: Dikshita Agarwal Add power sequence for ar5lt core. Add register handling for ar50lt by hooking up vpu op with ar50lt specific implemtation or resue from earlier generation wherever feasible. Signed-off-by: Dikshita Agarwal Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/Makefile | 1 + .../platform/qcom/iris/iris_platform_common.h | 2 + drivers/media/platform/qcom/iris/iris_vpu_ar50lt.c | 156 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_vpu_common.c | 3 +- drivers/media/platform/qcom/iris/iris_vpu_common.h | 1 + 5 files changed, 162 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile index 48e415cbc439..f1b204b95694 100644 --- a/drivers/media/platform/qcom/iris/Makefile +++ b/drivers/media/platform/qcom/iris/Makefile @@ -26,6 +26,7 @@ qcom-iris-objs += iris_buffer.o \ iris_vpu2.o \ iris_vpu3x.o \ iris_vpu4x.o \ + iris_vpu_ar50lt.o \ iris_vpu_buffer.o \ iris_vpu_common.o \ diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index e1dc226066c1..4a0895bf5720 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -63,6 +63,7 @@ enum platform_clk_type { IRIS_VPP0_HW_CLK, IRIS_VPP1_HW_CLK, IRIS_APV_HW_CLK, + IRIS_THROTTLE_CLK, }; struct platform_clk_data { @@ -283,6 +284,7 @@ struct iris_platform_data { u32 tz_cp_config_data_size; u32 num_vpp_pipe; bool no_aon; + bool no_rpmh; u32 wd_intr_mask; u32 icc_ib_multiplier; u32 max_session_count; diff --git a/drivers/media/platform/qcom/iris/iris_vpu_ar50lt.c b/drivers/media/platform/qcom/iris/iris_vpu_ar50lt.c new file mode 100644 index 000000000000..688b57291a81 --- /dev/null +++ b/drivers/media/platform/qcom/iris/iris_vpu_ar50lt.c @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include + +#include "iris_instance.h" +#include "iris_vpu_common.h" + +#include "iris_vpu_register_defines.h" + +#define WRAPPER_INTR_MASK_A2HVCODEC_BMSK_AR50LT BIT(3) + +#define WRAPPER_VCODEC0_CLOCK_CONFIG_AR50LT 0xb0080 + +#define CPU_CS_VCICMD 0xa0020 +#define CPU_CS_VCICMD_ARP_OFF 0x1 + +static void iris_vpu_ar50lt_set_preset_registers(struct iris_core *core) +{ + writel(0x0, core->reg_base + WRAPPER_VCODEC0_CLOCK_CONFIG_AR50LT); +} + +static void iris_vpu_ar50lt_interrupt_init(struct iris_core *core) +{ + writel(WRAPPER_INTR_MASK_A2HVCODEC_BMSK_AR50LT, core->reg_base + WRAPPER_INTR_MASK); +} + +static void iris_vpu_ar50lt_disable_arp(struct iris_core *core) +{ + writel(CPU_CS_VCICMD_ARP_OFF, core->reg_base + CPU_CS_VCICMD); +} + +static int iris_vpu_ar50lt_power_off_controller(struct iris_core *core) +{ + iris_disable_unprepare_clock(core, IRIS_AHB_CLK); + iris_disable_unprepare_clock(core, IRIS_AXI_CLK); + iris_disable_unprepare_clock(core, IRIS_CTRL_CLK); + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); + + return 0; +} + +static void iris_vpu_ar50lt_power_off_hw(struct iris_core *core) +{ + dev_pm_genpd_set_hwmode(core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN], false); + iris_disable_unprepare_clock(core, IRIS_THROTTLE_CLK); + iris_disable_unprepare_clock(core, IRIS_HW_AHB_CLK); + iris_disable_unprepare_clock(core, IRIS_HW_CLK); + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN]); +} + +static int iris_vpu_ar50lt_power_on_controller(struct iris_core *core) +{ + int ret; + + ret = iris_enable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); + if (ret) + return ret; + + ret = iris_prepare_enable_clock(core, IRIS_CTRL_CLK); + if (ret) + goto err_disable_power; + + ret = iris_prepare_enable_clock(core, IRIS_AXI_CLK); + if (ret && ret != -ENOENT) + goto err_disable_ctrl_clock; + + ret = iris_prepare_enable_clock(core, IRIS_AHB_CLK); + if (ret) + goto err_disable_axi_clock; + + return 0; + +err_disable_axi_clock: + iris_disable_unprepare_clock(core, IRIS_AXI_CLK); +err_disable_ctrl_clock: + iris_disable_unprepare_clock(core, IRIS_CTRL_CLK); +err_disable_power: + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); + + return ret; +} + +static int iris_vpu_ar50lt_power_on_hw(struct iris_core *core) +{ + int ret; + + ret = iris_enable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN]); + if (ret) + return ret; + + ret = iris_prepare_enable_clock(core, IRIS_HW_CLK); + if (ret) + goto err_disable_power; + + ret = iris_prepare_enable_clock(core, IRIS_HW_AHB_CLK); + if (ret) + goto err_disable_hw_clock; + + ret = iris_prepare_enable_clock(core, IRIS_THROTTLE_CLK); + if (ret && ret != -ENOENT) + goto err_disable_hw_ahb_clock; + + return 0; + +err_disable_hw_ahb_clock: + iris_disable_unprepare_clock(core, IRIS_HW_AHB_CLK); +err_disable_hw_clock: + iris_disable_unprepare_clock(core, IRIS_HW_CLK); +err_disable_power: + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN]); + + return ret; +} + +static u64 iris_vpu_ar50lt_calc_freq(struct iris_inst *inst, size_t data_size) +{ + struct platform_inst_caps *caps = inst->core->iris_platform_data->inst_caps; + struct v4l2_format *inp_f = inst->fmt_src; + u32 mbs_per_second, mbpf, height, width; + unsigned long vpp_freq, vsp_freq; + u32 fps = DEFAULT_FPS; + + width = max(inp_f->fmt.pix_mp.width, inst->crop.width); + height = max(inp_f->fmt.pix_mp.height, inst->crop.height); + + mbpf = NUM_MBS_PER_FRAME(height, width); + mbs_per_second = mbpf * fps; + + vpp_freq = mbs_per_second * caps->mb_cycles_vpp; + + /* 21 / 20 is overhead factor */ + vpp_freq += vpp_freq / 20; + vsp_freq = mbs_per_second * caps->mb_cycles_vsp; + + /* 10 / 7 is overhead factor */ + vsp_freq += ((fps * data_size * 8) * 10) / 7; + + return max(vpp_freq, vsp_freq); +} + +const struct vpu_ops iris_vpu_ar50lt_ops = { + .power_off_hw = iris_vpu_ar50lt_power_off_hw, + .power_on_hw = iris_vpu_ar50lt_power_on_hw, + .power_off_controller = iris_vpu_ar50lt_power_off_controller, + .power_on_controller = iris_vpu_ar50lt_power_on_controller, + .calc_freq = iris_vpu_ar50lt_calc_freq, + .set_hwmode = iris_vpu_set_hwmode, + .set_preset_registers = iris_vpu_ar50lt_set_preset_registers, + .interrupt_init = iris_vpu_ar50lt_interrupt_init, + .disable_arp = iris_vpu_ar50lt_disable_arp, +}; diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c index b8300195a43b..f3607c0ca847 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c @@ -97,7 +97,8 @@ int iris_vpu_boot_firmware(struct iris_core *core) } writel(HOST2XTENSA_INTR_ENABLE, core->reg_base + CPU_CS_H2XSOFTINTEN); - writel(0x0, core->reg_base + CPU_CS_X2RPMH); + if (!core->iris_platform_data->no_rpmh) + writel(0x0, core->reg_base + CPU_CS_X2RPMH); return 0; } diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h index 71d96921ed37..f00e2de5fa53 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h @@ -13,6 +13,7 @@ extern const struct vpu_ops iris_vpu3_ops; extern const struct vpu_ops iris_vpu33_ops; extern const struct vpu_ops iris_vpu35_ops; extern const struct vpu_ops iris_vpu4x_ops; +extern const struct vpu_ops iris_vpu_ar50lt_ops; struct vpu_ops { void (*power_off_hw)(struct iris_core *core); -- 2.47.3