From patchwork Wed Nov 27 14:05:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13887071 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25FFD1FDE0F for ; Wed, 27 Nov 2024 14:05:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732716335; cv=none; b=LkgK7eFK9LWG+0F33mr9E+D2f/WKNZkuMdo2Ms5AVGPx8qsSgT9xOHH4AxxEwDgFYlrNqZsBbFzAhYXujavkAWCG4gnFng8hyHpRCeNs+wOR9EhPTpMbeQXPvP2kpsj9UimBfq7LC7vNliqyw7TtrkCgFqiyxRLr9Njz9TxNsMk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732716335; c=relaxed/simple; bh=Jun+TNcIcdGqyR9m9r70xX2+3XMcbqQf7N5g2lHQI8U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tcNw66xF/A7nTpXms2f/jiPEAnPphcblTa3RZoAkrchANMcfx3B0Umliul2ore8tOFMSElwG2fLv73vivybrzjKJVIVKSeCglx+TmV8/9+NY/05OSvcaqLVdQFT9v+TT+dV1Ua8hiW5/7PtbVicHp/Poz2RaKd1qQs721QI6Jys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=iserlLWp; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="iserlLWp" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43494a20379so34568365e9.0 for ; Wed, 27 Nov 2024 06:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732716331; x=1733321131; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kkyjHovVhF2za/eO844TdXiyUkiQq2AjnkVKs/psESc=; b=iserlLWpn/i5h0MWrpI/B1lR8seCSXu2f+8AGYD1EORvWu5VLGH+ldOUTMCjasjyqW TFpU0LB0E5h3MxT/ivZBiLf+F7H4P41Mr1SrfbDEz+A0UUsQeHK9bNFJb+z/GUvAf5Oq qo+rm/WG9poXvCs2Cw5AAiRTYeqwhZQANpidFswgoLo1bO2LHBg918RryBDXzZ3g/jRN keoJLIfMY5wxcVmjnLTOWpN3EkSGeWdONGL8aQIfu4UbcjNO0sf0U3GAeRO1D3ncWm+I BAmhFqrij3c2Chd7atlJejC2B1i9f4aLVa5iDQBgdyXjDI90yudOY5ki0YQXL8KszMrh ndlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732716331; x=1733321131; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kkyjHovVhF2za/eO844TdXiyUkiQq2AjnkVKs/psESc=; b=k03Rq8sFqMLF1LYkt6QP9A1H4CQ8LKIP8BshSWbRUMFBdiIhFv8hb5WCH0/jnWdrqA lI9T6NPGDti/mN9e5ZKJMR9u92+zRsRFVxq53Y4BQH+ddTfc1x4IGF7lVJxc8s4F93L4 s7vTIvJyWjVeDHkmzwCDgaq9GBueLW/kTbRh/3UDHglqXcRYByr/+Z1RuQT34qZodMK5 PeSfmj681NojWCcTbdyViLC/5XHWulO1+oHxJTV0F1KzCZy0JcZIFimNRxk3G6lZu0B8 Y5a4PNdVuqoAPXw9nVrwWsKfF/L3ZFkNoM0sKb/9JAFv/mU5xHgfOY8ehj4XvxFOQyDm RZFg== X-Forwarded-Encrypted: i=1; AJvYcCXkT0k3F4o1Nm0NhapPsjb+fV9ujCSe8hzRz1gvmyBehYn1ATXmSpUYLfqN9jNTu+V1+1u8ZI98ZskBLoDS@vger.kernel.org X-Gm-Message-State: AOJu0YylUx/VGWombye5bHhvYG2DWHsCOciVOf+hKpCzZfqMvF6mhykZ fDk38KsqZPK/XAlhhpkbnPMr4ZpNti2iU4akiKWQOoaERPLKtKUc2cT9Wyo6l71qgpwWbOPj2oE YfWE= X-Gm-Gg: ASbGncsb+asFX63nouRtvltCrDCOh+B7TCXVgdBAozGhTudHc4I43PERsKI6RVVyGcM +9m5orI/iDKwnd+em6QWL0aN2Ut2sPbXEuJ4fNYrKPpPXr2rofz0miGbv4cYS2ArqEUqMtYSTjs G3ukZoUiH/kZOhg0gKW/tklMDURPBiuy//bnjXPGItFjuehbGqHlobl03mznR1rzATJA4LrGkjt 8dO/QBjHNwTf4fmEEOhgI0vibNW13J4nElxv6b4XJFhWAO7e5mLoyngybc= X-Google-Smtp-Source: AGHT+IF+evUzX0S8G+s/qBLrp0Ga3c5Qz719qieeSbz4B54bkNLs3TgSrjjpGZtLuEOmAL0xZLK/gQ== X-Received: by 2002:a05:600c:3aca:b0:434:9e1d:7626 with SMTP id 5b1f17b1804b1-434a9df6a16mr25687795e9.25.1732716318018; Wed, 27 Nov 2024 06:05:18 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fad6436sm16442335f8f.13.2024.11.27.06.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 06:05:15 -0800 (PST) From: Bryan O'Donoghue Date: Wed, 27 Nov 2024 14:05:12 +0000 Subject: [PATCH v3 1/3] media: venus: Add support for static video encoder/decoder declarations Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-1-ef6bd25e98db@linaro.org> References: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-0-ef6bd25e98db@linaro.org> In-Reply-To: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-0-ef6bd25e98db@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: quic_renjiang@quicinc.com, quic_vnagar@quicinc.com, quic_dikshita@quicinc.com, konradybcio@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , devicetree@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15-dev-dedf8 Add resource structure data and probe() logic to support static declarations of encoder and decoder. Right now we rely on video encoder/decoder selection happening in the dtb but, this goes against the remit of device tree which is supposed to describe hardware, not select functional logic in Linux drivers. Provide two strings in the venus resource structure enc_nodename and dec_nodename. When set the venus driver will create an OF entry in-memory consistent with: dec_nodename { compat = "video-decoder"; }; and/or enc_nodename { compat = "video-encoder"; }; This will allow us to reuse the existing driver scheme of relying on compat names maintaining compatibility with old dtb files. dec_nodename can be "video-decoder" or "video0" enc_nodename can be "video-encoder" or "video1" This change relies on of_changeset() API as a result select OF_DYNAMIC will be added to venus/Kconfig Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/Kconfig | 1 + drivers/media/platform/qcom/venus/core.c | 56 +++++++++++++++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 2 ++ 3 files changed, 59 insertions(+) diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig index bfd50e8f34219db8a1de7960d7ea93b20db2982a..f7085ec65a9206078ce60c70dff70c7fb0f27e91 100644 --- a/drivers/media/platform/qcom/venus/Kconfig +++ b/drivers/media/platform/qcom/venus/Kconfig @@ -3,6 +3,7 @@ config VIDEO_QCOM_VENUS depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && QCOM_SMEM depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST + select OF_DYNAMIC select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_SCM select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 4e26b18790537885a77d66c1917a4e7a146eaf57..17506d547a6172b89acb77879337750c22f993cf 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -286,6 +286,36 @@ static irqreturn_t venus_isr_thread(int irq, void *dev_id) return ret; } +static int venus_add_video_core(struct device *dev, struct of_changeset *ocs, + const char *node_name, const char *compat) +{ + struct device_node *np, *enp; + int ret; + + if (!node_name) + return 0; + + enp = of_find_node_by_name(dev->of_node, node_name); + if (enp) { + of_node_put(enp); + return 0; + } + + np = of_changeset_create_node(ocs, dev->of_node, node_name); + if (!np) { + dev_err(dev, "Unable to create new node\n"); + return -ENODEV; + } + + ret = of_changeset_add_prop_string(ocs, np, "compatible", compat); + if (ret) + dev_err(dev, "unable to add %s\n", compat); + + of_node_put(np); + + return ret; +} + static int venus_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -365,6 +395,32 @@ static int venus_probe(struct platform_device *pdev) if (ret < 0) goto err_runtime_disable; + if (core->res->dec_nodename || core->res->enc_nodename) { + struct of_changeset *ocs; + + ocs = devm_kmalloc(dev, sizeof(*ocs), GFP_KERNEL); + if (!ocs) { + ret = -ENOMEM; + goto err_runtime_disable; + } + + of_changeset_init(ocs); + + ret = venus_add_video_core(dev, ocs, core->res->dec_nodename, "venus-decoder"); + if (ret) + goto err_runtime_disable; + + ret = venus_add_video_core(dev, ocs, core->res->enc_nodename, "venus-encoder"); + if (ret) + goto err_runtime_disable; + + ret = of_changeset_apply(ocs); + if (ret) { + dev_err(dev, "applying changeset fail ret %d\n", ret); + goto err_runtime_disable; + } + } + ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) goto err_runtime_disable; diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 27784fd7082c321222b23ca4b2902a04c49e19ca..4ce98a3ef186823a57ac40e2e8e42b08fafed575 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -90,6 +90,8 @@ struct venus_resources { u32 cp_nonpixel_start; u32 cp_nonpixel_size; const char *fwname; + const char *enc_nodename; + const char *dec_nodename; }; enum venus_fmt { From patchwork Wed Nov 27 14:05:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13887072 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7FC71FCFE2 for ; Wed, 27 Nov 2024 14:05:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732716341; cv=none; b=Fpf0qaHH+aKM9BAok9zqD3FVC2XrNWqhPmHltpx6kP0q0xb8cUULT8kIjCerUYCGTIQtsCRNAlnE5ZvqoTEeCYbZonMDXGRFOjFPK37QdcGlpCTUsMeJxTiNTthDqFrZxm4p0aeGT+H91P38jfastQIfS7V2V0ggZdEs6zbF0UE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732716341; c=relaxed/simple; bh=5nl7J9DAIXEGP6XFckA2tv9xwlEwURwQ899BzKy9f8Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aL5/9CXY7sOtpBDX97z1t7JB7un6UCqw+yJpc/HQw3yrfjmm7L67JgR2ctjE2IYz7cwH80zRcNg+gpimtVrcXZJ/ExY7xep0+l4PfqoMoSJEvBoQUb8EUbhvQ081HnNY/ZQQ4kXhj1n7Y/WWFt5v5qKJxYUgyNEGJfTAudNl1yY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=E79oSJ7a; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="E79oSJ7a" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-37ed3bd6114so4116983f8f.2 for ; Wed, 27 Nov 2024 06:05:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732716338; x=1733321138; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=O3KnIWFjjoDSB2qzMeOzFANQJr83mKvOblCgk3APOdI=; b=E79oSJ7aM9So6DIi6ebvCTmbfD5uWSV/1HuUTRNHlPMJJbvLS6a86mUOQIr0q7Ec5c UwAlzOe7vKRAKfLiJBoNwKZDOPlWibS6Ij1DM1lrRFN24ZcW7ZHA1bSorkKl5E7D2MAs POEx90lE1W2Iy+a3/usxMLl0ZEDn/ZfQ4Pv7B1oByHghOaFRPrcubiu7rm6cyITVS2eM iK34GlitLe3eAKF4refj3z/jOaLrZJVs1wcoQsdOPD86n5/YNd6P48x7M8VwGj3wUmCK bg7ofvx27zG/z2a+wN8id3luwwB1GXPlhzfUmj2ELx+34RyEaSveoeGPTpr8X2KsBZdR MX9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732716338; x=1733321138; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O3KnIWFjjoDSB2qzMeOzFANQJr83mKvOblCgk3APOdI=; b=VHNDQ6DDErMoWStGFQokVJNb0zmqAxTJYHwl+wWPnSMJLSls+wLKmw3Fe0B9EMFLF+ 7zgdvra8S/7TkFh78Ez5nJGR6MPKSnxXooIa51xUGHZCouexc1eo1Ijwh5lVG02LOMDv lPaOq78AvT3RdnyYGX7PTvTYqBow2tUOVQAioWoR4OC22K2TezNwVU393k/RYJsgl11j XRuBHecuCElLck4tvw9E3qvmZjRQbvF6ajBW8msSaBxfYaoisp9bG/AHpjig0++6XP2O RezQCnIjvTi3GPROW0IxQ0ar4SHsYqPnM1+b4O6kHjRgqaFGGi1PwO5FMhL8LfrsrwhI irGw== X-Forwarded-Encrypted: i=1; AJvYcCUOBmrXrlQFI7Keb0RYMiFjh0AM8OLJ6k9D62wwF5zTeRcXQwJvcMJECyZ7ccGzpQGs54vLkvkTv05q3G6r@vger.kernel.org X-Gm-Message-State: AOJu0YyvbYuJ/CwNth6u8yjGIixoe+MgWIcrs0fNepjWK2zQkCetAYZA 0oCADIUR2q2YHdDVq+eRJsHxzGHtsnE/3/F+nV1k0aX5p4zPbYV10Xw8XZDq6iHntO0kyrSpwT0 MZ2k= X-Gm-Gg: ASbGncvdFaQpAs2kuXdS9LZ2L86a+mKxvXfkDVb7a8J7Gf8lUMWt9+IngaOYc317waP KaTe2EMQGcwzZOlgt7dDrn8/y82V1fDhVIgO0liUpwZYz5v4C7WoZFXnPsJQGbGhz1gS3zylksc X+SQIuG31c1f9Rg/pz/Ruxn52SrnAlue9niBE+A2YMUcI7NjYfq+lWiufBLUA+coDwMzGeHXr+B 4prLfhFZ+spZxNO8sJV++bffCZD488F4d9v7WM0mGwONcwpZbZAe4jPoCk= X-Google-Smtp-Source: AGHT+IH1besm8MXed2bbNz2tG5fNbHLcusvV2pLrja2OfQ86xatsGvkilUchOdemfTRmClezQOvYuQ== X-Received: by 2002:a5d:6d02:0:b0:382:4fb2:cca2 with SMTP id ffacd0b85a97d-385c6ba6858mr2794455f8f.0.1732716332392; Wed, 27 Nov 2024 06:05:32 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fad6436sm16442335f8f.13.2024.11.27.06.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 06:05:31 -0800 (PST) From: Bryan O'Donoghue Date: Wed, 27 Nov 2024 14:05:13 +0000 Subject: [PATCH v3 2/3] media: venus: Populate video encoder/decoder nodename entries Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-2-ef6bd25e98db@linaro.org> References: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-0-ef6bd25e98db@linaro.org> In-Reply-To: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-0-ef6bd25e98db@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: quic_renjiang@quicinc.com, quic_vnagar@quicinc.com, quic_dikshita@quicinc.com, konradybcio@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , devicetree@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15-dev-dedf8 Populate encoder and decoder node-name entries for the upstream parts. Once done the compat="video-encoder" and compat="video-decoder" in the dtsi can be dropped though the venus driver will continue to favour DT declared video-encoder/video-decoder declarations over static declarations for compatibility. Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 17506d547a6172b89acb77879337750c22f993cf..847caf4d9cdb6fc3f4133450d40b69a4baba522d 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -638,6 +638,8 @@ static const struct venus_resources msm8916_res = { .vmem_addr = 0, .dma_mask = 0xddc00000 - 1, .fwname = "qcom/venus-1.8/venus.mbn", + .dec_nodename = "video-decoder", + .enc_nodename = "video-encoder", }; static const struct freq_tbl msm8996_freq_table[] = { @@ -847,6 +849,8 @@ static const struct venus_resources sdm845_res_v2 = { .cp_nonpixel_start = 0x1000000, .cp_nonpixel_size = 0x24800000, .fwname = "qcom/venus-5.2/venus.mbn", + .dec_nodename = "video-core0", + .enc_nodename = "video-core1", }; static const struct freq_tbl sc7180_freq_table[] = { @@ -895,6 +899,8 @@ static const struct venus_resources sc7180_res = { .cp_nonpixel_start = 0x1000000, .cp_nonpixel_size = 0x24800000, .fwname = "qcom/venus-5.4/venus.mbn", + .dec_nodename = "video-decoder", + .enc_nodename = "video-encoder", }; static const struct freq_tbl sm8250_freq_table[] = { @@ -950,6 +956,8 @@ static const struct venus_resources sm8250_res = { .vmem_addr = 0, .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu-1.0/venus.mbn", + .dec_nodename = "video-decoder", + .enc_nodename = "video-encoder", }; static const struct freq_tbl sc7280_freq_table[] = { @@ -1012,6 +1020,8 @@ static const struct venus_resources sc7280_res = { .cp_nonpixel_start = 0x1000000, .cp_nonpixel_size = 0x24800000, .fwname = "qcom/vpu-2.0/venus.mbn", + .dec_nodename = "video-decoder", + .enc_nodename = "video-encoder", }; static const struct of_device_id venus_dt_match[] = { From patchwork Wed Nov 27 14:05:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13887073 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90B081FCF41 for ; Wed, 27 Nov 2024 14:05:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732716356; cv=none; b=MqmIFvh9WiPujtDtbmir59UahT1VppkeFIEK8A7uHYMOVAKgTXq1FcWoc3sCRFmd2NE4OeUrVmTbZ3GT82lsESOXaCJ/QL/uJUh/sbprjxAco4L7u5x4obN+6wkxnnFLRJPLpsRFyzcrujL8EaNJB1TfTm+peAzNH2nviyyJXS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732716356; c=relaxed/simple; bh=1/9/VRiAd3mFuJE0x6u0oROPGPE9qYr/1F5OkY7DYEU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hB/t2xa9B+c+h1xgo/G+N4ELKhutrxNeM9jqU3VrHTYu54ky4QRumXWq9PEf6KDMooM9m5SNMCEP+tQdR2D8+m3aZ7n8s21GPFukiEqMoqTXse+PSRB4raEOgqzWfjjXMxXmkKClnkFHzR1cRcPPNaS3MKUm5zIMiFIRIVatgYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Aq+a2KGp; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Aq+a2KGp" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-434a1639637so25311225e9.1 for ; Wed, 27 Nov 2024 06:05:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732716353; x=1733321153; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LnTMbYbEVvxii8W+l8ai6UooboM0MmZTrUVAFR7MtHk=; b=Aq+a2KGp0tU//R7kGaugvrrG9U1Kdu+Z6PXztprx5neXUn1B2qOhar0hDxMUXRGyPR XhGdueaGYqEXEyTfQ8woGhp4hhv3qlFgDgNVn3k5HdDNn1VTVLBYWaJNVtQBWY3Z9m1S F+hZNH+h6FXg3w/0K6Xf/m9NIsq+gfhcWmYR98qOp+p5ckGhJba3UByt/EQx7zVuasek +GEy9tjEVvRnvCQBOUIAXI3tePv+NMqZAXFIZPj+veUgCkryShQqQDi04Yp3ft2Q68fD 1xnpVBY0GwlgbLZ9p2RtxdVFziGAjMT56xs5WbfSjI8lfK/OMl62AnMp44LkRqJCjXUv Hbog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732716353; x=1733321153; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LnTMbYbEVvxii8W+l8ai6UooboM0MmZTrUVAFR7MtHk=; b=ZuMAuRzKFoy2N+gH5aM/He/l6WlBmWkr+vI1jytnk8RMLGVVkBeNPpaVnUovdZv9/+ WcgV3qE54OoPUN/p+9MvoPlyYxwlVc4uBbeB+usw0W+qRQ57qHbgRKrQnSJ3TcMQG08r ZxL6GU6vgxiH0F5/17073w7jUQcmCMn4EldolFq3xNEIZOeI1il2c28RhH5iNgeVFKmZ S5PyV7eLBqy7E4BcGoZbWxqWcEIjUgre5L2fFGkLfNTNPRJkBrLkS4aR6abm+MqxFa4E pS4kaDdiCi7Sfkcr++ACVnrbDAGGitSGnEdywVhAHvaPgfbiAS/fOt3Mm8HhG+rtktY5 o+Pg== X-Forwarded-Encrypted: i=1; AJvYcCUGNE0tpblHlBw0hPYSaRaKZUwRctAj2ZD2hjuNfwHfOMVjm8XT/w2EHGBcyFuM5EyQwbFXYhEyN3iqIkaA@vger.kernel.org X-Gm-Message-State: AOJu0YzmWcylP9cx5yNIRMEJZms3/zltQHYwY6woIcm4VzoXlYa6Z5BI P5C2k/4gmkBGwY9+FNu5NlTE6DeHiz+j6bOCegAba/FTc/N1QZH4dkHNfP/iU9viyvtmlONo0Mh uULk= X-Gm-Gg: ASbGncvOEQr5hv2X9VLN8K1P0x9E75QOoLejV5jJERWcHuQvcMycogL+Qs4f8qdelK0 Qcj14/3Y/TIOfdawVMQabyNDtPBKCiIyIAo0A6xX8Lga5NZwitGk/zP9w9WT3WaCpgTuExqQpOd bXbHnWsgumvSuU8CXtYPBqoMTr8wE+lEmUSW1pm6+51FPWRodBNDFlantdJyOILOxVZvnsPueXH RI3gzG7y0zxDwPTOleRK2rbbFGt0C9dVoHx5VfTciVDqnrrHVHhAYlZHe0= X-Google-Smtp-Source: AGHT+IGg2acUZRXw34PIaD/kU+hGoPERoHWRpiVKwUZdCoAZRnahx4SyEEoF+vxW3u1N5y/+QSx2Tw== X-Received: by 2002:a05:6000:2707:b0:382:359f:534d with SMTP id ffacd0b85a97d-385c6ebcea5mr1955933f8f.23.1732716338889; Wed, 27 Nov 2024 06:05:38 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fad6436sm16442335f8f.13.2024.11.27.06.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 06:05:38 -0800 (PST) From: Bryan O'Donoghue Date: Wed, 27 Nov 2024 14:05:14 +0000 Subject: [PATCH v3 3/3] media: dt-bindings: qcom-venus: Deprecate video-decoder and video-encoder where applicable Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-3-ef6bd25e98db@linaro.org> References: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-0-ef6bd25e98db@linaro.org> In-Reply-To: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v3-0-ef6bd25e98db@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: quic_renjiang@quicinc.com, quic_vnagar@quicinc.com, quic_dikshita@quicinc.com, konradybcio@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , devicetree@vger.kernel.org, Bryan O'Donoghue , Krzysztof Kozlowski X-Mailer: b4 0.15-dev-dedf8 For the list of yaml files here the video-decoder and video-encoder nodes provide nothing more than configuration input for the driver. These entries do not in fact impart hardware specific data and should be deprecated. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bryan O'Donoghue --- .../devicetree/bindings/media/qcom,msm8916-venus.yaml | 12 ++---------- .../devicetree/bindings/media/qcom,sc7180-venus.yaml | 12 ++---------- .../devicetree/bindings/media/qcom,sc7280-venus.yaml | 12 ++---------- .../devicetree/bindings/media/qcom,sdm845-venus-v2.yaml | 12 ++---------- .../devicetree/bindings/media/qcom,sm8250-venus.yaml | 12 ++---------- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml b/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml index 9410f13ca97c181973c62fe62d0399fc9e82f05d..da140c2e3d3f3c3e886496e3e2303eda1df99bb4 100644 --- a/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml +++ b/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml @@ -45,6 +45,7 @@ properties: required: - compatible + deprecated: true additionalProperties: false video-encoder: @@ -57,13 +58,12 @@ properties: required: - compatible + deprecated: true additionalProperties: false required: - compatible - iommus - - video-decoder - - video-encoder unevaluatedProperties: false @@ -83,12 +83,4 @@ examples: power-domains = <&gcc VENUS_GDSC>; iommus = <&apps_iommu 5>; memory-region = <&venus_mem>; - - video-decoder { - compatible = "venus-decoder"; - }; - - video-encoder { - compatible = "venus-encoder"; - }; }; diff --git a/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml index 5cec1d077cda77817f6d876109defcb0abbfeb2c..83c4a5d95f020437bd160d6456850bc84a2cf5ff 100644 --- a/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml @@ -70,6 +70,7 @@ properties: required: - compatible + deprecated: true additionalProperties: false video-encoder: @@ -82,14 +83,13 @@ properties: required: - compatible + deprecated: true additionalProperties: false required: - compatible - power-domain-names - iommus - - video-decoder - - video-encoder unevaluatedProperties: false @@ -114,12 +114,4 @@ examples: "vcodec0_core", "vcodec0_bus"; iommus = <&apps_smmu 0x0c00 0x60>; memory-region = <&venus_mem>; - - video-decoder { - compatible = "venus-decoder"; - }; - - video-encoder { - compatible = "venus-encoder"; - }; }; diff --git a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml index 10c334e6b3dcf25967fa438f8e6e5035448af1b9..413c5b4ee6504ba1d5fe9f74d5be04ad8c90c318 100644 --- a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml @@ -68,6 +68,7 @@ properties: required: - compatible + deprecated: true additionalProperties: false video-encoder: @@ -80,14 +81,13 @@ properties: required: - compatible + deprecated: true additionalProperties: false required: - compatible - power-domain-names - iommus - - video-decoder - - video-encoder unevaluatedProperties: false @@ -125,14 +125,6 @@ examples: memory-region = <&video_mem>; - video-decoder { - compatible = "venus-decoder"; - }; - - video-encoder { - compatible = "venus-encoder"; - }; - video-firmware { iommus = <&apps_smmu 0x21a2 0x0>; }; diff --git a/Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml b/Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml index 6228fd2b324631f3138e128c918266da58f6b544..c839cb1ebc0999e10b865f4bb43ea76ffa2bf46d 100644 --- a/Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml @@ -70,6 +70,7 @@ properties: required: - compatible + deprecated: true additionalProperties: false video-core1: @@ -82,14 +83,13 @@ properties: required: - compatible + deprecated: true additionalProperties: false required: - compatible - power-domain-names - iommus - - video-core0 - - video-core1 unevaluatedProperties: false @@ -119,12 +119,4 @@ examples: iommus = <&apps_smmu 0x10a0 0x8>, <&apps_smmu 0x10b0 0x0>; memory-region = <&venus_mem>; - - video-core0 { - compatible = "venus-decoder"; - }; - - video-core1 { - compatible = "venus-encoder"; - }; }; diff --git a/Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml index f66033ae8b590e7b6f1e344c368994744411aca2..da54493220c9dc90e7d9f5fcfce7590acb241c85 100644 --- a/Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml @@ -73,6 +73,7 @@ properties: required: - compatible + deprecated: true additionalProperties: false video-encoder: @@ -85,6 +86,7 @@ properties: required: - compatible + deprecated: true additionalProperties: false required: @@ -95,8 +97,6 @@ required: - iommus - resets - reset-names - - video-decoder - - video-encoder unevaluatedProperties: false @@ -132,12 +132,4 @@ examples: resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>, <&videocc VIDEO_CC_MVS0C_CLK_ARES>; reset-names = "bus", "core"; - - video-decoder { - compatible = "venus-decoder"; - }; - - video-encoder { - compatible = "venus-encoder"; - }; };