From patchwork Wed Nov 27 01:34:04 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: 13886483 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 30E57156CF for ; Wed, 27 Nov 2024 01:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732671253; cv=none; b=pDJ0cuMbW9F9Pykg1vJvJUEfcDyyJZScNBRX4eAx+sJcKirQYnj4R6zwk2VOaukpsUg2tNJ+ctbxbMcuyQxFm1X9cNJMJXZt4+Xamv4aYqqMr/nPWfKSYy7tsraxr6F4xDijaaHqj+G8Yx2N/AcLOdCOqs4nsLjp+fXOD7i8lSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732671253; c=relaxed/simple; bh=Z8h8lMP+jocQ/4896xfrl/HHCJ5l7Pe1DjlV+Cd0zUQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dmaa4k8xfCakFp1YVXB2YTkXauMDtaNX/Xqp2nJuXtNB7R5GzqCmeyLPusEFR8XqQH4Kt2z5KKr62Lq4F41hIVikWm3kAvZpBHkI+wN962vTt+ka53i+K6a9Gyi1m7OKsNBbj/NqDdf7ntedc7EAnZT7wUGdOnXk+GA1NOfjehU= 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=S3CYCJao; arc=none smtp.client-ip=209.85.128.47 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="S3CYCJao" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4349fd77b33so22939775e9.2 for ; Tue, 26 Nov 2024 17:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732671250; x=1733276050; 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=YHdydKppx4W4aIGz3r9c82fCfdszdFjhSOTKkQbOLtU=; b=S3CYCJaoZg0+8FVYUla7Uc6W0y2zgQZA57wZpYDnrIrDXyK/VTTwvGHNeflhq7/err de9ico2432B5agLMECEwgiitgTtusI0LIT9s0N7dCLaxe213D433qLGyX6rblPAGkIs0 Ck8AqM6Ust4ip4jjY+I4vuvZFy5pZgl/QxrM6Xf0GpaZBblazxb4HFTIb6W6R22MB9rd FAcZazsulVcjKyCFa6lysCqx3+MhlRdxir3D/JYGPDUudtLUF1521BQQ+VGIeXno5a/f bNpyqd02xTU8P/eZqOG6R0NAklJk5yAyUPq7+uTv5nwZJpZJ+81SjIC/EtORxFA8xgd9 mBJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732671250; x=1733276050; 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=YHdydKppx4W4aIGz3r9c82fCfdszdFjhSOTKkQbOLtU=; b=MZDKf+ekyyELYotPf6OqvutmO/d3LtmWi9DSVopQFY+ZYtnAUva1xhBm/gkQCXLr0X Y7jAlCfEVQ9K505X04JfJeCfFE3PA6MiieqorHOQtd77TiBTM4Q8dUlonBhJJW/5UZ4u Sp+HDnUBq0paQj1eyMtQsKN2KaSI8OzpaQmW5jQLiQOmr/IVs1oRR6iE7zmT0vr/4odr F9NVh9YvNWJblrR2ccV9OTsDZG04SPeNFvbYf5PsX0HY069Z4Jb9IHUchE980xIzWz/r zWJaonBeY7+jdG0yr4A8kQ5lby6fELfAImR2HDyH0J96C4iJ0c/7Zg0/+/qyO+8YfuvG hYbw== X-Forwarded-Encrypted: i=1; AJvYcCVsrgS3iv3xDGdWTHn4zNy6Z/ijhgNzFGmWGqI0duDheFf0aw6Qw2dWOEA8+rwQvFK1gTQblysPP4aWH+4h@vger.kernel.org X-Gm-Message-State: AOJu0YxQgbueoru+v+bBSihmO9demAAPVp4QCBKxTqrBgauLE63zVisP k2YgHc8m3GAeEhFvQGq+1IGau8GI9ROX/NNgitDvditI7wo87Wb9nyOpLQbrpm4= X-Gm-Gg: ASbGncsqc78TCRO6l05yTf/ryLw8Ubr+t97Ol4xXggkg02ig7520lGItmjlwA9cc74T hNDDlxge9UwhAGAYMJuBXuimoQHAohR2zkhkXrvTmIEXz+GVgpP9q20tgWHz0E3H5ES3sN2bUz8 1kX78IVuvCfZyXo2CEmP1J4/oM7/K1BcQsQKa83Hmgs8kXNO4hM8Wp/+EARkNritIdehmh68XYF CNKEk+eo/LHR1eUoirTA8aJhVOS5TOgbiVrly0x6JAnTuZwGOHD7vYD/qQ= X-Google-Smtp-Source: AGHT+IGQCLX2eoxNmjh0DXZKWZwFh9j+uGNXeg8HR2swrT28GWPAYiFC1KOywH0ttvdYmjR06JEboA== X-Received: by 2002:a05:600c:458b:b0:434:a924:44e9 with SMTP id 5b1f17b1804b1-434a9dcfedfmr10774915e9.15.1732671250557; Tue, 26 Nov 2024 17:34:10 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fbc42b3sm14848641f8f.68.2024.11.26.17.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 17:34:09 -0800 (PST) From: Bryan O'Donoghue Date: Wed, 27 Nov 2024 01:34:04 +0000 Subject: [PATCH 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-v1-1-99c16f266b46@linaro.org> References: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v1-0-99c16f266b46@linaro.org> In-Reply-To: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v1-0-99c16f266b46@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" Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 57 ++++++++++++++++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 2 ++ 2 files changed, 59 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 4e26b18790537885a77d66c1917a4e7a146eaf57..28fe31b8251cc0efacf43d63cb2296cf8a9c052e 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -286,6 +286,37 @@ 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); + dev_info(dev, "Node %s exists won't create new\n", node_name); + 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 +396,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; + return ret; + } + + 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 01:34:05 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: 13886484 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 F3FE8200CD for ; Wed, 27 Nov 2024 01:34:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732671255; cv=none; b=gPPRyEDMe5yWTN1NdQVnr/JsdI0ega+EAnsxgcwkmW8uo5t66lLpavFV/acGYZOk/3M41xyzz03CXjese2S3IztS4+thSx+2K0wMgb6ZiZLym9khQPpSIdP2fKvqPor8rk5qEbhVg1g/QdxvLSTdKO/+KqkKxZymogDxH6qKW9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732671255; c=relaxed/simple; bh=n/Zg82OIAdQ1zSRL1nM0L3fiC40R4jKjjiYiNFRjz48=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Hsf1BeN00nXMBh1esukqm0404ZIlaQRP61mkEh2WqOT4DazvIQnl0JCGSCZ3UHeUjlNm6zNyqjE8axgKqkhu3xpl/RE5Ww8p0MAbuBXHtyGV7Slb1cJhLllKG8zq35yiK57UCWDa3uD3d3QLIokapKCfu4mLttB9oLdWNZNhojs= 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=L7j7oq/0; arc=none smtp.client-ip=209.85.128.52 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="L7j7oq/0" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-432d866f70fso57058735e9.2 for ; Tue, 26 Nov 2024 17:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732671252; x=1733276052; 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=MEBpGyzD06mzAtSx+cExNdQcs2BIj/GrC5hry0530ds=; b=L7j7oq/0NC45asyJ6OFtiWYizy2Md+0R0vTc1jpX4EWk/Od0SvFstKX3pSlsOLKyQt 8ZLfRsMuV8zifAN8tKv7+15gTcYakxDz6XTmiZlV3zg19Po+9gWKVwTdlIyBB4iNCDxL z+3UwuFM3OISGIF1qOYDCXWFiNc6DxRKzvmmBOEg6HHABUVWlpdy69kAIiWCke0osVl4 O81AqexDemjE+e+YGYdpinNsa7xsSaAPRdQRAl1SRo+n9MkChU1pBmYScKsUhK8wIchC kwA4MpxhmXsbbuqSCzoQRhdBwsLzGNHK1qnX1eFVG/YHaBerRyJiTOGCq+zIJUFWp1Wg Updw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732671252; x=1733276052; 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=MEBpGyzD06mzAtSx+cExNdQcs2BIj/GrC5hry0530ds=; b=Iwykrl1R8oxTP1iJt3FQYjbnL6nGF/Aos/C7IPGcLqHDRRf9nC5exFkytNLB8bQaVy v4eOdhenH8ZwKGV4MX5hO7eknZBZtHOTEmp6Muny0Lc0nCX6vxOaRbt6LetNtfRQqOgr jFncSCL6DshCy6VXNktGpCh4nLAwv3R43Jb78n6Ki6UM/87nB68dcToaLkGoIFf0njWg 1Zne+USws8eFUaAIr62bLPzxsZgMV7JNRZ7AUY36FZ6ZnceT0adrb+4Nu1vPeDH56HXs ZB9PAPqCwd1pXF4V4U7QsqiWDynZHEyMPYIy57nuL9CXjANFffPiKlYdvMGfWZNG0vPa H4LA== X-Forwarded-Encrypted: i=1; AJvYcCW8SOpCnimARIMEKboZkL6qizcmHX+J0dqbjqYa4xTkzGK8EPBPlcSgs1mSdZ6OAKHjDVBYGrQr9jqp7TJ8@vger.kernel.org X-Gm-Message-State: AOJu0Yzxb6PEygOkYP/OcOE6CIWzUUysvN23sd+EpMm+w+YckYv4A0Nc qe/XoRu/EwnU+bQrfTnjaXifhfPQmM8y9M+ihuet3jsekU1BRxEyooa4Z6juCG8= X-Gm-Gg: ASbGncvPzs2T/rFEQXmdnhbWPeW4OkEWXi1ioFTOQ/HWyZu9Zx60gsTrzZhIAgE/iUK 6Oh5VvVpwb4YbTKw1+TWY/DgM7qfENd3W5BxbrYDlbVbw7J7wXRxYU+0uu8kxvGF4mA3CRVQ6oo JGwmqME4jtPJvOYlwIFS6yvoieUEA1QrR93YhMby9ompfjQNuVcVI0dh9XqSw463185qCmxJi10 j3E9Xr7h69Y25QRpnpuUUZZxIIf/q/yVgzFngtU/bKaKzvRG3hwsOek+Ak= X-Google-Smtp-Source: AGHT+IE5xTm7ROTDuYuNzFluAr2l+MF3IkEv+n/JLAXU+hq8JkCM3MR+EuvaGqZCy0XPE4SfoOyW2A== X-Received: by 2002:a05:6000:4819:b0:382:464e:1ab4 with SMTP id ffacd0b85a97d-385c6eb850bmr754283f8f.3.1732671252341; Tue, 26 Nov 2024 17:34:12 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fbc42b3sm14848641f8f.68.2024.11.26.17.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 17:34:12 -0800 (PST) From: Bryan O'Donoghue Date: Wed, 27 Nov 2024 01:34:05 +0000 Subject: [PATCH 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-v1-2-99c16f266b46@linaro.org> References: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v1-0-99c16f266b46@linaro.org> In-Reply-To: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v1-0-99c16f266b46@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 28fe31b8251cc0efacf43d63cb2296cf8a9c052e..af874e20d01ca572a76af003630b465cdb5b5948 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -639,6 +639,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[] = { @@ -848,6 +850,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[] = { @@ -896,6 +900,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[] = { @@ -951,6 +957,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[] = { @@ -1013,6 +1021,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 01:34:06 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: 13886485 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.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 488B74438B for ; Wed, 27 Nov 2024 01:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732671258; cv=none; b=jEFrfQhMhiYd+qv4XVf4oL6rLLi0tySLIQw6h1eQuJb+9Vyb89Th3sE96TfGFonUodOIek6KAgGs64c1JMBO8HgxsIzSHPO7kF0ZvP9nLZ/TqlPotTvwYlirLgW2lzuH690q+SsBEYXFAPHqRNKrex87XO9lJ7RvPooLoRqE8AU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732671258; c=relaxed/simple; bh=99UHV3yRrYwP8P3G+lZ+/588SwSA7ZRGY4x9MpPEZKU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VCSYtYmIMCvwbNEsKj05IpzKVpXGknd3jcS4EymCw3Tz/kkX+k5bq4kJ6M+W+/glGKAbUKiahHWIMSLz/VRjzP01Nm19ywlBnztiU9VYHnbs7b7w1knQl664NELX8enUXkQtZTeB/S5dngQYXkMdMgTBeuKPvxZiK/sKSidUSDk= 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=YgwYWkVF; arc=none smtp.client-ip=209.85.221.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="YgwYWkVF" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-38232c6311fso4192650f8f.3 for ; Tue, 26 Nov 2024 17:34:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732671254; x=1733276054; 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=LvU8sExnaozjCegc6xHW74oP1FMeAkd0rv4VFUktFHk=; b=YgwYWkVFYUKBAgAaFNVCXCv3B0ecnXC3uB/FV1fjmDwQhk7kG+iRbfNpgP3t78QLbm jesgLmJ8kGAdTW0dnOJdPMiZ8S9X8zWPNIVbKwc/ERA1l1RfRPH3BIxKZ5vVTDxqhy+m /3jGIt9dYYbahH5duzLrT8obUQ0STeLMrNlb6xtofMm2UcisnvPtmk3KPj4LbCUEL3JJ gLSoHHQggVE/4nh1Zf1j+QlZP9XzWp0wLUKPbKq5Llrt2kRmLtBgz2VpQoHQWQ7FYI8G 5VFVUXHwQsMEzGs1FpHp/SZ9xvJkMtKJoSftxeRYrXIA5Yz+Sh18cl/ZZ9/eIGHgkKim k12Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732671254; x=1733276054; 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=LvU8sExnaozjCegc6xHW74oP1FMeAkd0rv4VFUktFHk=; b=PFGtOkq+Pks0FWcxxzyEvp5Kg8CGxqGOoOzMuXksN95M1Gk7x+jNfmA6iehKwQaskU E/4dv5ewdJg39NSC6yKR7u9dQbBUgdzfv5V96mHzYWp59WUWzCdVaByMzHjngte8g84o Vohyd9GTzPdFSL+o+nlNPVsZ8c10Su+ejFFuGAcris+Oi4YF8apHXPu+9yRGGclH+4gS OppZ5KXqbRSU5E5d4FDBmgu7osvWkXgvBBnzKeSokgyEeBI33iIE98VR0maPkzZjNBAD bSN5aNP6DTQKcw7mutOj3EOfhulHgZE24TixtGlSraVIceVRKsU5ZfnbjeUKycCdW1Nr D3Mg== X-Forwarded-Encrypted: i=1; AJvYcCVUKoqoV21sjEaPIjvOB0+IcULnyDm2INoXCIDmfjIFEQxVOGJ4bWDDala99ejq6gdENFNYkcZfWytO8Lpa@vger.kernel.org X-Gm-Message-State: AOJu0YwDrF0mErqSN5WiidlhVpRDHiUlE/H1LZiUtTMeeYyjnf8UVZM0 iI5qUlkS69JPKqdlL+U/sD3+oQNEIJZ/Xalwakws2CMKEmrHeydNWrOClLV82gk= X-Gm-Gg: ASbGnctgDGli0piFxQNFTJGMeV8RA2+kVa7xuCH5OXoOuwdEIi51v/y3Y5HWEJFudzJ nAJqDJP+KpfOXZ+/qfZGMESeXokXUMiC6keqmQbXpHuz4rv1gFi4xbG/iQ6q5pH4yhftFJ6qc7e 3GOLvAJMWDNpDnHj8Xz9inZu3YIZ5BXvwCZQz0dWHQkQO8yV5nzPMJxci20YB5EK8oBekA+N8rw htDwfrEBezltmixk3iVbinp/0mkwAJa8msaSihcu1+nYy/LsKwGgtcPMtc= X-Google-Smtp-Source: AGHT+IETcR+SnROBxBFdvZ5aejUS4KPNx66kxhGGbCsqn75MjUH+vludldR6ubFHLpGOw6j4fyxGqw== X-Received: by 2002:a5d:6486:0:b0:382:4b5c:419d with SMTP id ffacd0b85a97d-385c6ec1125mr778528f8f.28.1732671254649; Tue, 26 Nov 2024 17:34:14 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fbc42b3sm14848641f8f.68.2024.11.26.17.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 17:34:13 -0800 (PST) From: Bryan O'Donoghue Date: Wed, 27 Nov 2024 01:34:06 +0000 Subject: [PATCH 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-v1-3-99c16f266b46@linaro.org> References: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v1-0-99c16f266b46@linaro.org> In-Reply-To: <20241127-media-staging-24-11-25-rb3-hw-compat-string-v1-0-99c16f266b46@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 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. Signed-off-by: Bryan O'Donoghue Reviewed-by: Krzysztof Kozlowski --- .../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"; - }; };