From patchwork Fri Jun 13 14:03:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 896654 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 CE9162D12EE for ; Fri, 13 Jun 2025 14:04: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=1749823474; cv=none; b=Flazv6phpEX02Tq9X8EfS8cJ+uDpKXYVjOomLhln9klbVT7vvgRIo2gWlYsds/9rm18UjdxvPA5WICk7jQD/7F/NSX6ZO9RlOeW0f4YUwNeXhqheSfZXUYaIGBi92RYYTcdkaUxELYK4C/X6eI9U1Vm87LloQLWmgThJgit8Zy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749823474; c=relaxed/simple; bh=gdhfUspPyqBiEzOlF6EWkZ6U0ttrz2LFWzzIn0eDJFA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NyH/8fhtPuUTmUDTyg/Hi7O9AY38lIpgxRJlQsE6YP7BsH668XjWEa5TgoJjDmdR5tphj8HpRu+hO+AZoOAk9UpbKX9Tlo9khuJDgEw9DYG0ALi44fSXn4VU2gi1GgFT0DqGwzWws2P+/Jpe6fy9u41GbRKGOGvkLBWJc3z1GAo= 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=R/pXrXiH; 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="R/pXrXiH" 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 55D7uYMH019613 for ; Fri, 13 Jun 2025 14:04:32 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=dRjk/GIaSQo 1IqS/32SDSp43gzWPCoXG2x1Joi96rvA=; b=R/pXrXiHkOGAxiUHCmLBipGR2bq MikV93dz4G2AvH0QoJf0D49xrjuHxB1qzKpmPL1L1BIxvBuCvOSeGxjsjJkuWqC3 I2MSPEOZ45y+44EjNGXMWM/gRJYkFtMBwrCQJBxp5N9owSYOSLgfAUSK/va5fHAv x4zxdiUpitdIh1PIBBEUv6rtc3oILju8pp/ZyDOV30e6romAFdYOD4HavOtAmtHw kCe+R0rfrmccQ7yr59LSImIwuqQAn3ElfuOAjS21ewi+2IMvI/MsOabDztZ820xB o8c7tTHeWHbT33iLnScgEpbDvrrQ4TJc1EhlwuA54AbtirnPjkTA6JZRw2Q== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 474eqcuq17-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 13 Jun 2025 14:04:31 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2356ce66d7cso30779085ad.1 for ; Fri, 13 Jun 2025 07:04:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749823471; x=1750428271; 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=dRjk/GIaSQo1IqS/32SDSp43gzWPCoXG2x1Joi96rvA=; b=qEPdiV/RBodVzL67MH0oa9Qzer2WHkZashL6uhNIfii4k2WPAgKr1L7JWIBIaqsfh2 4iHCwGDoLjYGxPD7PiwupXwJu8mnI4ciGf+02UaOYh+u5cGGCqyKEsF2gHDDxgUarXJA uGVTjSPbZ6L8AoWUIeJRhdiQ47vo3eqhIjuc04x6Q7D0e7VlJgN3Zqt/32pewyxLfDyZ kHIkUSbk3U4LNsn+YBoUWtoeK7L6cBVwauIG0M8cxZjGq56iZT1/aGKWWDUFy72IsC/s UI/b3q49ky6u4ni++nWPmimacPPK2HkZ8BjjteWpqYB3sASZH0UoM9MOkZghP/OlxuAm FgXg== X-Gm-Message-State: AOJu0YysA6+jNMyLGW1U/b7+dy2FSR7wBJ4EEsQPg6ZACrigDRX1Pyvb LGgFAdODje754l4HBTjfr7HTGeCKLVjYt/qhSYPOCKrvRjprG4yxxppgZ6+5Kd+67UjGs4rR8/a TynoOqq+DOsdnZK/+RJR1B+hTWI+lq7FuRbyt5StEsDld1qVvvQkmBzVohqhmJgXg47Kx X-Gm-Gg: ASbGncuCUw9SCdPbhs6x4DQRNWMg+LrF6eJ/VOtQLBnT3W3uSW9CHvHDvo8aBfnRyfS g78xrZwU/J4NVDK4P9LLg482gQZBwckZzaxOKxp9DLut0WEpw2LaWHI+iOZuDtWN5QEgbM3oVWs 2+/fmIfUzmG8OgH0lkAIIvyzwO3tUGkiRS8R0ny5dxz76vHaWYElosDZalsQLcG4zaEIZ07D1QU 6O6i50DKbuKBB2vPC22BdLYlHx5wxhz7FvkbLNNZgEqSKyEU7HVPqGSoBH8vbtiEHnATyozQ3ss +AgXokZfyrZ5lLF9AV8ldr4evHBaTU6tTywlWniYJPWY83/Wm1uQwkhtZ77aLKKGtYD216jy135 N X-Received: by 2002:a17:902:ea11:b0:234:ed31:fca8 with SMTP id d9443c01a7336-2365db04ca2mr42309725ad.27.1749823469959; Fri, 13 Jun 2025 07:04:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFR8jsfnA0oH2YzM9LYN0RUmbEBZjUfR9KtG7h9Y5VC+XY+k59J/pusktrBSu7tajQ58/h8lw== X-Received: by 2002:a17:902:ea11:b0:234:ed31:fca8 with SMTP id d9443c01a7336-2365db04ca2mr42306475ad.27.1749823465796; Fri, 13 Jun 2025 07:04:25 -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-4532e268de2sm53503615e9.40.2025.06.13.07.04.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 07:04:25 -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, stanimir.varbanov@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] dt-bindings: media: venus: Add qcm2290 dt schema Date: Fri, 13 Jun 2025 16:03:58 +0200 Message-Id: <20250613140402.3619465-2-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> References: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDEwMyBTYWx0ZWRfX6s6cWc9ybtzP 67ympRSTK5mMI535I5OQg+DvdQ0HB9FZvRMKgS9dWNLxMUvurwlxzO9op7BN+Co+D0aTyl/D4T4 fWHZiOsAfNCPdaYI8+bVPHur8gDTfEgFeQihp+QiYqxLf9lyTTmRigei3ldFJZJ6xvLAWiXbmFx EWNIcvjQqoFkfSY2gUXttPs0eUfVCcJ06jHml88eUWkF8WtByhIgqqX0R5KdlDDZXsGv7NtJdvh bE1lUGuVt6fUNtSJJjTy28lZ4DhloeIvJfE0rhC2xCNAtMlCPaSHrvsrmbfBotYG3i7mM7Xt898 vbb05xt9HVmgFahLAGNI/zYH5WChys9a4QFI2s1bz17eSy6I6K+NPFSnqjZbsDYxaMqBhxmr4GA Ehdlcsw8Mk2Z5JtsdBk4N9I47CqOHFPWBARRfw1ggycUIbdG2p1Gg6/CEXsHYZKbXrJZtiLH X-Authority-Analysis: v=2.4 cv=Q7TS452a c=1 sm=1 tr=0 ts=684c2fef cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=6IFa9wvqVegA:10 a=gEfo2CItAAAA:8 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=1mX_ai67dwKzVtmm1w4A:9 a=uG9DUKGECoFWVXl0Dc02:22 a=sptkURWiP4Gy88Gu7hUp:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: XOE1_JMUAmCTbHu8xzO1g8u1zYTo12BO X-Proofpoint-ORIG-GUID: XOE1_JMUAmCTbHu8xzO1g8u1zYTo12BO 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-13_01,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506130103 Add a schema for the venus video encoder/decoder on the qcm2290. Signed-off-by: Jorge Ramirez-Ortiz --- .../bindings/media/qcom,qcm2290-venus.yaml | 153 ++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml diff --git a/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml b/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml new file mode 100644 index 000000000000..ffa72f1e27f3 --- /dev/null +++ b/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml @@ -0,0 +1,153 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/qcom,qcm2290-venus.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm QCM2290 Venus video encode and decode accelerators + +maintainers: + - Stanimir Varbanov + +description: | + The Venus AR50_LITE IP is a video encode and decode accelerator present + on Qualcomm platforms + +allOf: + - $ref: qcom,venus-common.yaml# + +properties: + compatible: + const: qcom,qcm2290-venus + + power-domains: + minItems: 2 + maxItems: 3 + + power-domain-names: + minItems: 2 + items: + - const: venus + - const: vcodec0 + - const: cx + + clocks: + maxItems: 6 + + clock-names: + items: + - const: core + - const: iface + - const: bus + - const: throttle + - const: vcodec0_core + - const: vcodec0_bus + + iommus: + minItems: 1 + maxItems: 5 + + interconnects: + maxItems: 2 + + interconnect-names: + items: + - const: video-mem + - const: cpu-cfg + + operating-points-v2: true + opp-table: + type: object + + video-decoder: + type: object + + properties: + compatible: + const: venus-decoder + + required: + - compatible + + deprecated: true + additionalProperties: false + + video-encoder: + type: object + + properties: + compatible: + const: venus-encoder + + required: + - compatible + + deprecated: true + additionalProperties: false + +required: + - compatible + - power-domain-names + - iommus + +unevaluatedProperties: false + +examples: + - | + #include + #include + #include + #include + #include + + venus: video-codec@5a00000 { + compatible = "qcom,qcm2290-venus"; + reg = <0x5a00000 0xff000>; + interrupts = ; + + power-domains = <&gcc GCC_VENUS_GDSC>, + <&gcc GCC_VCODEC0_GDSC>, + <&rpmpd QCM2290_VDDCX>; + power-domain-names = "venus", "vcodec0", "cx"; + operating-points-v2 = <&venus_opp_table>; + + clocks = <&gcc GCC_VIDEO_VENUS_CTL_CLK>, + <&gcc GCC_VIDEO_AHB_CLK>, + <&gcc GCC_VENUS_CTL_AXI_CLK>, + <&gcc GCC_VIDEO_THROTTLE_CORE_CLK>, + <&gcc GCC_VIDEO_VCODEC0_SYS_CLK>, + <&gcc GCC_VCODEC0_AXI_CLK>; + clock-names = "core", "iface", "bus", "throttle", + "vcodec0_core", "vcodec0_bus"; + + memory-region = <&pil_video_mem>; + iommus = <&apps_smmu 0x860 0x0>, + <&apps_smmu 0x880 0x0>, + <&apps_smmu 0x861 0x04>, + <&apps_smmu 0x863 0x0>, + <&apps_smmu 0x804 0xE0>; + + interconnects = <&mmnrt_virt MASTER_VIDEO_P0 0 &bimc SLAVE_EBI1 0>, + <&bimc MASTER_APPSS_PROC 0 &config_noc SLAVE_VENUS_CFG 0>; + interconnect-names = "video-mem", "cpu-cfg"; + + venus_opp_table: opp-table { + compatible = "operating-points-v2"; + opp-133000000 { + opp-hz = /bits/ 64 <133000000>; + required-opps = <&rpmpd_opp_low_svs>; + }; + opp-240000000 { + opp-hz = /bits/ 64 <240000000>; + required-opps = <&rpmpd_opp_svs>; + }; + }; + + video-decoder { + compatible = "venus-decoder"; + }; + + video-encoder { + compatible = "venus-encoder"; + }; + }; From patchwork Fri Jun 13 14:03:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 896996 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 54D011C3C18 for ; Fri, 13 Jun 2025 14:04:30 +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=1749823472; cv=none; b=pnt3Zg7FWByp6pV4zFh5sbTytxJGPQXnUl02pW292Gl73+XNJORfPDGD3P3bP+07v3fh6H6GuPfgc+qJoP4H4XWOEjDJoJOSP1mWTQIYiCOV4adl4cm8g93w9/OfrDWAlqO5Q2mJN8XSoe0IbMWJk9FfhAmTOHw8VZu5o7HCWnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749823472; c=relaxed/simple; bh=ESY5GP2xLjO/uuUBIZdrZi4e7ID7ZW6MKv1NQJpQTqc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hANbv/Ln/0SpQCsTSMJCbBfyEvdBdRSty9niYrtBBqGO+FSGiA+LI+6+KqZ69EM2vXLjabKh5snOx/lIduf20BPcWGKBjyaB1KwUmXzUfhn0fXNUsCY8D/ILFWfCsK5Qgm3UAC4TtPZ/qnZSHx0Lx/5nMhaPM02yeJU+Kxu5iaM= 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=CD6w4KH9; 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="CD6w4KH9" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55DCH3xC002793 for ; Fri, 13 Jun 2025 14:04:29 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=RsM2hPD5yCf EMigxxJenV5Fcl8jXieeQmSVNx4nPyPY=; b=CD6w4KH92tYbGASewlIXtdsZ4x/ xAIBkOMmQJGk3tgeQjTeAyyVuq+yeDXH09KpCRbl1HUsCrHyTAbJepsOlHlAYwRr dkHORv82z/b6tTQCXrDKg1apZ04CRcJ4uDvfavruZxHdPkMA9ehv3Eqy1I5uo91B V3n7cUeSQGWQEx9bbbQ6ZurW5Pj9fYvOo0/OLaszEH65lzVxV8qJS1Qp8djY1+s6 hAM5TlSKWGCMuIW4eAtd39umQd2zbUBDwuDAeRZnt3e0fslBPc/w8BuDGrEb5i/o 8OC3L8Eb2G7hfUpWBp5f52PFybPNRXLyy0ax2SLKzYE1e1MmgaAS7A+jMYA== Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 477jbpn5bw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 13 Jun 2025 14:04:29 +0000 (GMT) Received: by mail-il1-f200.google.com with SMTP id e9e14a558f8ab-3ddd5cd020dso40911845ab.0 for ; Fri, 13 Jun 2025 07:04:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749823468; x=1750428268; 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=RsM2hPD5yCfEMigxxJenV5Fcl8jXieeQmSVNx4nPyPY=; b=RPNdeOMBcJsSIDdb2woPuY2iOf3FiWgIV8Zif/aZ2Tqgru9AF/r2YELg2nERJ/atD2 sWW5//59p4Aw201JW+sG+4ifaVlsy5O0t17wfy02ju7turZG9DLYIHgpymqgGpxAIXWA cq/MGiXl/CXYH6JrKZFyqsVlvHhKoSkqLiwfiA66ZDe1PZFsqFNOvEaBzNvj6OBUdC2K 8TNoxHbr0+1PPo0QBUzKFeIUDxePRibx4Mf3YIDNqraQQmjxtRAdbtn14ce3NP+flEtp dDsPEnK4E884r9vhrhygtgt8nl6oooKfly1ojo6B9a5YAC/7iadwDig+vuP8bE4odtxV C1lg== X-Gm-Message-State: AOJu0YxKatdJzT3r+kJnzkA+CEEjNve+sPmZPXrWzIJRoz/K5F9jZDGW TuzqJKVLY2OdbOTrCNAIes33Za7+OWKuDGvfFkeMN7dgrldT5L5jng7cJULm8Wisg5BiEQIqBU5 wJlIPLckNCbD+W5A3F62q9BQ0oGtQ10YsAXfpdb9mKNJAa0CgElkE59J9wpasQVJeGjAp X-Gm-Gg: ASbGncsnpvY6MbJoN32DS0a9Zfxyc3n+i+cW/XJW6NS8BZz7hWBJniM1m+RBQDpIA8+ JzHrqpnOLqnuxupoT8xWtXZBelX7RK6p/NOYvaMqKtH1hfrkBWbhY2zV07KWXa2QWM7uL+4HbOE aQ34Z2pVVYWwoJnp1cowSJ2JCUMNWP8BHuy7Jiu9w+524PBx5nfBBMfopsFnnd3RQ7Ly9W3tyaj H0nHHkuQ4f8E63EQH1Brk2Z0d1bLkEwmSM96TZub+KnJQuNX4qHu4NH4sW/4ClxNXSlAtd3d8uL NyuXxgCluiJ1MbOrg9D07dOCUGZiDYTjXfbNvqhgpvbFTmlp7tYvt+2V+D+cV0F9R8X4KLa+ak0 a X-Received: by 2002:a05:6e02:378a:b0:3dd:9164:906a with SMTP id e9e14a558f8ab-3de00bd9d7amr30231205ab.13.1749823467945; Fri, 13 Jun 2025 07:04:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDz0VH3Av7q60En4HuuZIMYCmq560Rv0gKSCOnab2gqKJsosMfxKzcNjWbSyhrF0ZVHcNOeA== X-Received: by 2002:a05:6e02:378a:b0:3dd:9164:906a with SMTP id e9e14a558f8ab-3de00bd9d7amr30230735ab.13.1749823467257; Fri, 13 Jun 2025 07:04:27 -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-4532e268de2sm53503615e9.40.2025.06.13.07.04.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 07:04:26 -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, stanimir.varbanov@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] arch: arm64: dts: qcom: qcm2290: Add venus video node Date: Fri, 13 Jun 2025 16:03:59 +0200 Message-Id: <20250613140402.3619465-3-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> References: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: gVI7IQ8J4-_EBcB2v4e7f96MBe79RWew X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDEwMyBTYWx0ZWRfX/XSr12d+ZLG6 ukr4awJJIS04cIJXJZMSgFZ8vye+gM/0uup+/lPg0Mq2KAtCdZ2UGiMANH8Ua/q4zqGfgAMLZzW CdCkTfLRFQwgdAVdJUYNQ6dccckmSKRfEW/jkIrKxPqmV/Pk5KRm7LiMzQpaPoy9CsSr9LmgK2k 3x9SPd07txiGVQERTHTz1MuoC1REO+te03NWekW3jTyKGIDp5j/YMRxB550v4vsntokZa3WdaAx EWq2vHL4tHMd4tsXzC4/YXcpN4uszVAoEy8hETNSWYoqP8yailkUydxa8xKTinkO6IgWEJGZLPT BSqXqJ2TsiK6cqzocIVwzosilbmR7Q9S1YjpdszcdeW8SCRIq4FquFKBTeO9NzWlqUH4NT5iVvs HW51cQor29vKmiC6QumAP6j9G5pfRT8W4Z79RLmX44/lCylB96BGkrjARs6PGurFQN2R7691 X-Proofpoint-ORIG-GUID: gVI7IQ8J4-_EBcB2v4e7f96MBe79RWew X-Authority-Analysis: v=2.4 cv=OLgn3TaB c=1 sm=1 tr=0 ts=684c2fed cx=c_pps a=i7ujPs/ZFudY1OxzqguLDw==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=6cNYJS_lEeBOaWCNo2sA:9 a=Ti5FldxQo0BAkOmdeC3H:22 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-13_01,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506130103 Add DT entries for the qcm2290 venus encoder/decoder. Signed-off-by: Jorge Ramirez-Ortiz --- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 53 +++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi index f49ac1c1f8a3..af2c1f66fe07 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1628,6 +1628,59 @@ adreno_smmu: iommu@59a0000 { #iommu-cells = <2>; }; + venus: video-codec@5a00000 { + compatible = "qcom,qcm2290-venus"; + reg = <0 0x5a00000 0 0xff000>; + interrupts = ; + + power-domains = <&gcc GCC_VENUS_GDSC>, + <&gcc GCC_VCODEC0_GDSC>, + <&rpmpd QCM2290_VDDCX>; + power-domain-names = "venus", "vcodec0", "cx"; + operating-points-v2 = <&venus_opp_table>; + + clocks = <&gcc GCC_VIDEO_VENUS_CTL_CLK>, + <&gcc GCC_VIDEO_AHB_CLK>, + <&gcc GCC_VENUS_CTL_AXI_CLK>, + <&gcc GCC_VIDEO_THROTTLE_CORE_CLK>, + <&gcc GCC_VIDEO_VCODEC0_SYS_CLK>, + <&gcc GCC_VCODEC0_AXI_CLK>; + clock-names = "core", "iface", "bus", "throttle", + "vcodec0_core", "vcodec0_bus"; + + memory-region = <&pil_video_mem>; + iommus = <&apps_smmu 0x860 0x0>, + <&apps_smmu 0x880 0x0>, + <&apps_smmu 0x861 0x04>, + <&apps_smmu 0x863 0x0>, + <&apps_smmu 0x804 0xE0>; + + interconnects = <&mmnrt_virt MASTER_VIDEO_P0 0 &bimc SLAVE_EBI1 0>, + <&bimc MASTER_APPSS_PROC 0 &config_noc SLAVE_VENUS_CFG 0>; + interconnect-names = "video-mem", "cpu-cfg"; + + venus_opp_table: opp-table { + compatible = "operating-points-v2"; + opp-133000000 { + opp-hz = /bits/ 64 <133000000>; + required-opps = <&rpmpd_opp_low_svs>; + }; + + opp-240000000 { + opp-hz = /bits/ 64 <240000000>; + required-opps = <&rpmpd_opp_svs>; + }; + }; + + video-decoder { + compatible = "venus-decoder"; + }; + + video-encoder { + compatible = "venus-encoder"; + }; + }; + mdss: display-subsystem@5e00000 { compatible = "qcom,qcm2290-mdss"; reg = <0x0 0x05e00000 0x0 0x1000>; From patchwork Fri Jun 13 14:04:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 896995 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 DCF742D12F2 for ; Fri, 13 Jun 2025 14:04:32 +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=1749823475; cv=none; b=MYfmTrlobdz76amkmEKE42h+mYyL6a6WWovYbXp/oQ2cxiQHtGY65+mxW7zaxAkm3lP++z9DJGlLK/ZPI+sv7kpu50xfuaUgV/hO9g7BQ0VT0Z5O3SZL4eMpvIoojsf2pQdAzCfGmqJPZKIjPWU4h7qGtBUpSz9Wirn2ASFvuO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749823475; c=relaxed/simple; bh=ofSIhURbE8JGA42UH0YBsV2VOIoz7qhQ+CYI90S4iYk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RzUErmX0x4hNEFqYo9toubUtDfQWytCnFBKW8fzqJg59a+2R+BynBjWq0trAI3BttoOxpYN+3wBJDVS0kSwNoULT02QTGJkMooiMNq1tmf6fATG+1bYn5zqAlOhuCKjcRa1hwsEsproOYuaQq1Gi1NxWXx5fS+jSViwyLzWDiuA= 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=CGgL3PP0; 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="CGgL3PP0" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55DCjS4m003834 for ; Fri, 13 Jun 2025 14:04:31 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=q4UXbwz6Fhd 4XfS0c/exNIes/qKVhYhBXGv2xa/goXo=; b=CGgL3PP0l1IQJyh0jgJogaxez+Z dmEVvBX+L+aSuDB0nw9+R7Uu2kMU9sBKKRle6W+hjDIBe7LCRgtrhOxzbyDWncai iTqXKTMwtNwdsCLXTKRmcRJIhRbeLNbFkQ5BHwn3N/nXFCfR6oQjYi5mvWECxwJn xhrhnNwEa1qBLdpofb1wIjW8NbI8n4SE8sD8uBtaVHuqd90Dq4Bhh90k7ZQs90cB ph0XU4yifZ/gGp4zi0CjVedWdJIgqvg6+VNS7X5FSLnUYo0oahbPRK6LcIn2ForY 7HEAZLX/5uC2Y+zAUEL9U4iY65qTnZXS4IyMAgcKAKSpmEwhsUqHImiqyjg== Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 477jbpn5c3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 13 Jun 2025 14:04:31 +0000 (GMT) Received: by mail-ot1-f72.google.com with SMTP id 46e09a7af769-739f707258dso729399a34.1 for ; Fri, 13 Jun 2025 07:04:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749823471; x=1750428271; 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=q4UXbwz6Fhd4XfS0c/exNIes/qKVhYhBXGv2xa/goXo=; b=FTo6KeLaMVdr4LyKQa0pThUjnDCv+9cTZuQrvK4OxpGNkzG1jHwVIpvWhihSL6tzZZ hcR40jLPsR4Ld1EshJ8npNwJUrq17N8LKc9/3g8G1ksBi0X3oa+1odnNXrZwkyoCpw07 vA19ECMwRPFcsRTsll5ijkcnztboLYc9KfuuBkco+pf48qUvKN0AU2vZ6LbTIb4BFk4+ 0pQK8wcgjVmk4gade/hPAHbXV1ybaQYeWcmK+iHNCiJYCVec1ohrxbxk2xrl45te3KYb 6uTRoXhNGPcMaZ+59lxcBsA3f3SzwLYD46KJmAgqPoSDCPeIDokN4Oua7Tpc8AdtC/Kp Zn9g== X-Gm-Message-State: AOJu0YxZGfliH+w//zsOyW08RCrg9s4qG+9ov2v+Ngr+a+96qbK31aRx Cg6UE2oz9crq8PRURreOQed4khw9DOH/NCretS5kZ+oa2Kxr7n6zpm+zAbYlpdpEezBMglugPgy AYFhn9q0r/ivJ/TsdfQ5PjFjWsLvwOppN8y5PrZlEj3p3iSPtV0kLO0iDMbJEVvLoC/Rm X-Gm-Gg: ASbGncsSHZO9L5AUvYPaudsM7ykZUD/P4c3CP64OoLgs5WA+B9n2mG9U2krWFkGK68c BjaoZAAVg+EJowRjY/L6eEUKhDPVgHo/hlPoLyg1OQwi+uJn4MyZIQETaP8Sl06U25KbF8iqMJF NVZQt3/ip4kByYDmCPhurOx0BmGY55gg6EykGxhT6ukgLX3onMEN9rFdvq8EcHrij9pWjevBv6M nl/Y26cdu6By/U1OKAra2XXhj9Qb82/M3rtrLjTS48ViwpuLGO7utJ0KUlAWZi2zSsMkVQXyq5D GlltposoMMLIjMtociCcHCGMbBfY6M+hbB0mjjUoFFAYdiKUx4PJvH9R2FXis2jWJRFAEf5XQ/0 k X-Received: by 2002:a05:6830:6488:b0:739:fa45:591c with SMTP id 46e09a7af769-73a27117ce9mr2091256a34.13.1749823470678; Fri, 13 Jun 2025 07:04:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6NK7CuldtPlXawMuq8prfqWmCFAxSuPDLMdl9iuUTY5hKhPURrq6fXjXd9zDxFImakDqQqg== X-Received: by 2002:a05:6830:6488:b0:739:fa45:591c with SMTP id 46e09a7af769-73a27117ce9mr2091046a34.13.1749823468657; Fri, 13 Jun 2025 07:04:28 -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-4532e268de2sm53503615e9.40.2025.06.13.07.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 07:04:28 -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, stanimir.varbanov@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] media: venus: vdec: ar50_lite video core support Date: Fri, 13 Jun 2025 16:04:00 +0200 Message-Id: <20250613140402.3619465-4-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> References: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: Fjngfwxdo7THRbOnL6z3pktSYf1x7cOA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDEwMyBTYWx0ZWRfXx5PAUmEFLsTE OHcNxoxXt6j0cNxplFHbm7jR8F0FBTwG0Jz8p3JLbTRk0amEG5ydfqIfzr6QFc31t1XAW6B7fEX u6dAKjXS7EtWSEp+qSEW/HoJ49B4iawtJylu6M5eEENvmseNomHUBpSEKX7e6/ePXtvNxu5nWgp d4C1S/RlA8VIG8DY1uQTQLaZPv35q1UK+ayZJ5FXuhruLGMl/UcPSQk+EO/IvqgFpsjYE3WQZaz DgNS/hIdENtjnbWtHsEf4y1tsUAdm0l0h4+UnsR+kqhJH/jb4IJEjGfwE1TgLtFGMnFtzH8OIdq +5WTrPIvWMdigqo1bT7zYymmhJkwBG/7CB7N+83+M/y/F9u70sII3FRhpnogHelTlaya47co+xK c3K15QD4jNiSy2cj/hpFLSPAct5I+088fQj91MkcwUMMcuOhy6/BQG0kk53U/nOGrJDC/VuI X-Proofpoint-ORIG-GUID: Fjngfwxdo7THRbOnL6z3pktSYf1x7cOA X-Authority-Analysis: v=2.4 cv=OLgn3TaB c=1 sm=1 tr=0 ts=684c2fef cx=c_pps a=+3WqYijBVYhDct2f5Fivkw==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=Gsml5EI1S0Azkn3hA_8A:9 a=eYe2g0i6gJ5uXG_o6N4q:22 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-13_01,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506130103 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)) { 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)) 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); + +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); + 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); From patchwork Fri Jun 13 14:04:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 896994 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 006991A254C for ; Fri, 13 Jun 2025 14:04:43 +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=1749823485; cv=none; b=MqBYeMYaQKTK9JlryHSxrNDq+4AFF9npC1bKVn+UmlB4neW2nxq63ThK3ugPG4dIZXV4/aRqrBHI31LLQl+qz8MBoqZGWaEInmNO2yGyOnizVPTWunU+AaxgBXP+5o4q6qNMMGynByfGdmGt8/0li8d7liVX/ANFl6ZXJt7+Ggc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749823485; c=relaxed/simple; bh=9LSytQPyTFkBJt9YzIaXb6/U5LogpeOg/rPyGmYojDo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JScj/Df3YtdT+hMydQ/86N7P40JzAQqEzOAhbzhNr55C9yKc8XUod+yXItnlqm7Yx8Zyy6lBl8ZLa3e8VW71soE3e6B1ES3hCplBl7NFUEpAOElPk4Z3oV18si/Hsdq2WO+9ZZ7gNhki7yRQ/2zndtxlG6rR1rxoqPqM9S1FZOY= 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=ju0aZhiD; 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="ju0aZhiD" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55D8HQ9n029236 for ; Fri, 13 Jun 2025 14:04:43 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=ju0aZhiDyvbvsaZfNBH2azwJZ7A Ubzfwh0xHr8I4xdZkbdQgCs3Dd49F9PUxdY3kmrm4RwakCCTQie6mOS2wTNiJcUh Y+n+66o+zX9YTcIWNOVUbSuDw9psHS3GGPqIql2nkJtdRPQyycVGYQMstD9uclq4 NX4/17rE7LW7f4j1sLW+af6C/IQaS8h1CxzD/dypaHIffQj8eX9TZU+z9wlLb8qv ATYX67Q9aRRZZMFF4kYET+RvYjFtjxupSyTxayA9v6gTDxr+vfJgvDDVONBjv/Q5 zdTmgLd+S3Wxfr97TTO7SCK4W9zQXUd3oWpIbgjC93ENSwKk1/cet77Dwww== 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 474dn6kp1y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 13 Jun 2025 14:04:43 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4a6ef72a544so39279821cf.1 for ; Fri, 13 Jun 2025 07:04:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749823482; x=1750428282; 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=Sdl2WFToKXjVWmoaQkNIJYeJuNcQG/4Ey/JcfUHpAQDm+QA+uaFKqeX6nX9Gt9M6Cj 0Aj26ngtmcHL2Sb1mUy/vEPYeQacuWKZ2mfAz0T6lca0pjnPcTe9RhoMi4/1TYWSRrbT /n6+aZYfx8kt+WkskGCn/uZr11b+hVPMdzQoJsRByJcPYpMg4xXJYMNdp+9+z92XB6TS GCVGjH897DnB/eXJykvOL31l79YTvHfcLsN/nXhAVqIMEIFx+sHE5G8rsu5lFyrdeke8 o4lsRjyREMI1FGIeX/zP3Nt06njkaD0ZMvUdDzdFvvaKxBIUx1LuwMOtSiQdbyqN9hKu CzeA== X-Gm-Message-State: AOJu0YwHnXWjGJYHUdAy19nKeD+buoEHpRcXtgMHN4m36BEKjaGEzchi r6HObiIbwprwctM0P+Mn1j6e2ZvhlQXk1jJBl1KCrKp3rEk/eRABO2GhEhaWDmyohH/4sLGLW69 DZ1KmHXO/nZYUVe7+JbkpWGQNn6xHCE1033E1N1ujviu7XpbBaLifHWa9qfq9204vZVItaeSwp8 Oh X-Gm-Gg: ASbGncurnz+M70UemMLQB28waiIkET4u+H08Y+5vLsZ5t10Hl35SLY1TSRtZJLRm1Ce TOrfmhyQzYEJRkQ9/wkQ2VRjBvyQZrPe1FqbMNyz1r/Ab3P0qUjl3+JTKOi1zbgIH3pazKIRqm7 qNUGY9vfMUEOqvLrsocayxOeD7RcaeTs8Az3l+1JPbZTxmuBuDzvl1WEBBqtWmI7mNVGAIlg2Tx D3xzk9FHxdu6/DrESpwJG8JNx5bni3wNp/McMsaK5FnOyb3AliILLMF35IikyQ3P1VQGHQAcOGV zStTzZ9WvgZs/TITzxwlUhmLRdPo1xHJs8IyoIQ0afG9k8ZAaD5E+6kHAkuc9TU/cmrrTLWMHEv M X-Received: by 2002:a05:622a:1b02:b0:4a3:fcc7:c72e with SMTP id d75a77b69052e-4a72fe680eemr41866631cf.9.1749823481471; Fri, 13 Jun 2025 07:04:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbevzv6PguuQR1l0g0dgZ34lTnIzgLDs80v2wMOxJ6UnIl+jvAGGIIASkHXLfT1eW72IufsQ== X-Received: by 2002:a05:6122:1809:b0:52f:4776:f6a7 with SMTP id 71dfb90a1353d-5313c860c0bmr2057695e0c.0.1749823470030; Fri, 13 Jun 2025 07:04:30 -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-4532e268de2sm53503615e9.40.2025.06.13.07.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 07:04:29 -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, stanimir.varbanov@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] media: venus: hfi_plat_v6_lite: Populate decode capabilities Date: Fri, 13 Jun 2025 16:04:01 +0200 Message-Id: <20250613140402.3619465-5-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> References: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDEwMyBTYWx0ZWRfX/h20iCc+utZ8 CCjQqaBAcr6StVYNn2tkG3YyKad2bR26lE5/pYCrFHMFjMw9+E9MGf7jKFkPJQ4bRjd/OrNpoG4 Khuj8LP+hzsw4hK0yg2JAozvTlh4lwtzrM2apY9NHstS5YQW9ooePUysrLpQYQdWBpB/O06YfFF nnnRzr8pLSoHIlqAXPRXFdcVeuMaK5j0OGnNMRTjcyQLALsYCvHR/sxPJxZ8RI24fC3rj++L9G9 UDNOr5G1xcTU76KI/691L4GNkCyourQ0vWIeGlz3YI27LvkhBU3AWDYkfTfR8VrE/Bnrd+E0djZ Da76JA66itLAtv0RscohzapzI91ry/HtriTiDbunyf/exHp+xFZmCX8zdZTWthfm1pMB/0XzYtZ 69JEEIlh/1pSzLuzyHqSCPWhq1em7UOOV1gUadjN1zogdpT5jGtdkdMrMkd9/wn9G4MKDXk7 X-Proofpoint-GUID: yNT6Uyf3LpmHYW0ii7euEVjWBzF7DvkO X-Authority-Analysis: v=2.4 cv=FaQ3xI+6 c=1 sm=1 tr=0 ts=684c2ffb cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=hV3zkybWQsGKz9K1FyYA:9 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-ORIG-GUID: yNT6Uyf3LpmHYW0ii7euEVjWBzF7DvkO 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-13_01,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 adultscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506130103 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/platform/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 += 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 \ venus-dec-objs += vdec.o vdec_ctrls.o venus-enc-objs += venc.o venc_ctrls.o diff --git a/drivers/media/platform/qcom/venus/hfi_platform.c b/drivers/media/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_version 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/media/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 { 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; 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, diff --git a/drivers/media/platform/qcom/venus/hfi_platform_v6_lite.c b/drivers/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[] = { +{ + .codec = HFI_VIDEO_CODEC_H264, + .domain = VIDC_SESSION_TYPE_DEC, + .caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 1920, 1}, + .caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 1080, 1}, + .caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 8160, 1}, + .caps[3] = {HFI_CAPABILITY_BITRATE, 1, 60000000, 1 }, + .caps[4] = {HFI_CAPABILITY_MBS_PER_SECOND, 64, 244800, 1}, + .caps[5] = {HFI_CAPABILITY_FRAMERATE, 1, 120, 1}, + .caps[6] = {HFI_CAPABILITY_MAX_VIDEOCORES, 0, 1, 1}, + .num_caps = 7, + .pl[0] = {HFI_H264_PROFILE_BASELINE, HFI_H264_LEVEL_1}, + .pl[1] = {HFI_H264_PROFILE_MAIN, HFI_H264_LEVEL_41}, + .pl[2] = {HFI_H264_PROFILE_HIGH, HFI_H264_LEVEL_5}, + .pl[3] = {HFI_H264_PROFILE_CONSTRAINED_BASE, HFI_H264_LEVEL_41}, + .pl[4] = {HFI_H264_PROFILE_CONSTRAINED_HIGH, HFI_H264_LEVEL_41}, + .num_pl = 5, + .fmts[0] = {HFI_BUFFER_OUTPUT, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[1] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[2] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12}, + .fmts[3] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV21}, + .num_fmts = 4, +}, { + .codec = HFI_VIDEO_CODEC_HEVC, + .domain = VIDC_SESSION_TYPE_DEC, + .caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 1920, 1}, + .caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 1080, 1}, + .caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 8160, 1}, + .caps[3] = {HFI_CAPABILITY_BITRATE, 1, 60000000, 1 }, + .caps[4] = {HFI_CAPABILITY_MBS_PER_SECOND, 64, 244800, 1}, + .caps[5] = {HFI_CAPABILITY_FRAMERATE, 1, 120, 1}, + .caps[6] = {HFI_CAPABILITY_MAX_VIDEOCORES, 0, 1, 1}, + .num_caps = 7, + .pl[0] = {HFI_HEVC_PROFILE_MAIN, HFI_HEVC_LEVEL_5 | HFI_HEVC_TIER_MAIN}, + .pl[1] = {HFI_HEVC_PROFILE_MAIN10, HFI_HEVC_LEVEL_5 | HFI_HEVC_TIER_MAIN}, + .num_pl = 2, + .fmts[0] = {HFI_BUFFER_OUTPUT, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[1] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[2] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12}, + .fmts[3] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV21}, + .num_fmts = 4, +}, { + .codec = HFI_VIDEO_CODEC_VP9, + .domain = VIDC_SESSION_TYPE_DEC, + .caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 1920, 1}, + .caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 1080, 1}, + .caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 8160, 1}, + .caps[3] = {HFI_CAPABILITY_BITRATE, 1, 60000000, 1 }, + .caps[4] = {HFI_CAPABILITY_MBS_PER_SECOND, 64, 244800, 1}, + .caps[5] = {HFI_CAPABILITY_FRAMERATE, 1, 120, 1}, + .caps[6] = {HFI_CAPABILITY_MAX_VIDEOCORES, 0, 1, 1}, + .num_caps = 7, + .pl[0] = {HFI_VP9_PROFILE_P0, 200}, + .pl[1] = {HFI_VP9_PROFILE_P2_10B, 200}, + .num_pl = 2, + .fmts[0] = {HFI_BUFFER_OUTPUT, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[1] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12_UBWC}, + .fmts[2] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV12}, + .fmts[3] = {HFI_BUFFER_OUTPUT2, HFI_COLOR_FORMAT_NV21}, + .num_fmts = 4, +} }; + +static const struct hfi_plat_caps *get_capabilities(unsigned int *entries) +{ + *entries = ARRAY_SIZE(caps); + return caps; +} + +static void get_codecs(u32 *enc_codecs, u32 *dec_codecs, u32 *count) +{ + *enc_codecs = 0x0; + *dec_codecs = HFI_VIDEO_CODEC_H264 | HFI_VIDEO_CODEC_HEVC | + HFI_VIDEO_CODEC_VP9; + *count = 3; +} + +static const struct hfi_platform_codec_freq_data codec_freq_data[] = { + { 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 = codec_freq_data; + unsigned int i, data_size = ARRAY_SIZE(codec_freq_data); + const struct hfi_platform_codec_freq_data *found = NULL; + + for (i = 0; i < data_size; i++) { + if (data[i].pixfmt == pixfmt && + data[i].session_type == session_type) { + found = &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 = 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 = 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 = get_codec_freq_data(session_type, codec); + if (data) + return data->low_power_freq; + + return 0; +} + +const struct hfi_platform hfi_plat_v6_lite = { + .codec_vpp_freq = codec_vpp_freq, + .codec_vsp_freq = codec_vsp_freq, + .codec_lp_freq = codec_lp_freq, + .codecs = get_codecs, + .capabilities = get_capabilities, + .bufreq = hfi_plat_bufreq_v6, +}; From patchwork Fri Jun 13 14:04:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 896653 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 9E8FD2D5C7C for ; Fri, 13 Jun 2025 14:04: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=1749823477; cv=none; b=Br2wkPb3mWC6YUG2pDPKiMpvEQVzpiuwkzfeLcjTJ08XbNp6d6F7hTjirFkFgqQpksu96wcS0lrBG5cU5DOM+KI6FyG5oEURrr4FQPF9djRSp8yTCOmr+jBH8boGY5t2LW/5NJmLHOuhGygZUezPzjCU/VYQ7vn+tc9I3Q5JaBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749823477; c=relaxed/simple; bh=R3NiWYA6kgddHMiBWO3ir8vpi4s+0r3d1/p6pCY92uo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nFLfJqAmsm9Bx2b7hE7j1hBd7iLBHsQf4kJ+IeGatmfTVAikSfvgw+hl4wTEK/1EmgSdsCBAwdWlUUQd8aztGiSH2swQJJ+xWvmHnxUONmJ6n1P5z30XhOz4iO+S9anKiU/0kUnr9oXjh933MY8kuUcZkJMOZHhIgO5TXZltjbU= 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=YzWy+4yJ; 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="YzWy+4yJ" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55D94Rqv027178 for ; Fri, 13 Jun 2025 14:04:35 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=imWvnWvbJlX 5oc0s6sKOCcLJcc3gmwA4+SPySO+ydLU=; b=YzWy+4yJeRfNTX8XeSouAcdGnAK ZrXS5ggkFYyeyAwXXTzDhxZLoWYnExFjDok5ED5s35S0U4dMbFyTgNQgDcRT7mfG 0LAQrkbHp4cZ0IqSxE6SqDBHh3oFBhF2ZLzpGtetLq6uI017RsGaj5OK4HbI1VJF FYxv/tPg/tHOw6ececAec4SnCzl/CBCzm0gwGv/kr6rex7K7eS98yxdk8F9FE1pi TDYqrCmWKxMYZ1EsndJ/ofBXcqHa6I58LtdHhTeUfrPCc9IqlkQKth4WPRAx8qZI A+SMry/TNpUUp//k4OduMBukFWfWzrDd/QaRrDj5j7OFbW890kv8oows/ig== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 474ccvkmf8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 13 Jun 2025 14:04:34 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-234b133b428so15438455ad.3 for ; Fri, 13 Jun 2025 07:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749823474; x=1750428274; 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=imWvnWvbJlX5oc0s6sKOCcLJcc3gmwA4+SPySO+ydLU=; b=mBKKk7srHG1UFSJ62ab69TDKq2nuMsTrv153B033inzq7hzulhXJSe0E8K7bFBiyli TCB1Xf40WZxx3baU3nE0E3Hmu4/+rEffpqoIAYsphbJLcugij5jx72VC5lNLUcUKKhzJ tEnr6wsN7ByKRfh4QzJhDcdrlhIO+iXv9HAO/yYa53X/H88jvnSYPZk23NrIbhCZPUnN kFmpEAhmzYIA4Li3nYMMDqAoh4lCuCjNOf4sGjbjg5LFnZt0pqU0PvW7bwOMf2dWMaN0 7AKDl/syAMsT3qoHnUJ2Sd7Pe7x99o5v9NaK8EYv0FhOFqi/Vdo6dhGUfRx9AkDTzVbs thAQ== X-Gm-Message-State: AOJu0YyjdMtRBDbLBm7M7kLiCRh9OCQcSLNepKMIqLjdMK1t4BNy3AVe OeWUtxfUOaZwg4Id4iTNmbVZGdwu9LlmZMjygk1IhQq1PTgGSAqmiz0+wHpEiSuWsn3MnHV2CRe 6CKHFqiJ5wXjkgfjFm0unWPLilnH+Kcxpd4IpL1hv1ucMvSw0rNySOw9eYJ1t51t/uWcW X-Gm-Gg: ASbGncuc+OwKLH98ucJ0TKQb77csQpk3KQusAvGIxA7oNyLRLtAGt94oeOEI38pqMES dd5NHxHwsjbN8SfM4QtnxsHPWzLoyQUETQ1REkrkd5VHcn6cTbX75WdQTlQA0qVq8iE3lHLuW6g LnQzPUymjlhQz0sbqFUvdoS8OBO3wTlK06CwaWxrv+ZVKIyKxQ8RPv8IAPK+Y462jXWVJMsIEA0 VkIzmeij9g2wYKE88lGOzGDdZGjGBH1Y16WaJvk5SdLAAeBKIhsJUzTHQjIs+mpmce4WeDza+8r iuyD0nkFVTEwI/aczfYuZNdzsHY7CV5kaAWoCHhl8bkO/+Yplq70n36iNKyJcwxPdZZlTwwhIiF c X-Received: by 2002:a17:902:dac4:b0:223:4537:65b1 with SMTP id d9443c01a7336-2365dc34597mr46376365ad.36.1749823473111; Fri, 13 Jun 2025 07:04:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGokbzd2JnXLw/G0v+GhIQGYqaRbjI8iFogXgFN8uc9fiV1mee+ivB1odTvwJXOn83pvOiTng== X-Received: by 2002:a17:902:dac4:b0:223:4537:65b1 with SMTP id d9443c01a7336-2365dc34597mr46374855ad.36.1749823471406; Fri, 13 Jun 2025 07:04:31 -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-4532e268de2sm53503615e9.40.2025.06.13.07.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 07:04:30 -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, stanimir.varbanov@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] media: venus: core: Add qcm2290 DT compatible and resource data Date: Fri, 13 Jun 2025 16:04:02 +0200 Message-Id: <20250613140402.3619465-6-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> References: <20250613140402.3619465-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: E3swj1Hoya8L7sN5XfnYat0S6EsAnE_y X-Authority-Analysis: v=2.4 cv=TsLmhCXh c=1 sm=1 tr=0 ts=684c2ff2 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=wjE3nLva0YkvARyJ+Gfmxg==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=5jRkx2jbz5RiTHLqnWMA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: E3swj1Hoya8L7sN5XfnYat0S6EsAnE_y X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDEwMyBTYWx0ZWRfX6AXzteA5QFFY wPfIAHLNvjkgUePVWF/GMPSOqA0VD4vWCQrQWbQkJ/0VYVxQSL7wY2XACcT2E1XwCm/vVe/c7xi tnTiqH7xG36LZeSbG3QdnbA+JcmYGfOvG8RLJm3h476A834+LzorOsLG0nEAkMlXnxfuUgsvM71 9hNhNgOxirUfM0lzvncpXx+51CBuoBVdcQY/1HjNij/WvkmqKR+F3z4WjRbUmRqhabBZV4/Dghd q+LbPRMLCdVVng3dEEhx2c3GWcZiTCt8tndfswgGp372TX4iD2xslzx/+hD8T7nNyID4go9D4ww e/FkmCK3d6vUOPh+1ySybpp5YUxdlDCKSv/wq8RDGR1xpB0fya7mhfsXkjxn3k2vSN35fyAYNC6 pxRZ3ixTwH80dFJbZQEZLpnLMKPIJRRtcGQ515BJkTq8lZ4NKguPnerFHS0ZYPi4pE3yGl4r 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-13_01,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 bulkscore=0 adultscore=0 clxscore=1015 mlxscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506130103 Add a qcm2290 compatible binding to the venus core. Signed-off-by: Jorge Ramirez-Ortiz --- drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 736ef53d988d..f1f211ca1ce2 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = { .enc_nodename = "video-encoder", }; +static const struct freq_tbl qcm2290_freq_table[] = { + { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */ + { 244800, 133000000 }, /* 1920x1088 @ 30 */ +}; + +static const struct bw_tbl qcm2290_bw_table_dec[] = { + { 244800, 2128000, 0, 2128000, 0}, /* 1920x1088 @ 30 */ +}; + +static const struct venus_resources qcm2290_res = { + .freq_tbl = qcm2290_freq_table, + .freq_tbl_size = ARRAY_SIZE(qcm2290_freq_table), + .bw_tbl_dec = qcm2290_bw_table_dec, + .bw_tbl_dec_size = ARRAY_SIZE(qcm2290_bw_table_dec), + .clks = { "core", "iface", "bus", "throttle" }, + .clks_num = 4, + .vcodec0_clks = { "vcodec0_core", "vcodec0_bus" }, + .vcodec_clks_num = 2, + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, + .vcodec_pmdomains_num = 2, + .opp_pmdomain = (const char *[]) { "cx" }, + .vcodec_num = 1, + .hfi_version = HFI_VERSION_6XX_LITE, + .vpu_version = VPU_VERSION_AR50_LITE, + .max_load = 352800, + .num_vpp_pipes = 1, + .vmem_id = VIDC_RESOURCE_NONE, + .vmem_size = 0, + .vmem_addr = 0, + .cp_start = 0, + .cp_size = 0x70800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, + .dma_mask = 0xe0000000 - 1, + .fwname = "qcom/venus-6.0/venus.mbn", + .dec_nodename = "video-decoder", +}; + static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, @@ -1072,6 +1110,7 @@ static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, { .compatible = "qcom,sc7280-venus", .data = &sc7280_res, }, { .compatible = "qcom,sm8250-venus", .data = &sm8250_res, }, + { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, }, { } }; MODULE_DEVICE_TABLE(of, venus_dt_match);