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 3A39247A0A1 for ; Wed, 13 May 2026 12:49:35 +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=1778676581; cv=none; b=u9nxd9YKoEkuyHs0h0afrBZjaq5+yZGdIUi2hdIzKIdfe/t5MTJn1JRicIQr3EqBOlJzPP2CDle7eULaxluUD5ztyULjECao85ESjjV9fBunvxFygv7zJbFgDWiEnm3DKwEkkJy6j8DTVn82w3XfiL45HGEIq7OYkV9ZqfVw6DA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778676581; c=relaxed/simple; bh=1zDPOP1SavZgDiQyi4AT03ZJTGCF0M0Uv7ocps5TYYM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fPpil/MekVk/nP4j9EtvGnwFhZ9d6LisfatydGHdg0qb95AfbP/jZ7xFNYXDljI3I8d24EBpttjDCaBhLikG6dOmLzUKIMyAuj604TYUBm2hLreEEDygWm+ysAf88EXH1adrCvkhbtYyFZjkuGmorJJvEsZel0itaevXoTivim0= 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=BeY+NGed; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dsCfLPgQ; 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="BeY+NGed"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dsCfLPgQ" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64DAWpBo1393169 for ; Wed, 13 May 2026 12:49:34 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= Dxp8B42jWwt+tWH1V+vTuYQ+R3Qg9AEvv+6K2fYAZ40=; b=BeY+NGeddXBECff4 9KqTqR9PldKOmOGd82dgJ/7wH7If2cncAZ+S5DDDGDaZay36OPIuYf7gAWGSnR1P kNJYrO7ov9CXGJkh0Ot1WoxdKAkDnkMnS9Wq3kI6wyb4wqGreTSFw3FPK5r/8iU2 XY+wj0YGOmwBy+THBL7Wad+4Y8iMJ0uMbDjs7JUkbRLWr2ni1QE9cRKF0Qh/F0xq 2uAe64Pd5zT1ai8bUzQHOcApyeiJOMwhAHcyKjZVn37/JSr3mRYmAKkxDvm2Osq3 R9PVs+Z+gbDAErSMBOQIJ192Yx0iaGNCnzVfklgj2yxFKIAcjEQ7U4M2SWwgFQst 7CDboQ== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e4k261p0t-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 13 May 2026 12:49:34 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-5147078691fso154343411cf.3 for ; Wed, 13 May 2026 05:49:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778676573; x=1779281373; 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=Dxp8B42jWwt+tWH1V+vTuYQ+R3Qg9AEvv+6K2fYAZ40=; b=dsCfLPgQzEyj6CbaxRTWLh5s//5ABkeN9ozBAuCxzOXKfVDzOCA02tayILQzhqO8fk q2p8IdDhRpQoWpF8L2LqZid0ZzIn38Bl1GMrI0fJfLF40RvTrWRgKKT+ADMRCWqRzCSV mGrBxNpBgT7ic9NBdRuJ6FQqA7UZCJEpjvtuaOjli6hg7q7Plke7vm+Eb93CXmIkAs0M sQZZk2m3LrIRFUAGDABcKXkoemBtG3mJUELxRCvP5F7lFhAmLh2MUbMxyJSY9PiZGL+C 5LRRYQ+OVbZFPVwAEMDugQCBo5nQ863RjGS/yPc0yLEr2zx6k387Ebw06UO+P7pcZura mqaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778676573; x=1779281373; 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=Dxp8B42jWwt+tWH1V+vTuYQ+R3Qg9AEvv+6K2fYAZ40=; b=jE2zldkjYts6W5+lKPuf20XVKP1D9frFkT/AqWGZpo4PDKJ4TwA/qCgQc9G5xlZmBs 6du/Uk6jgfEIZ+4yBwOiKZheNtUfe6THHd50S7mamSlszpXtfl4lPNYrVuzDPY4v3Ncv KJKO+8msixPvyVUxWE/FM1hufyDOpvD5Q4GVuzg3LDyFJPgL/O2+fqCcBEv5p0CAIrUM nlc413Rf61FvKtVfwHhPUI3dlImRcobouCBeCsAoKXnAqT1tac+y6Nnd9oevEDx/Rjj8 Y1ks1a0/YRFCOuEgHHZJL4O7ws11jv6MRAqJULIEu0BWp4J/oTU8jdoXSqu8lO/dyLVO zIKA== X-Forwarded-Encrypted: i=1; AFNElJ9we3SDlr8rs/Ov8YEA8qRHrs+y2V27fZJPBVwz8kNcUgPuBuNhp7m/KA0wxeJ8hG21mDNwWBLkalN2P30=@vger.kernel.org X-Gm-Message-State: AOJu0YzItzgqw66UfCTRqLJFtCfGirrkGZbo2xWTSALNaa0ZSkzO3Nid X5VFXJphtMkMvCCVtcpZ+FMk3mM1q/2wSU2mIOjKcRNifi95vyIMrUoriAzsCstsBVarHOxbR/x wS1TJrK9rsFFTIkil7qAYYhV1/aL1RJb4QI49jJuLtUmWdiIdV0cLm0//7O6Yo8H7qYk= X-Gm-Gg: Acq92OFGaSRrLHegcCIXM/gH4oeAGxGhBR/UpdVpc5jPaSfUi6J2DjDvD5737u1EO/N epNJOYn7SdKrMtbjG2ZQoK6Fg6tLSGnu0PQVgVeKyFPGZ3JCwQsGOGsycVnTvGFUIb76MofGcHp JZ5yTi+RYlujxrsvJQNH3x4WzU8zfs1YihE+aRPL0VYnNYGzmeFtwJWqOC902Y0VaGZfcrSbN42 Npk0FgdnUTzwgHbS9sSdXUDKxzXy48fdGD+NKvS/OBKf4TnLLR5N8H24BA+T4y5WBLAuBomojYD hyxDP/LJ/Krm84NBU1Yi1di4M8tk9zpf/cdtuT7EluLa4JHFeW+HHaev1fqHNbgMwn6KkRCyZEl oNqiVZ58FnI5SAdCP7jc9eKjxdmEVCAX1+dtcj/Jsm6ImuJEIo0vj1Pmxbug/g1Yw5mCIyF9YAY dJqVg74sha6CVhwew/dTxQy8SsuSvgP61+eWA= X-Received: by 2002:a05:622a:13d2:b0:4f0:131f:66fe with SMTP id d75a77b69052e-5162ffc337amr36151921cf.59.1778676573271; Wed, 13 May 2026 05:49:33 -0700 (PDT) X-Received: by 2002:a05:622a:13d2:b0:4f0:131f:66fe with SMTP id d75a77b69052e-5162ffc337amr36147971cf.59.1778676568073; Wed, 13 May 2026 05:49:28 -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 38308e7fff4ca-393f5f5f15asm41106841fa.17.2026.05.13.05.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 05:49:27 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 May 2026 15:45:43 +0300 Subject: [PATCH v2 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: <20260513-iris-ar50lt-v2-9-411e5f7bdc4c@oss.qualcomm.com> References: <20260513-iris-ar50lt-v2-0-411e5f7bdc4c@oss.qualcomm.com> In-Reply-To: <20260513-iris-ar50lt-v2-0-411e5f7bdc4c@oss.qualcomm.com> To: Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vishnu Reddy 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=8118; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=bF8iILLVIppNchJxOge/8BaIad5y4umYpW2shyRCvbs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqBHNB4nJT9z63O7kJZgYvfB5SiqrSgBkRCQ+Uk cKeg1T8qSyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCagRzQQAKCRCLPIo+Aiko 1ettB/40UnnejMbXtc6WC0kekzMq8Kkf+1ccORptSkX2GVRJr/EqmmvmOj8TpWCermhq1Pcj9y2 EcFa5F9lso2fsGKnrecItUQLq8tzeqbUNgjKQWVHErMG0RtwIVba3fW+iuzlFJeEqaTkL/wEuWB 5GFffvHZdzoj56Ny5VR5g4jEQE1uyYfz1JGP8sTGdkKGAWMmjYrOV0SretkHLfGcEamyF/IVaso W0VXUee660J/1orm8mOsYzmBQ+w6kglhN1x81bnePByONKJ6B50DdlSiLnaQfDtz0GyhzyJdVO/ jwQansvlbifRSE/jshmKyQ5ejek/pMktiBYMTtWqYvwmpWyE X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=M/l97Sws c=1 sm=1 tr=0 ts=6a04735e cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=x0nZcyIE9sK-8O7Lov0A:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTEzMDEzMiBTYWx0ZWRfX/2SXVFygUEF7 e8OtgpEHHxpgyqqSTMRDmExd/nsn1irl36oBcijslewJ5SgUxPKnJ2/jbis0BsiFliVIgehN5Hy 5In0m2iW7H0VD3GGczabiXd/IB8VowK9YuK6wFfkyjVmVvD0YGsHWUMBok3lBQnN3HSdR7swD0H ZNDuE/Cd7QtVwCZOClWDeLzgAwCEmIz+9LSd7HotafPzpjFmBIhsfvOQNtL1v4Z865onFwi8HA2 OcRiXTxvv9nFLcCvBJRUbOskKsPao0ZZCiYRIPAOK41hoXhYhKpuK7kyjAcYVnlF2vOLD9Tberc CdVj53rzeE89OD5C19pmF54bEHHOAdde+Vj/AaM2OD4roauolUeYl6NWc/y2/6oV8pSJzx1Wsp8 XUI5GZhXDajeSYA7T2EWWpiRGL9s5S8Ot6ldLwHu006W8Zf4QObdQlIF70WqNRcfNA9dWozdJMc Qh8dU8nJo1MqRO9LODw== X-Proofpoint-ORIG-GUID: PV5zJ19_Hm7Wx2D6uTdubGim4qoczddR X-Proofpoint-GUID: PV5zJ19_Hm7Wx2D6uTdubGim4qoczddR 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-13_01,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605130132 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..1af20b067c03 --- /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) + 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