From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 46F361ACED9 for ; Sun, 15 Jun 2025 11:38:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749987522; cv=none; b=ndJWl8q2Pw5/XgL//VQOZvXEeNxuGX//Xju/A+syR8WdRcZ3xGdrNf8aq7zvNbn1AutKP9bTDhhS2xj9W9HpOgFXThDfIGve45W/aeg93lXV77wW2UtsoAKyf0GpEIMAhlAcHoLgFtsPhAM2Lb9TFk41CSvk2K4m15hq6gOszGs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749987522; c=relaxed/simple; bh=0Uag2VWucVriPBW/+ObDdf74SmeiahIer5x7lH+OTSU=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Bw9og/1vsJjZ3pKcT+BZCQ+Rr3RqelQdW0LibMjbhGggTRy2Ke94aqA83rdTW1wqxTihhh27xFUpplLwtPczRr8Xvt3DdP+9O+zp5s229wRjD0mxCCIhPmXuFGDHUcRgSa/GFbtS/dEdzTMAV8Z6YDDnNHTmy4lRmVzUnGoBpp4= 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=aeAmsabp; arc=none smtp.client-ip=205.220.180.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="aeAmsabp" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55F8u8mf028450 for ; Sun, 15 Jun 2025 11:38:39 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= bXqYLGlqlzd8+s496QpWhCkM/84b9MCwia7brTzlb10=; b=aeAmsabpExkVBtLJ TH+UB8vQqexIdKt2IELKKWJZxcl8/35Xakyyp/VB39EM39rfiemlVJF97hk0/RoX 31hmMMg2Nvm/WQ8601u2SGpjC0XoU7jAEBqAUvxf7pr7bl+J+4/pihr/rlvzHoul voE0d9bIZ8tNd8nM05NJD2aFcX8hGC+Vf/ee1TbQ0mPb0wSlwjebDJ8jyPYOx/yQ BOoZCovosuFy31/AYa/LsWugZaOCSEGD4I5Faj/jERegI2ijWKtPDgoY4v6jMsGk yZjwJrxIJP+OctzkOIlsyklf64sOtOf2L0X62vsmHY1UIT7ejCY4SmznE7cheff2 2Jdtfg== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4791h91ts3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 15 Jun 2025 11:38:38 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6face1d593bso75669336d6.3 for ; Sun, 15 Jun 2025 04:38:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749987518; x=1750592318; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bXqYLGlqlzd8+s496QpWhCkM/84b9MCwia7brTzlb10=; b=bqYLb5QnzrRPyYoRb2WWw/6+cOfGKAxhf1EBaa/k9a+25KeDS8afcVjjLHFNMlAi9D jB+o1vSZl2jLHnPwyIRBe3sw2oqDaNmyMPmsMQWq0JvbN4UvtlZGt9+RVasOZ7dLKcGS 9tVpglgiMTs5a/7y2N9SYkZ6tDhIHFOeyS70F6tDKjzoK4I13ttVkNkO3KJBBbqAF9Ut c3gmOsTE6axa+bohY/7VWvbJje+AoJKi+OdOXEAzyEaTbU52hxiZPKwAi+Jch3LhMWtU mde1svazI7lKe/DQuF+uMBktQ9Nc/S/kYnnA5Si9Zmd2pDMO60Ko0n8jSxQh0KOhb+sz JR4g== X-Forwarded-Encrypted: i=1; AJvYcCXXOcG6WSgijlYUPtLM941pmrWjQ75H4Eyr3MJtMufcPlWJ5ca1ttyreBeAbh0R8W4EURSmF1B0tPgC@vger.kernel.org X-Gm-Message-State: AOJu0Yw5xXkE+SZVhUBN5YdBDmExwXx122TNXv/aVy8dCRRBKM48eyWH XhTililMNtIaDvLEthueJqaY4gBDBxZYbaP2gZry5HZ8gK3G8s1poTus3m890HZ2gN7Y+eHd8o0 YXWnBANjCRBK6HZj6UxpaLpb8hKnj4cNhTYg3iamcL2lXR8NJDDBZj3h+d4chIQ+7 X-Gm-Gg: ASbGncu6UbnMwdi7dgirrg2bB3mjoeBjTlMcRpoNJ+J4+TdrBoGxf3MePNe6n/BaoOj bSt+BLmuUWbXv0vmc+5waA+N+5Vo+P843D62+FSbLy5LGrffpFpNXB2LFW9EoACeOSJkZCdj9Eq 4ON8APoeTG6tUrlqY96tU0IaZwcbeVLl/+nJ+SOpo4vbbgmH7/SAjnKMhwdVAbC/rVoFT6pF2hl I9xfQZJJq3RRY50RwpuiJIg2vjkoMF+0ca4mP9EOrNeD81vPCQXTEMPxD09DBzYeDfIHTlQE91z Y1XmI4N5FFlxlkCGMttk39ahCdHq6Lmq66km6tYx4L4E5jXsjEkP1DL1Gg== X-Received: by 2002:a05:6214:2527:b0:6fa:c054:1628 with SMTP id 6a1803df08f44-6fb477d995fmr88709576d6.23.1749987517782; Sun, 15 Jun 2025 04:38:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+URHVBFEqOte2FHY/YGepJG4y7tTjvrfiCozyILbC/AN/LFj9hUWkK7QivE+HE1KHFhDq3g== X-Received: by 2002:a05:6214:2527:b0:6fa:c054:1628 with SMTP id 6a1803df08f44-6fb477d995fmr88709256d6.23.1749987517274; Sun, 15 Jun 2025 04:38:37 -0700 (PDT) Received: from trex (132.red-79-144-190.dynamicip.rima-tde.net. [79.144.190.132]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b08c7csm7649263f8f.50.2025.06.15.04.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jun 2025 04:38:36 -0700 (PDT) From: Jorge Ramirez X-Google-Original-From: Jorge Ramirez Date: Sun, 15 Jun 2025 13:38:35 +0200 To: Bryan O'Donoghue Cc: Jorge Ramirez-Ortiz , quic_vgarodia@quicinc.com, quic_dikshita@quicinc.com, mchehab@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, stanimir.varbanov@linaro.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/5] media: venus: vdec: ar50_lite video core support Message-ID: References: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> <20250613140402.3619465-4-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Proofpoint-ORIG-GUID: yXmVWwKq2mlRf2I4OK-8fyEOWX7JBWVF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE1MDA4NiBTYWx0ZWRfX9ssSS89ucx17 6OrVbceBbMU+3BUok1g73sNv22o1avovvseZVdVwiy6siI/hurmdRVKFCZXPg9BVX2aL/Zb6tMR A+w9CCTATfS6177u8nepw96kurGI75XBipM+/ihrpxfZXfUJ3wHbRqLo4WDnqxBH7zPO44+whjd f9HlDD+mPA/NSOsALaqr704gXlpqjQ0Httn/gMPAtfLHhtwDkXt85TKqaEjmJB2qvNQr2cpOU3I jHoiSnZxtNLgRpSvsUD9F5AGL/Ndt9qLd6niUZSj3s0fh2BwQq+SbvePeks6hhzMlg1Mvl6X+Wl zXHAbmOoruw0VFV6wb8qwGdj/bQnYqSk0RQnlsE67KzH+YaolyS4LQNaOx5MPNibR/4WTcErW4n Nq9wtKsGZgSDIkSHyzyW/y6szdJwoAGGHh/nGZYH9REkowRxSix+Mf04pSD1kREC1yM0WD66 X-Authority-Analysis: v=2.4 cv=UL/dHDfy c=1 sm=1 tr=0 ts=684eb0bf cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=fk49nW119sd43Y2KmFAA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-GUID: yXmVWwKq2mlRf2I4OK-8fyEOWX7JBWVF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-15_06,2025-06-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506150086 On 13/06/25 15:18:02, Bryan O'Donoghue wrote: > On 13/06/2025 15:04, Jorge Ramirez-Ortiz wrote: > > The AR50_LITE is a streamlined 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. > > > > Signed-off-by: Jorge Ramirez-Ortiz > > --- > > drivers/media/platform/qcom/venus/core.c | 11 ++- > > drivers/media/platform/qcom/venus/core.h | 5 +- > > drivers/media/platform/qcom/venus/firmware.c | 8 +- > > drivers/media/platform/qcom/venus/helpers.c | 81 +++++++++++++++++++ > > drivers/media/platform/qcom/venus/helpers.h | 2 + > > .../media/platform/qcom/venus/hfi_helper.h | 10 ++- > > drivers/media/platform/qcom/venus/hfi_venus.c | 14 ++-- > > .../media/platform/qcom/venus/pm_helpers.c | 1 + > > drivers/media/platform/qcom/venus/vdec.c | 15 ++-- > > 9 files changed, 123 insertions(+), 24 deletions(-) > > > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > > index d305d74bb152..736ef53d988d 100644 > > --- a/drivers/media/platform/qcom/venus/core.c > > +++ b/drivers/media/platform/qcom/venus/core.c > > @@ -254,14 +254,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)) { > > Is there a property that IS_IRIS_2_1 || IS_AR50_LITE that we could use > instead of expanding this IS_THING list ? I know what you mean but I think looking for possible comonalities between cores will just make the partitioning more obscure. we could perhaps define a different type of macro ie, something like IS_CORE(core, IRIS2, IRIS2_1, AR50_LITE) ? shall I go ahead with this type of macro instead? > > > > 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 b412e0c5515a..122441f9600a 100644 > > --- a/drivers/media/platform/qcom/venus/core.h > > +++ b/drivers/media/platform/qcom/venus/core.h > > @@ -382,6 +382,7 @@ enum venus_inst_modes { > > * @lock: instance lock > > * @core: a reference to the core struct > > * @clk_data: clock data per core ID > > + * @eosbufs: a lit of EOS buffers > > * @dpbbufs: a list of decoded picture buffers > > * @internalbufs: a list of internal bufferes > > * @registeredbufs: a list of registered capture bufferes > > @@ -450,6 +451,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; > > @@ -520,7 +522,8 @@ struct venus_inst { > > #define IS_V1(core) ((core)->res->hfi_version == HFI_VERSION_1XX) > > #define IS_V3(core) ((core)->res->hfi_version == HFI_VERSION_3XX) > > #define IS_V4(core) ((core)->res->hfi_version == HFI_VERSION_4XX) > > -#define IS_V6(core) ((core)->res->hfi_version == HFI_VERSION_6XX) > > +#define IS_V6(core) (((core)->res->hfi_version == HFI_VERSION_6XX) || \ > > + ((core)->res->hfi_version == HFI_VERSION_6XX_LITE)) > > #define IS_AR50(core) ((core)->res->vpu_version == VPU_VERSION_AR50) > > #define IS_AR50_LITE(core) ((core)->res->vpu_version == VPU_VERSION_AR50_LITE) > > diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c > > index 66a18830e66d..f8dcef0426ac 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)) > > For example here. > > > 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)) > > writel(WRAPPER_XTSS_SW_RESET_BIT, > > core->wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET); > > else > > @@ -181,7 +181,7 @@ static int venus_shutdown_no_tz(struct venus_core *core) > > void __iomem *wrapper_base = core->wrapper_base; > > void __iomem *wrapper_tz_base = core->wrapper_tz_base; > > - if (IS_IRIS2_1(core)) { > > + if (IS_IRIS2_1(core) || IS_AR50_LITE(core)) { > > /* Assert the reset to XTSS */ > > reg = readl(wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET); > > reg |= WRAPPER_XTSS_SW_RESET_BIT; > > diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c > > index 8295542e1a7c..ae89369c6a07 100644 > > --- a/drivers/media/platform/qcom/venus/helpers.c > > +++ b/drivers/media/platform/qcom/venus/helpers.c > > @@ -230,6 +230,80 @@ 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); > > These EOS buf things look like they are not specific to ar50, could you add > these in a preceding patch to this ? um, previous cores seemed to tolerate passing empty pointers to the VPU firmware without issue. Unfortunately, with the AR50_LITE, this results in segmentation faults in the _firmware_. The purpose of this function is to add support for AR50_LITE while preserving the existing behaviour for other cores...introducing a dedicated function felt cleaner than further complicating the existing conditional. Given that the previous conditional was just an if/else I don’t really see a lot of benefit in refactoring the earlier conditionals _before_ adding the AR50_LITE logic. Would you be OK if we keep it as proposed? > > > + > > +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_AR50_LITE(inst->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 if (IS_V6(inst->core) && > > + is_fw_rev_or_older(inst->core, 1, 0, 87)) { > > + data->device_addr = 0; > > + } else { > > + data->device_addr = 0xdeadb000; > > + } > > + > > + return 0; > > +fail: > > + kfree(buf); > > + return ret; > > +} > > +EXPORT_SYMBOL_GPL(venus_helper_alloc_eos_buf); > > I think the series would be nicer if the EOS buf decomposition stuff went > into a patch that preceded this one, and then you add the IS_AR50_LITE() in > the next patch progressively. see above > > > + > > static int intbufs_set_buffer(struct venus_inst *inst, u32 type) > > { > > struct venus_core *core = inst->core; > > @@ -630,6 +704,13 @@ static int platform_get_bufreq(struct venus_inst *inst, u32 buftype, > > if (!hfi_plat || !hfi_plat->bufreq) > > return -EINVAL; > > + /* Firmware buffer requirements for internal buffers only */ > > + if (IS_AR50_LITE(inst->core)) > > + if ((buftype != HFI_BUFFER_INPUT) && > > + (buftype != HFI_BUFFER_OUTPUT) && > > + (buftype != HFI_BUFFER_OUTPUT2)) > > + return -EINVAL; > > + > > params.version = version; > > params.num_vpp_pipes = inst->core->res->num_vpp_pipes; > > 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_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h > > index f44059f19505..128ddf8e3cd5 100644 > > --- a/drivers/media/platform/qcom/venus/hfi_helper.h > > +++ b/drivers/media/platform/qcom/venus/hfi_helper.h > > @@ -397,13 +397,16 @@ > > #define HFI_BUFFER_INTERNAL_PERSIST_1 0x5 > > #define HFI_BUFFER_INTERNAL_SCRATCH(ver) \ > > (((ver) == HFI_VERSION_4XX || \ > > - (ver) == HFI_VERSION_6XX) ? 0x6 : 0x1000001) > > + (ver) == HFI_VERSION_6XX || (ver) == HFI_VERSION_6XX_LITE) \ > > + ? 0x6 : 0x1000001) > > #define HFI_BUFFER_INTERNAL_SCRATCH_1(ver) \ > > (((ver) == HFI_VERSION_4XX || \ > > - (ver) == HFI_VERSION_6XX) ? 0x7 : 0x1000005) > > + (ver) == HFI_VERSION_6XX || (ver) == HFI_VERSION_6XX_LITE) \ > > + ? 0x7 : 0x1000005) > > #define HFI_BUFFER_INTERNAL_SCRATCH_2(ver) \ > > (((ver) == HFI_VERSION_4XX || \ > > - (ver) == HFI_VERSION_6XX) ? 0x8 : 0x1000006) > > + (ver) == HFI_VERSION_6XX || (ver) == HFI_VERSION_6XX_LITE) \ > > + ? 0x8 : 0x1000006) > > #define HFI_BUFFER_EXTRADATA_INPUT(ver) \ > > (((ver) == HFI_VERSION_4XX) ? 0xc : 0x1000002) > > #define HFI_BUFFER_EXTRADATA_OUTPUT(ver) \ > > @@ -561,6 +564,7 @@ enum hfi_version { > > HFI_VERSION_3XX, > > HFI_VERSION_4XX, > > HFI_VERSION_6XX, > > + HFI_VERSION_6XX_LITE, > > }; > > struct hfi_buffer_info { > > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c > > index b5f2ea879950..302776bf8fe6 100644 > > --- a/drivers/media/platform/qcom/venus/hfi_venus.c > > +++ b/drivers/media/platform/qcom/venus/hfi_venus.c > > @@ -497,7 +497,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); > > } > > @@ -565,6 +565,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); > > @@ -1134,7 +1137,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) > > @@ -1146,7 +1150,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; > > @@ -1531,7 +1535,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); > > @@ -1551,7 +1555,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 409aa9bd0b5d..5d9dfe3fd043 100644 > > --- a/drivers/media/platform/qcom/venus/pm_helpers.c > > +++ b/drivers/media/platform/qcom/venus/pm_helpers.c > > @@ -1168,6 +1168,7 @@ const struct venus_pm_ops *venus_pm_get(enum hfi_version version) > > return &pm_ops_v3; > > case HFI_VERSION_4XX: > > case HFI_VERSION_6XX: > > + case HFI_VERSION_6XX_LITE: > > return &pm_ops_v4; > > } > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > > index 99ce5fd41577..87c7901b280e 100644 > > --- a/drivers/media/platform/qcom/venus/vdec.c > > +++ b/drivers/media/platform/qcom/venus/vdec.c > > @@ -550,7 +550,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); > > @@ -561,18 +561,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); > > @@ -1332,6 +1329,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); > > @@ -1682,6 +1680,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); > Otherwise LGTM. > > --- > bod >