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 A484D2BEFEC; Thu, 10 Jul 2025 10:05:26 +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=1752141929; cv=none; b=a0Eew7rSW1TLdqDkKARvCBGj9HSfg/S2UiSxoMLPsWjt3XIw/6v5FpkuaTyhElp//yM93PxOvJk9HR1PW8vcnNSkQHne4hmFzjDei9DdQT05DwPtYowFUAVj29w0qs3++u/sI6VYbIbjb7YFyNyT7UyspVqZZqT7SxjFVB1C5OU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752141929; c=relaxed/simple; bh=Wl+2dmRvrHKuBXwczpC+bOlIUCv8xM7XUqrs4T5YmFs=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=J9JfnnxqC9s6SZFULzKY8w6TcGp9ZrRpNeYcM30QBnAkiKKMLGbkF7LW+p0wbkNWDSBzdKZpaqvItnsJHv3Loyc1PcyDvEM1gG4+7XwErWNHkqkV4rm3h0xPEoE9GOC7SA+3gw3WRoN3i95wDynjzgNlHhDkOQyBdQaryn13HBs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=ET4lAG3C; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="ET4lAG3C" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56A93whi014475; Thu, 10 Jul 2025 10:05:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 6RxtxlnDzTE6A9wu7TLME7ex2R1EXgmKAp1Td13WihA=; b=ET4lAG3CtulBu0t3 rEEPcOtHtwru4NHKFeMHVEur7t+Lr3o9lbAibiUs/gLr7/2HtYNiBR6TATAD+525 noiWLIGXUSj7bL8NHnODLl7Dgoh1ZBpYHSUE1tqibU7981Su5akEMHlSDE6ANVQy O0Hl2v8qIFBLrWSekCaucOaYBmFqEZu+6QQFHTEfoZnnQsTqnQErLPhRoTxGE3MT xE55vVfgdsPcgOKQdie3BctKREM1l2H29Qa3bb1xAsWWcyhVCh4X5QMNQGv1TrR3 HGpiov0RAVPXKXthF90MVGVzWCLgkMp6cH4HMIjGnfo3zR+W05BfEF/xPwY56dUo 4WBelg== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47r9b15dw4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Jul 2025 10:05:21 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 56AA5Lrx000749 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Jul 2025 10:05:21 GMT Received: from [10.50.13.177] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Thu, 10 Jul 2025 03:05:16 -0700 Message-ID: <5e0d3fab-25ae-b4e1-a7a2-5c681642de75@quicinc.com> Date: Thu, 10 Jul 2025 15:35:10 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v6 3/7] media: venus: Add support for AR50_LITE video core Content-Language: en-US To: Jorge Ramirez-Ortiz , , , , , , , , , CC: , , , References: <20250708180530.1384330-1-jorge.ramirez@oss.qualcomm.com> <20250708180530.1384330-4-jorge.ramirez@oss.qualcomm.com> From: Dikshita Agarwal In-Reply-To: <20250708180530.1384330-4-jorge.ramirez@oss.qualcomm.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=dYuA3WXe c=1 sm=1 tr=0 ts=686f9061 cx=c_pps a=JYp8KDb2vCoCEuGobkYCKw==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=V2-UT0GwN_xWhl6aRAYA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDA4NiBTYWx0ZWRfX2y7fhuG1xxCV QxPkZjbxhlM9KVcJ8FvCJOmA2CXLpOeZDVqle5hrK9amTALC/y+S4rRTdBJVyhz1YRr/izalfRz OvSl5SXd0Bt6SL/5uBMmEPOtC5PQ4zHIKnxlOFMEht6L4XnpB44A1gyPJ4KFa4wTJOCrwldoJU1 t3PWQWdxpJ7i8ScP151l2ymR9g6XkgnTMoMuiwRzPXBgwGk8SSMkYUJcfmEiJQFdMYmTBfj8xzp 6bXRN7Gpx3uwSrvAeWyO2AyMl39o624vJ97kq1JrISj2xyYdyePZwPdv5hQWdEZC2aRVjswcw7W Zxnns2oLvch2o4fXXzSkT4/TXA2r3IyvIWYgqVf68/O1q5SQGeG+UUAq0EzFMwxK+3zCN/OFZO6 lI3dsQgVCKXXSSicZJltiYhL+T+RivzuqQf2YbeIo8TSVVsMLJcSwHF4h5Azzg1G+kjoHdmb X-Proofpoint-GUID: KHdug6FcCh5lCl39NDmHWxCYAeplqQZH X-Proofpoint-ORIG-GUID: KHdug6FcCh5lCl39NDmHWxCYAeplqQZH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_01,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507100086 On 7/8/2025 11:35 PM, Jorge Ramirez-Ortiz wrote: > The AR50_LITE is a simplified variant of the AR50 video core, designed for > power and cost-efficient platforms. > > It supports hardware-accelerated decoding of H.264, HEVC, and VP9 formats, > and provides encoding support for H.264 and HEVC. > > Signed-off-by: Jorge Ramirez-Ortiz > --- > drivers/media/platform/qcom/venus/core.c | 11 ++- > drivers/media/platform/qcom/venus/core.h | 7 ++ > drivers/media/platform/qcom/venus/firmware.c | 6 +- > drivers/media/platform/qcom/venus/helpers.c | 87 ++++++++++++++++++- > drivers/media/platform/qcom/venus/helpers.h | 2 + > .../media/platform/qcom/venus/hfi_parser.c | 5 +- > .../media/platform/qcom/venus/hfi_platform.c | 20 +++-- > .../media/platform/qcom/venus/hfi_platform.h | 25 +++--- > .../platform/qcom/venus/hfi_platform_v4.c | 33 ++++--- > .../platform/qcom/venus/hfi_platform_v6.c | 32 +++++-- > drivers/media/platform/qcom/venus/hfi_venus.c | 16 ++-- > .../media/platform/qcom/venus/pm_helpers.c | 2 +- > drivers/media/platform/qcom/venus/vdec.c | 16 ++-- > 13 files changed, 196 insertions(+), 66 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 9744c18af54d..a4472cc2088b 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -267,14 +267,19 @@ static int venus_enumerate_codecs(struct venus_core *core, u32 type, > > static void venus_assign_register_offsets(struct venus_core *core) > { > - if (IS_IRIS2(core) || IS_IRIS2_1(core)) { > - core->vbif_base = core->base + VBIF_BASE; > + if (IS_IRIS2(core) || IS_IRIS2_1(core) || IS_AR50_LITE(core)) { > core->cpu_base = core->base + CPU_BASE_V6; > core->cpu_cs_base = core->base + CPU_CS_BASE_V6; > core->cpu_ic_base = core->base + CPU_IC_BASE_V6; > core->wrapper_base = core->base + WRAPPER_BASE_V6; > core->wrapper_tz_base = core->base + WRAPPER_TZ_BASE_V6; > - core->aon_base = core->base + AON_BASE_V6; > + if (IS_AR50_LITE(core)) { > + core->vbif_base = NULL; > + core->aon_base = NULL; > + } else { > + core->vbif_base = core->base + VBIF_BASE; > + core->aon_base = core->base + AON_BASE_V6; > + } > } else { > core->vbif_base = core->base + VBIF_BASE; > core->cpu_base = core->base + CPU_BASE; > diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h > index 3af8386b78be..3b55365a942c 100644 > --- a/drivers/media/platform/qcom/venus/core.h > +++ b/drivers/media/platform/qcom/venus/core.h > @@ -392,6 +392,7 @@ enum venus_inst_modes { > * @lock: instance lock > * @core: a reference to the core struct > * @clk_data: clock data per core ID > + * @eosbufs: a list of EOS buffers > * @dpbbufs: a list of decoded picture buffers > * @internalbufs: a list of internal bufferes > * @registeredbufs: a list of registered capture bufferes > @@ -460,6 +461,7 @@ struct venus_inst { > struct mutex lock; > struct venus_core *core; > struct clock_data clk_data; > + struct list_head eosbufs; > struct list_head dpbbufs; > struct list_head internalbufs; > struct list_head registeredbufs; > @@ -538,6 +540,11 @@ struct venus_inst { > #define IS_IRIS2(core) ((core)->res->vpu_version == VPU_VERSION_IRIS2) > #define IS_IRIS2_1(core) ((core)->res->vpu_version == VPU_VERSION_IRIS2_1) > > +static inline bool is_lite(struct venus_core *core) > +{ > + return IS_AR50_LITE(core); > +} > + > #define ctrl_to_inst(ctrl) \ > container_of((ctrl)->handler, struct venus_inst, ctrl_handler) > > diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c > index 66a18830e66d..00b13b203ed1 100644 > --- a/drivers/media/platform/qcom/venus/firmware.c > +++ b/drivers/media/platform/qcom/venus/firmware.c > @@ -30,7 +30,7 @@ static void venus_reset_cpu(struct venus_core *core) > u32 fw_size = core->fw.mapped_mem_size; > void __iomem *wrapper_base; > > - if (IS_IRIS2_1(core)) > + if (IS_IRIS2_1(core) || IS_AR50_LITE(core)) venus_reset_cpu is only relevant in the non-TZ configuration. Please drop this handling as it's not applicable in the current context. > wrapper_base = core->wrapper_tz_base; > else > wrapper_base = core->wrapper_base; > @@ -42,7 +42,7 @@ static void venus_reset_cpu(struct venus_core *core) > writel(fw_size, wrapper_base + WRAPPER_NONPIX_START_ADDR); > writel(fw_size, wrapper_base + WRAPPER_NONPIX_END_ADDR); > > - if (IS_IRIS2_1(core)) { > + if (IS_IRIS2_1(core) || IS_AR50_LITE(core)) { > /* Bring XTSS out of reset */ > writel(0, wrapper_base + WRAPPER_TZ_XTSS_SW_RESET); > } else { > @@ -68,7 +68,7 @@ int venus_set_hw_state(struct venus_core *core, bool resume) > if (resume) { > venus_reset_cpu(core); > } else { > - if (IS_IRIS2_1(core)) > + if (IS_IRIS2_1(core) || IS_AR50_LITE(core)) This again is relevant in the non-TZ configuration. Please drop. > writel(WRAPPER_XTSS_SW_RESET_BIT, > core->wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET); > else > diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c > index 8295542e1a7c..aa61396e763e 100644 > --- a/drivers/media/platform/qcom/venus/helpers.c > +++ b/drivers/media/platform/qcom/venus/helpers.c > @@ -230,6 +230,81 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) > } > EXPORT_SYMBOL_GPL(venus_helper_alloc_dpb_bufs); > > +static void free_eos_buf(struct venus_inst *inst, struct intbuf *buf) > +{ > + list_del_init(&buf->list); > + dma_free_attrs(inst->core->dev, buf->size, buf->va, buf->da, > + buf->attrs); > + kfree(buf); > +} > + > +int venus_helper_free_eos_bufs(struct venus_inst *inst) > +{ > + struct intbuf *buf, *n; > + > + list_for_each_entry_safe(buf, n, &inst->eosbufs, list) { > + free_eos_buf(inst, buf); > + } > + > + if (list_empty(&inst->eosbufs)) > + INIT_LIST_HEAD(&inst->eosbufs); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(venus_helper_free_eos_bufs); > + > +int venus_helper_alloc_eos_buf(struct venus_inst *inst, > + struct hfi_frame_data *data) > +{ > + struct venus_core *core = inst->core; > + struct device *dev = core->dev; > + struct intbuf *buf; > + int ret = 0; > + > + memset(data, 0, sizeof(*data)); > + > + data->buffer_type = HFI_BUFFER_INPUT; > + data->flags = HFI_BUFFERFLAG_EOS; > + > + if (IS_V6(inst->core) && is_fw_rev_or_older(inst->core, 1, 0, 87)) { > + data->device_addr = 0; > + return 0; > + } > + > + if (IS_V4(inst->core) && is_lite(core)) { > + /* We must send valid sizes and addresses */ > + buf = kzalloc(sizeof(*buf), GFP_KERNEL); > + if (!buf) { > + ret = -ENOMEM; > + goto fail; > + } > + > + buf->type = HFI_BUFFER_INPUT; > + buf->size = SZ_4K; > + buf->attrs = DMA_ATTR_NO_KERNEL_MAPPING; > + buf->va = dma_alloc_attrs(dev, buf->size, &buf->da, GFP_KERNEL, > + buf->attrs); > + if (!buf->va) { > + ret = -ENOMEM; > + goto fail; > + } > + > + list_add_tail(&buf->list, &inst->eosbufs); > + > + data->alloc_len = buf->size; > + data->device_addr = buf->da; > + > + } else { > + data->device_addr = 0xdeadb000; > + } > + > + return 0; > +fail: > + kfree(buf); > + return ret; > +} > +EXPORT_SYMBOL_GPL(venus_helper_alloc_eos_buf); > + Special handling for EOS should be avoided unless there's a clear and compelling need. > static int intbufs_set_buffer(struct venus_inst *inst, u32 type) > { > struct venus_core *core = inst->core; > @@ -1715,11 +1790,17 @@ int venus_helper_session_init(struct venus_inst *inst) > if (ret) > return ret; > > - inst->clk_data.vpp_freq = hfi_platform_get_codec_vpp_freq(version, codec, > + inst->clk_data.vpp_freq = hfi_platform_get_codec_vpp_freq(version, > + is_lite(inst->core), > + codec, > session_type); > - inst->clk_data.vsp_freq = hfi_platform_get_codec_vsp_freq(version, codec, > + inst->clk_data.vsp_freq = hfi_platform_get_codec_vsp_freq(version, > + is_lite(inst->core), > + codec, > session_type); > - inst->clk_data.low_power_freq = hfi_platform_get_codec_lp_freq(version, codec, > + inst->clk_data.low_power_freq = hfi_platform_get_codec_lp_freq(version, > + is_lite(inst->core), > + codec, > session_type); > > return 0; > diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h > index 358e4f39c9c0..bf55fe3b8747 100644 > --- a/drivers/media/platform/qcom/venus/helpers.h > +++ b/drivers/media/platform/qcom/venus/helpers.h > @@ -58,6 +58,8 @@ int venus_helper_get_out_fmts(struct venus_inst *inst, u32 fmt, u32 *out_fmt, > bool venus_helper_check_format(struct venus_inst *inst, u32 v4l2_pixfmt); > int venus_helper_alloc_dpb_bufs(struct venus_inst *inst); > int venus_helper_free_dpb_bufs(struct venus_inst *inst); > +int venus_helper_alloc_eos_buf(struct venus_inst *inst, struct hfi_frame_data *data); > +int venus_helper_free_eos_bufs(struct venus_inst *inst); > int venus_helper_intbufs_alloc(struct venus_inst *inst); > int venus_helper_intbufs_free(struct venus_inst *inst); > int venus_helper_intbufs_realloc(struct venus_inst *inst); > diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c > index 1b3db2caa99f..55cee1c786a0 100644 > --- a/drivers/media/platform/qcom/venus/hfi_parser.c > +++ b/drivers/media/platform/qcom/venus/hfi_parser.c > @@ -277,12 +277,13 @@ static int hfi_platform_parser(struct venus_core *core, struct venus_inst *inst) > if (inst) > return 0; > > - ret = hfi_platform_get_codecs(core, &enc_codecs, &dec_codecs, &count); > + ret = hfi_platform_get_codecs(core, &enc_codecs, &dec_codecs, &count, > + is_lite(core)); > if (ret) > return ret; > > if (plat->capabilities) > - caps = plat->capabilities(&entries); > + caps = plat->capabilities(&entries, is_lite(core)); > > if (!caps || !entries || !count) > return -EINVAL; > diff --git a/drivers/media/platform/qcom/venus/hfi_platform.c b/drivers/media/platform/qcom/venus/hfi_platform.c > index 643e5aa138f5..c6c248561793 100644 > --- a/drivers/media/platform/qcom/venus/hfi_platform.c > +++ b/drivers/media/platform/qcom/venus/hfi_platform.c > @@ -21,7 +21,8 @@ const struct hfi_platform *hfi_platform_get(enum hfi_version version) > } > > unsigned long > -hfi_platform_get_codec_vpp_freq(enum hfi_version version, u32 codec, u32 session_type) > +hfi_platform_get_codec_vpp_freq(enum hfi_version version, bool lite, u32 codec, > + u32 session_type) > { > const struct hfi_platform *plat; > unsigned long freq = 0; > @@ -31,13 +32,14 @@ hfi_platform_get_codec_vpp_freq(enum hfi_version version, u32 codec, u32 session > return 0; > > if (plat->codec_vpp_freq) > - freq = plat->codec_vpp_freq(session_type, codec); > + freq = plat->codec_vpp_freq(session_type, codec, lite); > > return freq; > } > > unsigned long > -hfi_platform_get_codec_vsp_freq(enum hfi_version version, u32 codec, u32 session_type) > +hfi_platform_get_codec_vsp_freq(enum hfi_version version, bool lite, u32 codec, > + u32 session_type) > { > const struct hfi_platform *plat; > unsigned long freq = 0; > @@ -47,13 +49,14 @@ hfi_platform_get_codec_vsp_freq(enum hfi_version version, u32 codec, u32 session > return 0; > > if (plat->codec_vpp_freq) > - freq = plat->codec_vsp_freq(session_type, codec); > + freq = plat->codec_vsp_freq(session_type, codec, lite); > > return freq; > } > > unsigned long > -hfi_platform_get_codec_lp_freq(enum hfi_version version, u32 codec, u32 session_type) > +hfi_platform_get_codec_lp_freq(enum hfi_version version, bool lite, u32 codec, > + u32 session_type) > { > const struct hfi_platform *plat; > unsigned long freq = 0; > @@ -63,13 +66,14 @@ hfi_platform_get_codec_lp_freq(enum hfi_version version, u32 codec, u32 session_ > return 0; > > if (plat->codec_lp_freq) > - freq = plat->codec_lp_freq(session_type, codec); > + freq = plat->codec_lp_freq(session_type, codec, lite); > > return freq; > } > > int > -hfi_platform_get_codecs(struct venus_core *core, u32 *enc_codecs, u32 *dec_codecs, u32 *count) > +hfi_platform_get_codecs(struct venus_core *core, u32 *enc_codecs, u32 *dec_codecs, u32 *count, > + bool lite) > { > const struct hfi_platform *plat; > > @@ -78,7 +82,7 @@ hfi_platform_get_codecs(struct venus_core *core, u32 *enc_codecs, u32 *dec_codec > return -EINVAL; > > if (plat->codecs) > - plat->codecs(enc_codecs, dec_codecs, count); > + plat->codecs(enc_codecs, dec_codecs, count, lite); > > if (IS_IRIS2_1(core)) { > *enc_codecs &= ~HFI_VIDEO_CODEC_VP8; > diff --git a/drivers/media/platform/qcom/venus/hfi_platform.h b/drivers/media/platform/qcom/venus/hfi_platform.h > index ec89a90a8129..a9f1ead18084 100644 > --- a/drivers/media/platform/qcom/venus/hfi_platform.h > +++ b/drivers/media/platform/qcom/venus/hfi_platform.h > @@ -47,11 +47,12 @@ struct hfi_platform_codec_freq_data { > }; > > struct hfi_platform { > - unsigned long (*codec_vpp_freq)(u32 session_type, u32 codec); > - unsigned long (*codec_vsp_freq)(u32 session_type, u32 codec); > - unsigned long (*codec_lp_freq)(u32 session_type, u32 codec); > - void (*codecs)(u32 *enc_codecs, u32 *dec_codecs, u32 *count); > - const struct hfi_plat_caps *(*capabilities)(unsigned int *entries); > + unsigned long (*codec_vpp_freq)(u32 session_type, u32 codec, bool lite); > + unsigned long (*codec_vsp_freq)(u32 session_type, u32 codec, bool lite); > + unsigned long (*codec_lp_freq)(u32 session_type, u32 codec, bool lite); > + void (*codecs)(u32 *enc_codecs, u32 *dec_codecs, u32 *count, bool lite); > + const struct hfi_plat_caps *(*capabilities)(unsigned int *entries, > + bool lite); > int (*bufreq)(struct hfi_plat_buffers_params *params, u32 session_type, > u32 buftype, struct hfi_buffer_requirements *bufreq); > }; > @@ -60,12 +61,12 @@ extern const struct hfi_platform hfi_plat_v4; > extern const struct hfi_platform hfi_plat_v6; > > const struct hfi_platform *hfi_platform_get(enum hfi_version version); > -unsigned long hfi_platform_get_codec_vpp_freq(enum hfi_version version, u32 codec, > - u32 session_type); > -unsigned long hfi_platform_get_codec_vsp_freq(enum hfi_version version, u32 codec, > - u32 session_type); > -unsigned long hfi_platform_get_codec_lp_freq(enum hfi_version version, u32 codec, > - u32 session_type); > +unsigned long hfi_platform_get_codec_vpp_freq(enum hfi_version version, bool lite, > + u32 codec, u32 session_type); > +unsigned long hfi_platform_get_codec_vsp_freq(enum hfi_version version, bool lite, > + u32 codec, u32 session_type); > +unsigned long hfi_platform_get_codec_lp_freq(enum hfi_version version, bool lite, > + u32 codec, u32 session_type); > int hfi_platform_get_codecs(struct venus_core *core, u32 *enc_codecs, u32 *dec_codecs, > - u32 *count); > + u32 *count, bool lite); > #endif > diff --git a/drivers/media/platform/qcom/venus/hfi_platform_v4.c b/drivers/media/platform/qcom/venus/hfi_platform_v4.c > index e3f0a90a567b..c8e0f8040649 100644 > --- a/drivers/media/platform/qcom/venus/hfi_platform_v4.c > +++ b/drivers/media/platform/qcom/venus/hfi_platform_v4.c > @@ -245,14 +245,19 @@ static const struct hfi_plat_caps caps[] = { > .num_fmts = 4, > } }; > > -static const struct hfi_plat_caps *get_capabilities(unsigned int *entries) > +static const struct hfi_plat_caps *get_capabilities(unsigned int *entries, > + bool lite) > { > + WARN_ON(lite); > + Adding something, which is removed in next patch itself. > *entries = ARRAY_SIZE(caps); > return caps; > } > > -static void get_codecs(u32 *enc_codecs, u32 *dec_codecs, u32 *count) > +static void get_codecs(u32 *enc_codecs, u32 *dec_codecs, u32 *count, bool lite) > { > + WARN_ON(lite); > + > *enc_codecs = HFI_VIDEO_CODEC_H264 | HFI_VIDEO_CODEC_HEVC | > HFI_VIDEO_CODEC_VP8; > *dec_codecs = HFI_VIDEO_CODEC_H264 | HFI_VIDEO_CODEC_HEVC | > @@ -273,11 +278,13 @@ static const struct hfi_platform_codec_freq_data codec_freq_data[] = { > }; > > static const struct hfi_platform_codec_freq_data * > -get_codec_freq_data(u32 session_type, u32 pixfmt) > +get_codec_freq_data(u32 session_type, u32 pixfmt, bool lite) > { > - const struct hfi_platform_codec_freq_data *data = codec_freq_data; > unsigned int i, data_size = ARRAY_SIZE(codec_freq_data); > const struct hfi_platform_codec_freq_data *found = NULL; > + const struct hfi_platform_codec_freq_data *data = codec_freq_data; why is this needed? I don't see any difference. > + > + WARN_ON(lite); > > for (i = 0; i < data_size; i++) { > if (data[i].pixfmt == pixfmt && data[i].session_type == session_type) { > @@ -289,33 +296,39 @@ get_codec_freq_data(u32 session_type, u32 pixfmt) > return found; > } > > -static unsigned long codec_vpp_freq(u32 session_type, u32 codec) > +static unsigned long codec_vpp_freq(u32 session_type, u32 codec, bool lite) > { > const struct hfi_platform_codec_freq_data *data; > > - data = get_codec_freq_data(session_type, codec); > + WARN_ON(lite); > + > + data = get_codec_freq_data(session_type, codec, lite); > if (data) > return data->vpp_freq; > > return 0; > } > > -static unsigned long codec_vsp_freq(u32 session_type, u32 codec) > +static unsigned long codec_vsp_freq(u32 session_type, u32 codec, bool lite) > { > const struct hfi_platform_codec_freq_data *data; > > - data = get_codec_freq_data(session_type, codec); > + WARN_ON(lite); > + > + data = get_codec_freq_data(session_type, codec, lite); > if (data) > return data->vsp_freq; > > return 0; > } > > -static unsigned long codec_lp_freq(u32 session_type, u32 codec) > +static unsigned long codec_lp_freq(u32 session_type, u32 codec, bool lite) > { > const struct hfi_platform_codec_freq_data *data; > > - data = get_codec_freq_data(session_type, codec); > + WARN_ON(lite); > + > + data = get_codec_freq_data(session_type, codec, lite); > if (data) > return data->low_power_freq; > > diff --git a/drivers/media/platform/qcom/venus/hfi_platform_v6.c b/drivers/media/platform/qcom/venus/hfi_platform_v6.c > index 4e8af645f8b9..ad08d26cd7ba 100644 > --- a/drivers/media/platform/qcom/venus/hfi_platform_v6.c > +++ b/drivers/media/platform/qcom/venus/hfi_platform_v6.c > @@ -245,14 +245,20 @@ static const struct hfi_plat_caps caps[] = { > .num_fmts = 4, > } }; > > -static const struct hfi_plat_caps *get_capabilities(unsigned int *entries) > +static const struct hfi_plat_caps *get_capabilities(unsigned int *entries, > + bool lite) > { > + WARN_ON(lite); > + > *entries = ARRAY_SIZE(caps); > return caps; > } > > -static void get_codecs(u32 *enc_codecs, u32 *dec_codecs, u32 *count) > +static void get_codecs(u32 *enc_codecs, u32 *dec_codecs, u32 *count, > + bool lite) > { > + WARN_ON(lite); > + > *enc_codecs = HFI_VIDEO_CODEC_H264 | HFI_VIDEO_CODEC_HEVC | > HFI_VIDEO_CODEC_VP8; > *dec_codecs = HFI_VIDEO_CODEC_H264 | HFI_VIDEO_CODEC_HEVC | > @@ -273,12 +279,14 @@ static const struct hfi_platform_codec_freq_data codec_freq_data[] = { > }; > > static const struct hfi_platform_codec_freq_data * > -get_codec_freq_data(u32 session_type, u32 pixfmt) > +get_codec_freq_data(u32 session_type, u32 pixfmt, bool lite) > { > const struct hfi_platform_codec_freq_data *data = codec_freq_data; > unsigned int i, data_size = ARRAY_SIZE(codec_freq_data); > const struct hfi_platform_codec_freq_data *found = NULL; > > + WARN_ON(lite); > + > for (i = 0; i < data_size; i++) { > if (data[i].pixfmt == pixfmt && data[i].session_type == session_type) { > found = &data[i]; > @@ -289,33 +297,39 @@ get_codec_freq_data(u32 session_type, u32 pixfmt) > return found; > } > > -static unsigned long codec_vpp_freq(u32 session_type, u32 codec) > +static unsigned long codec_vpp_freq(u32 session_type, u32 codec, bool lite) > { > const struct hfi_platform_codec_freq_data *data; > > - data = get_codec_freq_data(session_type, codec); > + WARN_ON(lite); > + > + data = get_codec_freq_data(session_type, codec, lite); > if (data) > return data->vpp_freq; > > return 0; > } > > -static unsigned long codec_vsp_freq(u32 session_type, u32 codec) > +static unsigned long codec_vsp_freq(u32 session_type, u32 codec, bool lite) > { > const struct hfi_platform_codec_freq_data *data; > > - data = get_codec_freq_data(session_type, codec); > + WARN_ON(lite); > + > + data = get_codec_freq_data(session_type, codec, lite); > if (data) > return data->vsp_freq; > > return 0; > } > > -static unsigned long codec_lp_freq(u32 session_type, u32 codec) > +static unsigned long codec_lp_freq(u32 session_type, u32 codec, bool lite) > { > const struct hfi_platform_codec_freq_data *data; > > - data = get_codec_freq_data(session_type, codec); > + WARN_ON(lite); > + > + data = get_codec_freq_data(session_type, codec, lite); > if (data) > return data->low_power_freq; > > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c > index cec7f5964d3d..4ee35049e797 100644 > --- a/drivers/media/platform/qcom/venus/hfi_venus.c > +++ b/drivers/media/platform/qcom/venus/hfi_venus.c > @@ -380,7 +380,7 @@ static void venus_soft_int(struct venus_hfi_device *hdev) > void __iomem *cpu_ic_base = hdev->core->cpu_ic_base; > u32 clear_bit; > > - if (IS_V6(hdev->core)) > + if (IS_V6(hdev->core) || (IS_V4(hdev->core) && is_lite(hdev->core))) > clear_bit = BIT(CPU_IC_SOFTINT_H2A_SHIFT_V6); > else > clear_bit = BIT(CPU_IC_SOFTINT_H2A_SHIFT); > @@ -501,7 +501,7 @@ static int venus_boot_core(struct venus_hfi_device *hdev) > if (count >= max_tries) > ret = -ETIMEDOUT; > > - if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) { > + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core) || IS_AR50_LITE(hdev->core)) { > writel(0x1, cpu_cs_base + CPU_CS_H2XSOFTINTEN_V6); > writel(0x0, cpu_cs_base + CPU_CS_X2RPMH_V6); As previously commented on v5, CPU_CS_X2RPMH_V6 is not needed for AR50_LITE, pls drop. > } > @@ -569,6 +569,9 @@ static int venus_halt_axi(struct venus_hfi_device *hdev) > u32 mask_val; > int ret; > > + if (IS_AR50_LITE(hdev->core)) > + return 0; > + > if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) { > writel(0x3, cpu_cs_base + CPU_CS_X2RPMH_V6); > > @@ -1138,7 +1141,8 @@ static irqreturn_t venus_isr(struct venus_core *core) > wrapper_base = hdev->core->wrapper_base; > > status = readl(wrapper_base + WRAPPER_INTR_STATUS); > - if (IS_IRIS2(core) || IS_IRIS2_1(core)) { > + > + if (IS_IRIS2(core) || IS_IRIS2_1(core) || IS_AR50_LITE(core)) { > if (status & WRAPPER_INTR_STATUS_A2H_MASK || > status & WRAPPER_INTR_STATUS_A2HWD_MASK_V6 || > status & CPU_CS_SCIACMDARG0_INIT_IDLE_MSG_MASK) As previously commented on v5, WD mask is incorrect, pls fix. Thanks, Dikshita > @@ -1150,7 +1154,7 @@ static irqreturn_t venus_isr(struct venus_core *core) > hdev->irq_status = status; > } > writel(1, cpu_cs_base + CPU_CS_A2HSOFTINTCLR); > - if (!(IS_IRIS2(core) || IS_IRIS2_1(core))) > + if (!(IS_IRIS2(core) || IS_IRIS2_1(core) || IS_AR50_LITE(core))) > writel(status, wrapper_base + WRAPPER_INTR_CLEAR); > > return IRQ_WAKE_THREAD; > @@ -1535,7 +1539,7 @@ static bool venus_cpu_and_video_core_idle(struct venus_hfi_device *hdev) > void __iomem *cpu_cs_base = hdev->core->cpu_cs_base; > u32 ctrl_status, cpu_status; > > - if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) > + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core) || IS_AR50_LITE(hdev->core)) > cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6); > else > cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS); > @@ -1555,7 +1559,7 @@ static bool venus_cpu_idle_and_pc_ready(struct venus_hfi_device *hdev) > void __iomem *cpu_cs_base = hdev->core->cpu_cs_base; > u32 ctrl_status, cpu_status; > > - if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) > + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core) || IS_AR50_LITE(hdev->core)) > cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6); > else > cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS); > diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c > index 8dd5a9b0d060..e09b0d9ae610 100644 > --- a/drivers/media/platform/qcom/venus/pm_helpers.c > +++ b/drivers/media/platform/qcom/venus/pm_helpers.c > @@ -51,7 +51,7 @@ static int core_clks_enable(struct venus_core *core) > dev_pm_opp_put(opp); > > for (i = 0; i < res->clks_num; i++) { > - if (IS_V6(core)) { > + if (IS_V6(core) || (IS_V4(core) && is_lite(core))) { > ret = clk_set_rate(core->clks[i], freq); > if (ret) > goto err; > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 29b0d6a5303d..77ebb6bf1ca0 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -548,7 +548,7 @@ vdec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *cmd) > { > struct venus_inst *inst = to_inst(file); > struct vb2_queue *dst_vq; > - struct hfi_frame_data fdata = {0}; > + struct hfi_frame_data fdata; > int ret; > > ret = v4l2_m2m_ioctl_try_decoder_cmd(file, fh, cmd); > @@ -559,18 +559,15 @@ vdec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *cmd) > > if (cmd->cmd == V4L2_DEC_CMD_STOP) { > /* > - * Implement V4L2_DEC_CMD_STOP by enqueue an empty buffer on > + * Implement V4L2_DEC_CMD_STOP by enqueue a buffer on > * decoder input to signal EOS. > */ > if (!(inst->streamon_out && inst->streamon_cap)) > goto unlock; > > - fdata.buffer_type = HFI_BUFFER_INPUT; > - fdata.flags |= HFI_BUFFERFLAG_EOS; > - if (IS_V6(inst->core) && is_fw_rev_or_older(inst->core, 1, 0, 87)) > - fdata.device_addr = 0; > - else > - fdata.device_addr = 0xdeadb000; > + ret = venus_helper_alloc_eos_buf(inst, &fdata); > + if (ret) > + goto unlock; > > ret = hfi_session_process_buf(inst, &fdata); > > @@ -1205,7 +1202,6 @@ static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) > > mutex_unlock(&inst->lock); > return 0; > - > put_power: > vdec_pm_put(inst, false); > error: > @@ -1330,6 +1326,7 @@ static void vdec_session_release(struct venus_inst *inst) > hfi_session_abort(inst); > > venus_helper_free_dpb_bufs(inst); > + venus_helper_free_eos_bufs(inst); > venus_pm_load_scale(inst); > INIT_LIST_HEAD(&inst->registeredbufs); > mutex_unlock(&inst->lock); > @@ -1680,6 +1677,7 @@ static int vdec_open(struct file *file) > if (!inst) > return -ENOMEM; > > + INIT_LIST_HEAD(&inst->eosbufs); > INIT_LIST_HEAD(&inst->dpbbufs); > INIT_LIST_HEAD(&inst->registeredbufs); > INIT_LIST_HEAD(&inst->internalbufs);