From nobody Thu Oct 9 01:09:53 2025 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 B320D235BEE for ; Mon, 23 Jun 2025 10:51:18 +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=1750675880; cv=none; b=NNZJWaDVSW3As6DPqkkAfLOHpCQt45FDLQwEcjxdReaqdDagiCApQtTTWR1FLCPsclwhz6hI/mqhO+Gn3Sobqs8/pga1cS7rnZRl70Z5Q2uLzyKB8hIADOWL+cGHOdfVSVfxd5XAU0dEdD6v26LsfXSqsSWCePZXJor0yGoWCpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750675880; c=relaxed/simple; bh=9LSytQPyTFkBJt9YzIaXb6/U5LogpeOg/rPyGmYojDo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Cm4P3YL3Vep6EQxGpzom+xb/w6TpRNDqgiJRn+FD51rm/U5ykpQ36Nf1hoAir7sRvHIJhuaHY+oDSUQjZBsL40AAtjfORe8EvxvVTQQpEhiTjzmMMK79kfIDjQL2hnbZTBi8mPMBvNM4CBNYIhuklXVmv/poRVvNNkhVWc2UO+Q= 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=B92V3qmr; 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="B92V3qmr" 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 55N7fdIl021793 for ; Mon, 23 Jun 2025 10:51:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=x740bfZ74Zy o3mZSJA/M7WOOgB+n7paS30h2fBwgGpY=; b=B92V3qmrptzyRQR/uuYnYG1uFU3 pKwMZtAwz/Z5F3DO5CL8OG7Jq6CRyhYkTpht4aB3tmc5rTodS8PLEXteQJ6sTmsl NVkaK4+l/lBCNuPsT1DjXq1QeCpOcXuF/UyHgoSR2wtllqxh7QDpYSO21694LBmd bWwrihhcqAs85ZpCkUQ9Y52CXv/+SN2j0eZCZzy/evlLTobuP4BziZM+UIqYejp3 bo7ySuZtxAb0NQRKeCOL87clkWfYzAYp4zwkp3n4MTU/Yc4CYxbGr2M1pMGKDry/ yxqkWi+MHmf4OO4v7AZhuWKilAISiJbyZWnVMtN4C9RSTjkNTIThugWcwAg== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47f2rprh4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 23 Jun 2025 10:51:17 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c790dc38b4so663103885a.0 for ; Mon, 23 Jun 2025 03:51:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750675877; x=1751280677; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x740bfZ74Zyo3mZSJA/M7WOOgB+n7paS30h2fBwgGpY=; b=EOCarbvMK8xSDuod0KgfYoZnlPCwCH5nK/lNY2HlwlGAG20dkxHdkbFpzoeiuwbvMl nGbWbINwfzPf4dZggGHHbOB8+254pzVjsrFE6r0ckrNq57jE3tlvGgr7i+7FjMQ8jY70 jCUS7h5hwZfu70vI/yVbfiCZffozxKNQfLeWXRX6JhGTEJOvoVfV0sLEBXJlxoLY7lpK T7OCNTPGnW4Oaxb7xu7haRfy3qnEviwtnxpDo3LnOi9IirOmpBdusIsmA7MRKaXJo9QJ ko/2Fdo1P79ez8FsloGOqlINqhtTgrGvuRhhhTZHyhnBayc3UDpcJY/nVzk5eokw1beK uigw== X-Forwarded-Encrypted: i=1; AJvYcCVygVsFVmcJ4ESyvU84lyQ81YQWJh7v3l7HTJZBWsk7gsWZEKwV82xjUPJryRV6jHgEXtVw5BM2o/GGUes=@vger.kernel.org X-Gm-Message-State: AOJu0YyxTP32kjKqKHN+09bvn+k571IeyZdHKC+o9BHiPQmi91fTKJ0i PONFrReYARwXmjczaqpoipDxAY8quSeEjujl21u/IJtP8ZSeKtBE4o3+tmj651UtxbZRepbQ0Si acwYR6oZB9DqCNJgzFWJo4foDqPtimfCZWY4jbIWtP57krFqux/W771di9S6rpYEQmXc= X-Gm-Gg: ASbGncu9xuoTQqLO936LqwVUa0LvMPZIAztNl9deeI7i0Uh3OO6ZZbY5q20HKKjMcWZ iPauWe+uiuyxFVNXUVZF2Xb06fBrghAVtWfEdR12P1OK2XcgFyZqK83VBx2silAXapps9E+J6hU IGz7YfyBt196K2bdadsPJLQ3JvE8VFSC/uYWoUpKM4tzdoaYlJ2EvLrD0hj/BdCNuibKI0EUmct rv0W/JJ58wR6Km9LcT74wGP/Ar7v+7YVF96ZuhRF08fsT4JHTZxBIIfesj9svgRQdP+2aqmI+Dw j6CPLL5nOGZLVcVI5O6uAR0SrFBtH02MbPplB9BrhDv01mEFTN1rbJhtvLTDEODuNQHP8EXKIwK c X-Received: by 2002:a05:620a:4112:b0:7c7:c1f8:34eb with SMTP id af79cd13be357-7d3fc0625a9mr1406347185a.23.1750675876705; Mon, 23 Jun 2025 03:51:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFraPfCr4FC4vsti+CVOOg0GTleJvAU6FX5+6t5gE9B4Hmr3Z1tfZsKzIA7D6IFQ4f0i40f6Q== X-Received: by 2002:a05:620a:4112:b0:7c7:c1f8:34eb with SMTP id af79cd13be357-7d3fc0625a9mr1406338985a.23.1750675875371; Mon, 23 Jun 2025 03:51:15 -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 5b1f17b1804b1-45365af83easm100821835e9.25.2025.06.23.03.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 03:51:14 -0700 (PDT) From: Jorge Ramirez-Ortiz To: jorge.ramirez@oss.qualcomm.com, quic_vgarodia@quicinc.com, quic_dikshita@quicinc.com, bryan.odonoghue@linaro.org, mchehab@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andersson@kernel.org, konradybcio@kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/5] media: venus: hfi_plat_v6_lite: Populate decode capabilities Date: Mon, 23 Jun 2025 12:51:05 +0200 Message-Id: <20250623105107.3461661-4-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250623105107.3461661-1-jorge.ramirez@oss.qualcomm.com> References: <20250623105107.3461661-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=NdDm13D4 c=1 sm=1 tr=0 ts=685931a5 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=hV3zkybWQsGKz9K1FyYA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjIzMDA2NSBTYWx0ZWRfXz43A4271jjwU 8xaQgBKOtFWn9LfnEzAEDLe6cc4QRcChQwAr5HpMQWMeH8uOvAuFkLOICAswLasE1W+FKsT0TUl Kip9TZqk9iBY9NcyxiH3hjdONIa/s8PyhGh+B2qDv/l/mmXUnTtj+I09FLvOIehAIOOqsKKLRaW YMIYZ8bV9EI8unaT32ogR/vaVA0U+UPfW42qVRJTIt4qWYNcE+WVUXCJmcSkD0iA3RiLoRQN4Ab EFhO5pMM4CNQCatyv78g710NfHgCYDMw1bXJyZzfkwlNfLbVWTPBRubUViCOEyQcrBNulbaJKQq DFUxzq+sfeqmk1qk4OOozrygI74qeI+lqcXh4CJp2D1K/0QFnEUy3K+1n0YG96mzeSqknQOvJ/u eLW9fEBLhxDoK/sXMDIP0N6bs/Mx8/IQULlahiInlsfiWII4vwtsk122GxwPd68seEaNfKcy X-Proofpoint-ORIG-GUID: ZvvfU4tabVRDseNNwoU2Z8FGvmb0tK8e X-Proofpoint-GUID: ZvvfU4tabVRDseNNwoU2Z8FGvmb0tK8e 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-23_03,2025-06-23_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 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-2506230065 Content-Type: text/plain; charset="utf-8" Add hfi platform file with decoding capabilities for hfi v6_lite. Signed-off-by: Jorge Ramirez-Ortiz --- drivers/media/platform/qcom/venus/Makefile | 2 +- .../media/platform/qcom/venus/hfi_platform.c | 2 + .../media/platform/qcom/venus/hfi_platform.h | 1 + .../qcom/venus/hfi_platform_v6_lite.c | 148 ++++++++++++++++++ 4 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 drivers/media/platform/qcom/venus/hfi_platform_v6_lite.c diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/pla= tform/qcom/venus/Makefile index 91ee6be10292..4a6a942db58b 100644 --- a/drivers/media/platform/qcom/venus/Makefile +++ b/drivers/media/platform/qcom/venus/Makefile @@ -5,7 +5,7 @@ venus-core-objs +=3D core.o helpers.o firmware.o \ hfi_venus.o hfi_msgs.o hfi_cmds.o hfi.o \ hfi_parser.o pm_helpers.o dbgfs.o \ hfi_platform.o hfi_platform_v4.o \ - hfi_platform_v6.o hfi_plat_bufs_v6.o \ + hfi_platform_v6.o hfi_plat_bufs_v6.o hfi_platform_v6_lite.o \ =20 venus-dec-objs +=3D vdec.o vdec_ctrls.o venus-enc-objs +=3D venc.o venc_ctrls.o diff --git a/drivers/media/platform/qcom/venus/hfi_platform.c b/drivers/med= ia/platform/qcom/venus/hfi_platform.c index 643e5aa138f5..f56b8f9946d7 100644 --- a/drivers/media/platform/qcom/venus/hfi_platform.c +++ b/drivers/media/platform/qcom/venus/hfi_platform.c @@ -13,6 +13,8 @@ const struct hfi_platform *hfi_platform_get(enum hfi_vers= ion version) return &hfi_plat_v4; case HFI_VERSION_6XX: return &hfi_plat_v6; + case HFI_VERSION_6XX_LITE: + return &hfi_plat_v6_lite; default: break; } diff --git a/drivers/media/platform/qcom/venus/hfi_platform.h b/drivers/med= ia/platform/qcom/venus/hfi_platform.h index ec89a90a8129..6356e4bd0de2 100644 --- a/drivers/media/platform/qcom/venus/hfi_platform.h +++ b/drivers/media/platform/qcom/venus/hfi_platform.h @@ -58,6 +58,7 @@ struct hfi_platform { =20 extern const struct hfi_platform hfi_plat_v4; extern const struct hfi_platform hfi_plat_v6; +extern const struct hfi_platform hfi_plat_v6_lite; =20 const struct hfi_platform *hfi_platform_get(enum hfi_version version); unsigned long hfi_platform_get_codec_vpp_freq(enum hfi_version version, u3= 2 codec, diff --git a/drivers/media/platform/qcom/venus/hfi_platform_v6_lite.c b/dri= vers/media/platform/qcom/venus/hfi_platform_v6_lite.c new file mode 100644 index 000000000000..41958a3e353b --- /dev/null +++ b/drivers/media/platform/qcom/venus/hfi_platform_v6_lite.c @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2025, The Linux Foundation. All rights reserved. + */ +#include "hfi_platform.h" + +static const struct hfi_plat_caps caps[] =3D { +{ + .codec =3D HFI_VIDEO_CODEC_H264, + .domain =3D VIDC_SESSION_TYPE_DEC, + .caps[0] =3D {HFI_CAPABILITY_FRAME_WIDTH, 128, 1920, 1}, + .caps[1] =3D {HFI_CAPABILITY_FRAME_HEIGHT, 128, 1080, 1}, + .caps[2] =3D {HFI_CAPABILITY_MBS_PER_FRAME, 64, 8160, 1}, + .caps[3] =3D {HFI_CAPABILITY_BITRATE, 1, 60000000, 1 }, + .caps[4] =3D {HFI_CAPABILITY_MBS_PER_SECOND, 64, 244800, 1}, + .caps[5] =3D {HFI_CAPABILITY_FRAMERATE, 1, 120, 1}, + .caps[6] =3D {HFI_CAPABILITY_MAX_VIDEOCORES, 0, 1, 1}, + .num_caps =3D 7, + .pl[0] =3D {HFI_H264_PROFILE_BASELINE, HFI_H264_LEVEL_1}, + .pl[1] =3D {HFI_H264_PROFILE_MAIN, HFI_H264_LEVEL_41}, + .pl[2] =3D {HFI_H264_PROFILE_HIGH, HFI_H264_LEVEL_5}, + .pl[3] =3D {HFI_H264_PROFILE_CONSTRAINED_BASE, HFI_H264_LEVEL_41}, + .pl[4] =3D {HFI_H264_PROFILE_CONSTRAINED_HIGH, HFI_H264_LEVEL_41}, + .num_pl =3D 5, + .fmts[0] =3D {HFI_BUFFER_OUTPUT, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[1] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[2] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12}, + .fmts[3] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV21}, + .num_fmts =3D 4, +}, { + .codec =3D HFI_VIDEO_CODEC_HEVC, + .domain =3D VIDC_SESSION_TYPE_DEC, + .caps[0] =3D {HFI_CAPABILITY_FRAME_WIDTH, 128, 1920, 1}, + .caps[1] =3D {HFI_CAPABILITY_FRAME_HEIGHT, 128, 1080, 1}, + .caps[2] =3D {HFI_CAPABILITY_MBS_PER_FRAME, 64, 8160, 1}, + .caps[3] =3D {HFI_CAPABILITY_BITRATE, 1, 60000000, 1 }, + .caps[4] =3D {HFI_CAPABILITY_MBS_PER_SECOND, 64, 244800, 1}, + .caps[5] =3D {HFI_CAPABILITY_FRAMERATE, 1, 120, 1}, + .caps[6] =3D {HFI_CAPABILITY_MAX_VIDEOCORES, 0, 1, 1}, + .num_caps =3D 7, + .pl[0] =3D {HFI_HEVC_PROFILE_MAIN, HFI_HEVC_LEVEL_5 | HFI_HEVC_TIER_MAIN}, + .pl[1] =3D {HFI_HEVC_PROFILE_MAIN10, HFI_HEVC_LEVEL_5 | HFI_HEVC_TIER_MAI= N}, + .num_pl =3D 2, + .fmts[0] =3D {HFI_BUFFER_OUTPUT, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[1] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[2] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12}, + .fmts[3] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV21}, + .num_fmts =3D 4, +}, { + .codec =3D HFI_VIDEO_CODEC_VP9, + .domain =3D VIDC_SESSION_TYPE_DEC, + .caps[0] =3D {HFI_CAPABILITY_FRAME_WIDTH, 128, 1920, 1}, + .caps[1] =3D {HFI_CAPABILITY_FRAME_HEIGHT, 128, 1080, 1}, + .caps[2] =3D {HFI_CAPABILITY_MBS_PER_FRAME, 64, 8160, 1}, + .caps[3] =3D {HFI_CAPABILITY_BITRATE, 1, 60000000, 1 }, + .caps[4] =3D {HFI_CAPABILITY_MBS_PER_SECOND, 64, 244800, 1}, + .caps[5] =3D {HFI_CAPABILITY_FRAMERATE, 1, 120, 1}, + .caps[6] =3D {HFI_CAPABILITY_MAX_VIDEOCORES, 0, 1, 1}, + .num_caps =3D 7, + .pl[0] =3D {HFI_VP9_PROFILE_P0, 200}, + .pl[1] =3D {HFI_VP9_PROFILE_P2_10B, 200}, + .num_pl =3D 2, + .fmts[0] =3D {HFI_BUFFER_OUTPUT, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[1] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[2] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12}, + .fmts[3] =3D {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV21}, + .num_fmts =3D 4, +} }; + +static const struct hfi_plat_caps *get_capabilities(unsigned int *entries) +{ + *entries =3D ARRAY_SIZE(caps); + return caps; +} + +static void get_codecs(u32 *enc_codecs, u32 *dec_codecs, u32 *count) +{ + *enc_codecs =3D 0x0; + *dec_codecs =3D HFI_VIDEO_CODEC_H264 | HFI_VIDEO_CODEC_HEVC | + HFI_VIDEO_CODEC_VP9; + *count =3D 3; +} + +static const struct hfi_platform_codec_freq_data codec_freq_data[] =3D { + { V4L2_PIX_FMT_H264, VIDC_SESSION_TYPE_DEC, 440, 0, 440 }, + { V4L2_PIX_FMT_HEVC, VIDC_SESSION_TYPE_DEC, 440, 0, 440 }, + { V4L2_PIX_FMT_VP9, VIDC_SESSION_TYPE_DEC, 440, 0, 440 }, +}; + +static const struct hfi_platform_codec_freq_data * +get_codec_freq_data(u32 session_type, u32 pixfmt) +{ + const struct hfi_platform_codec_freq_data *data =3D codec_freq_data; + unsigned int i, data_size =3D ARRAY_SIZE(codec_freq_data); + const struct hfi_platform_codec_freq_data *found =3D NULL; + + for (i =3D 0; i < data_size; i++) { + if (data[i].pixfmt =3D=3D pixfmt && + data[i].session_type =3D=3D session_type) { + found =3D &data[i]; + break; + } + } + + return found; +} + +static unsigned long codec_vpp_freq(u32 session_type, u32 codec) +{ + const struct hfi_platform_codec_freq_data *data; + + data =3D get_codec_freq_data(session_type, codec); + if (data) + return data->vpp_freq; + + return 0; +} + +static unsigned long codec_vsp_freq(u32 session_type, u32 codec) +{ + const struct hfi_platform_codec_freq_data *data; + + data =3D get_codec_freq_data(session_type, codec); + if (data) + return data->vsp_freq; + + return 0; +} + +static unsigned long codec_lp_freq(u32 session_type, u32 codec) +{ + const struct hfi_platform_codec_freq_data *data; + + data =3D get_codec_freq_data(session_type, codec); + if (data) + return data->low_power_freq; + + return 0; +} + +const struct hfi_platform hfi_plat_v6_lite =3D { + .codec_vpp_freq =3D codec_vpp_freq, + .codec_vsp_freq =3D codec_vsp_freq, + .codec_lp_freq =3D codec_lp_freq, + .codecs =3D get_codecs, + .capabilities =3D get_capabilities, + .bufreq =3D hfi_plat_bufreq_v6, +}; --=20 2.34.1