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 42C7C21CC57 for ; Tue, 8 Jul 2025 18:05:41 +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=1751997944; cv=none; b=iDvtmOuSLGE5YKfwYEVymWnDSEnqRQEpgFQgjtj392V45JCI8MmaRZzGgcSrwIA3WM9E78MA1YrCyjNduWCljSN7VnyM86xvRykC+rD71oIbUCWXPLarY1WQBYYtXH1zFOTM42crFxpcVJ06wtH1LzM5ybxfHz9p9oeS8YQhB/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751997944; c=relaxed/simple; bh=t50FJzQhmteE/WPApUDxTzLg7TLzhqKkrodxrQ/hniQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KPSPiaUOvpjurIZPxUoNaeL5cXyADXj9f+BbpPiTSeWDhXTPSFT53dryZytrOI2NmsE4diNHSeijn3HSVS+6eD/efXcP4Jjn7tiTjmx6w5A+q4GFWZVqmN4Q+THkgXGd9mQSE0Q+LxzJ3Sb8v4DAJwe4p77G09tBQkJCXEwzt70= 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=Bjm8yW79; 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="Bjm8yW79" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 568AAYF6029327 for ; Tue, 8 Jul 2025 18:05:41 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=XRXx4PrIhdu ugCmIWoy/9iY9WF80V7JusJT0oVTYWXw=; b=Bjm8yW79n9Z3AJTXHNFses7qJJ0 1eqmFngPqiGhyv14oLbIYXDWKV2TB3jZBOmVCeH/2HqmeDJ0ERLvEGT8+CqDxGx6 u6MiHL86xs9wAnhiw68RiUk04twLzF/cFGiudGddTN6uiAw2rxcIM6+a/LXQv/4h tZMU9NxGMUnwGDaHpm3YCHAh7pA56Eubd18ejiuU0m5F10yVGFzhu7kvWZLP/FUI E2EG46fREIP2QOQhYfzw/NzwBmHNdx08rEXMGUcsvYNAY3W9tIBQBzcSj3xDhNmw GjNwJCpaw5h63fydCYnyzT5xqCScwIolR527/K6OV09Q0M6GE6zkB+yL1FQ== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47pv4y1cpc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 08 Jul 2025 18:05:41 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-4a441a769c7so90607921cf.3 for ; Tue, 08 Jul 2025 11:05:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751997940; x=1752602740; 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=XRXx4PrIhduugCmIWoy/9iY9WF80V7JusJT0oVTYWXw=; b=jQ7eXogdeYldjrq7BhBHekDqHv0lzmxX3RvcXLEmD+OubT32ENAOZc3ELO7ZcV7Xty vXc4L6O2gj/WNvVOxchvw88xjby36hPemABCdhpVkLnX39YFrmJF1wr8jNj3eWFmEfJi MR+2xdSyKUJWOp4Ol6r6ubvJdPB3uhCG4vv9pPA+6Qet0vqoDaV6QPaWYQ3w9FfRNxi8 D9JAKSiriESW2y3ugVLb6IxsLspXoAkxct/h1rynTJDW7OycN/I3/drGrHgSdWt1eifw LSjY9vDROVqYch2wuWWLf4AO7Mxf0hFvPF7tB7MH1SxIM3H6dFlb3971K1sEcpPIhxOs Wb1g== X-Gm-Message-State: AOJu0YwFTcbMiniD7B6zDK/i410xfbczqeWvj0XgvLKnaQoMcgJscTDM x7fuWhMVt27s5M5fHdqOP+TlVgPuId+Vd2BXPnp4Bze+8uj2tfZga5vIheJ8xnCyGGB0Pq5GeVk bOwtQfSnHRoWNg0WQZitpaPVq4y3zl+IpL/GSPBumnsHffVf71jZjSUfWt5rksUwmew== X-Gm-Gg: ASbGncu2TmoZ8sjlvodcsl+OjAcBNUtXcRAsaGJ56Tf0C5hbx6dS35N3wGZSWm5fS/H WWduHKVwPrYFxdGMvY0fDcFEp61DJpATzDzE4wBdsmrT0Cgqu07w2kVWKCulRf9NroA0iHAnjpR ANYIV91zxUlKSDT7Utf22MAsWtgRjm6TULv5+gBAkykk7B0MLfElo1lNbb+tdEaDi+/C/ckugmU n+E1v9jO2wSzNQNuw8AYp/QueB666d7k9cjfYJHmIAusX5YMqWirr7PMr1oLGuayl021pICLvlr q1HvXyv9VaxFYoA1jS7GQSKetYYYTl0I7Wc9xIh9cpn25ssbAeJ3JcbqbZZon7iRnhqHHetBkA= = X-Received: by 2002:a05:622a:1a04:b0:494:b3eb:a4b9 with SMTP id d75a77b69052e-4a9dbaa6a28mr6768631cf.51.1751997939897; Tue, 08 Jul 2025 11:05:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHayMJTBouvuIAfJIuce1b3nxsNzsgX73YAfdaekhFto6m7zDySxovSAtcJRgOnV+0y7Xcuaw== X-Received: by 2002:a05:622a:1a04:b0:494:b3eb:a4b9 with SMTP id d75a77b69052e-4a9dbaa6a28mr6767901cf.51.1751997939174; Tue, 08 Jul 2025 11:05:39 -0700 (PDT) Received: from trex.. (97.red-79-144-186.dynamicip.rima-tde.net. [79.144.186.97]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b4708d0a5csm13394906f8f.29.2025.07.08.11.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jul 2025 11:05:38 -0700 (PDT) From: Jorge Ramirez-Ortiz To: jorge.ramirez@oss.qualcomm.com, bryan.odonoghue@linaro.org, quic_vgarodia@quicinc.com, quic_dikshita@quicinc.com, krzk+dt@kernel.org, konradybcio@kernel.org, mchehab@kernel.org, robh@kernel.org, conor+dt@kernel.org, andersson@kernel.org, amit.kucheria@oss.qualcomm.com Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/7] media: venus: Conditionally register codec nodes based on firmware version Date: Tue, 8 Jul 2025 20:05:25 +0200 Message-Id: <20250708180530.1384330-3-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708180530.1384330-1-jorge.ramirez@oss.qualcomm.com> References: <20250708180530.1384330-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA4MDE1MSBTYWx0ZWRfX1NHyfX0EMoma hY55VI4P9kbfJcoPItdnTbQsX7ikT8X+Kgd7Q/P93AJ3L8qNjc7nCmlB4c/7xgbBh9D6QwSJJoJ 1F0pLuIIvX4lsbmRfiXHSfAIPf7+3ETu5FzJkp+o5N9v7Bi1ehwsfqY0io8FMZ7G/tjYqNcnSYJ 6nMlP9OCbm2oYI8xSULjP4VRnVFCOZrd+v3eAdOKAuFwoCs0S4IcCrq8MH3N1g9wSn36aAg9mKi Z4Ie4DoLHwUfdfPPBkAj42huEhnyem//oNsY54+yMuB8iXSb40oKeWA2guz8Bt6zJdjGR+Ebw37 EBL6cxBKu9S4WhjLSIPsMRu5PrNxcrn0EkqMql7JrkQ2gk4jxQAvW06gooq+tE4SiXUopkIF5wS YSEELwxM76ZxVaJ5go+8SKYVA+tfKrQAOl2r62h6zZ3EEgk0dWJPp2WYT3O6W4JjoFVVDZCO X-Proofpoint-ORIG-GUID: 5rUnDQWhYi6YbK3lVZSBnr2L1evABzmG X-Authority-Analysis: v=2.4 cv=DNCP4zNb c=1 sm=1 tr=0 ts=686d5df5 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=oX6B8lV6/A+qF9mARCc04Q==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=b6RcsaAH2Bz4aJime2YA:9 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: 5rUnDQWhYi6YbK3lVZSBnr2L1evABzmG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-08_05,2025-07-08_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 spamscore=0 clxscore=1015 phishscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507080151 The encoding and decoding capabilities of a VPU can vary depending on the firmware version in use. This commit adds support for platforms with OF_DYNAMIC enabled to conditionally skip the creation of codec device nodes at runtime if the loaded firmware does not support the corresponding functionality. Note that the driver becomes aware of the firmware version only after the HFI layer has been initialized. Signed-off-by: Jorge Ramirez-Ortiz --- drivers/media/platform/qcom/venus/core.c | 72 +++++++++++++++--------- drivers/media/platform/qcom/venus/core.h | 8 +++ 2 files changed, 54 insertions(+), 26 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 4c049c694d9c..9744c18af54d 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -28,6 +28,15 @@ #include "pm_helpers.h" #include "hfi_venus_io.h" +static inline bool venus_fw_supports_codec(struct venus_core *core, + const struct venus_min_fw *ver) +{ + if (!ver) + return true; + + return is_fw_rev_or_newer(core, ver->major, ver->minor, ver->rev); +} + static void venus_coredump(struct venus_core *core) { struct device *dev; @@ -202,7 +211,8 @@ static u32 to_v4l2_codec_type(u32 codec) } } -static int venus_enumerate_codecs(struct venus_core *core, u32 type) +static int venus_enumerate_codecs(struct venus_core *core, u32 type, + const struct venus_min_fw *ver) { const struct hfi_inst_ops dummy_ops = {}; struct venus_inst *inst; @@ -213,6 +223,9 @@ static int venus_enumerate_codecs(struct venus_core *core, u32 type) if (core->res->hfi_version != HFI_VERSION_1XX) return 0; + if (venus_fw_supports_codec(core, ver) == false) + return 0; + inst = kzalloc(sizeof(*inst), GFP_KERNEL); if (!inst) return -ENOMEM; @@ -288,14 +301,14 @@ static irqreturn_t venus_isr_thread(int irq, void *dev_id) #if defined(CONFIG_OF_DYNAMIC) static int venus_add_video_core(struct venus_core *core, const char *node_name, - const char *compat) + const char *compat, const struct venus_min_fw *ver) { struct of_changeset *ocs = core->ocs; struct device *dev = core->dev; struct device_node *np, *enp; int ret; - if (!node_name) + if (!node_name || venus_fw_supports_codec(core, ver) == false) return 0; enp = of_find_node_by_name(dev->of_node, node_name); @@ -330,11 +343,13 @@ static int venus_add_dynamic_nodes(struct venus_core *core) of_changeset_init(core->ocs); - ret = venus_add_video_core(core, core->res->dec_nodename, "venus-decoder"); + ret = venus_add_video_core(core, core->res->dec_nodename, "venus-decoder", + core->res->dec_minfw); if (ret) goto err; - ret = venus_add_video_core(core, core->res->enc_nodename, "venus-encoder"); + ret = venus_add_video_core(core, core->res->enc_nodename, "venus-encoder", + core->res->enc_minfw); if (ret) goto err; @@ -363,6 +378,9 @@ static void venus_remove_dynamic_nodes(struct venus_core *core) #else static int venus_add_dynamic_nodes(struct venus_core *core) { + WARN_ONCE(core->res->enc_minfw || core->res->dec_minfw, + "Feature not supported"); + return 0; } @@ -432,7 +450,7 @@ static int venus_probe(struct platform_device *pdev) IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "venus", core); if (ret) - goto err_core_put; + goto err_hfi_destroy; venus_assign_register_offsets(core); @@ -448,19 +466,9 @@ static int venus_probe(struct platform_device *pdev) if (ret < 0) goto err_runtime_disable; - if (core->res->dec_nodename || core->res->enc_nodename) { - ret = venus_add_dynamic_nodes(core); - if (ret) - goto err_runtime_disable; - } - - ret = of_platform_populate(dev->of_node, NULL, NULL, dev); - if (ret) - goto err_remove_dynamic_nodes; - ret = venus_firmware_init(core); if (ret) - goto err_of_depopulate; + goto err_runtime_disable; ret = venus_boot(core); if (ret) @@ -474,34 +482,46 @@ static int venus_probe(struct platform_device *pdev) if (ret) goto err_venus_shutdown; - ret = venus_enumerate_codecs(core, VIDC_SESSION_TYPE_DEC); + if (core->res->dec_nodename || core->res->enc_nodename) { + ret = venus_add_dynamic_nodes(core); + if (ret) + goto err_core_deinit; + } + + ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) - goto err_core_deinit; + goto err_remove_dynamic_nodes; + + ret = venus_enumerate_codecs(core, VIDC_SESSION_TYPE_DEC, + core->res->dec_minfw); + if (ret) + goto err_of_depopulate; - ret = venus_enumerate_codecs(core, VIDC_SESSION_TYPE_ENC); + ret = venus_enumerate_codecs(core, VIDC_SESSION_TYPE_ENC, + core->res->enc_minfw); if (ret) - goto err_core_deinit; + goto err_of_depopulate; ret = pm_runtime_put_sync(dev); if (ret) { pm_runtime_get_noresume(dev); - goto err_core_deinit; + goto err_of_depopulate; } venus_dbgfs_init(core); return 0; +err_of_depopulate: + of_platform_depopulate(dev); +err_remove_dynamic_nodes: + venus_remove_dynamic_nodes(core); err_core_deinit: hfi_core_deinit(core, false); err_venus_shutdown: venus_shutdown(core); err_firmware_deinit: venus_firmware_deinit(core); -err_of_depopulate: - of_platform_depopulate(dev); -err_remove_dynamic_nodes: - venus_remove_dynamic_nodes(core); err_runtime_disable: pm_runtime_put_noidle(dev); pm_runtime_disable(dev); diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 5b1ba1c69adb..3af8386b78be 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -50,6 +50,12 @@ struct bw_tbl { u32 peak_10bit; }; +struct venus_min_fw { + u32 major; + u32 minor; + u32 rev; +}; + enum vpu_version { VPU_VERSION_AR50, VPU_VERSION_AR50_LITE, @@ -92,6 +98,8 @@ struct venus_resources { u32 cp_nonpixel_start; u32 cp_nonpixel_size; const char *fwname; + const struct venus_min_fw *enc_minfw; + const struct venus_min_fw *dec_minfw; const char *enc_nodename; const char *dec_nodename; }; -- 2.34.1