From patchwork Thu Nov 28 16:21:49 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: 13888240 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 6C76C1BD9E1 for ; Thu, 28 Nov 2024 16:21:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732810915; cv=none; b=NXiJn6183/Rzu02ylM8u7Kq88RAE7UvkoAR+wtNrXlweaFo8DinTmHSJx6MEeiy0xtLX6LQDBroc3E+F/X/jQVmCHvOU+pFKZYhSR7phv0YzeWDyErq+msGMlZA3edmFHG77ikFAf01we90h+fc5pA3EexJ/uOP7+F1Wmo4Hz+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732810915; c=relaxed/simple; bh=QBlvh42wEu8WJ3ZX0DLU3rSfBDhhQkJ+tEIxBMvq6eQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hn1h2czP6VIxruPyp17nUYCcB95M+Wvtz9URJm1fVia9Ng5dhObz1x6fisYQXrMdTqoutC4/R/V8d0eGdCLy3u0GG4Gtl5VzmV/msVY0thOPFbppeJcxg6Vym8TSX3byGEc2HxHN37QIcSH53QH/X3/hdGgvQq3G7XRbvGoCsEw= 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=cMZ/3rWr; arc=none smtp.client-ip=209.85.128.46 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="cMZ/3rWr" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4349cc45219so8868805e9.3 for ; Thu, 28 Nov 2024 08:21:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732810912; x=1733415712; 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=a3cXlSbMt2J53GNfeBwFHks7qn8zy+yq2dkUxzhw6rc=; b=cMZ/3rWrM5hzwXPdRJPk5DvjgPFztXNKX90/Ls51MeZrztLulwgFdWVZGk9DuBv/fo JXlvuoFpb/s/tMa50XRPhviOudUrzutH7LFkuQWc/onYAHklo5AFdnxl6v4m5fmcyLt7 QaR7Vq3UU6M106K77PtcR+FhGUmEw/7oRGmjjSrravCGt6yaldkZIrP0GeTbZeFafo/p BqKpGiz8baxnfmGuKJ4PEKZlx/hGjibRkH9La0G9SfOwAEEd45lQAFXiHiT0EBSdVoB8 GChnUj7GVu6fZg2241OVD6oVvkWGMn4ojV6CVncwsqWZ8neDowXNOC48VjrWOtMKv8Xh ZW9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732810912; x=1733415712; 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=a3cXlSbMt2J53GNfeBwFHks7qn8zy+yq2dkUxzhw6rc=; b=pbR21ywIa81hhz34XBAXHwGGHs0JA8VXZnD9qZy2UmggK2odyzIr0ICvCzd341F2aS DV34yqWKE20NsZhEqrR9anVbRBKYLVGu5zgBhgNLH+uC9uaBBungCJMfgTkCnYkZsJfa zJVKA0Z2EsJqLyOnFXgChoDrBTc/fHOjk+TZDOhMRwcGAIXEtKNm8gBbQLdYXnfkgqpR +7hyffAV1QOTHKQXXWTxCkCINL+NF1BDcgTMusWCjtCW7n8UY+c+L8yGfY6Kh5AsFik4 b/JJ8rLRxpiPiOBMEv0VybrcDBeZrR3Wx52Fefbgkd7rkQ+nauJp8t8VjD+MPuhdWvY/ nU+w== X-Forwarded-Encrypted: i=1; AJvYcCWD/xcuAm8SApLgaiKnLaZxzhEt/aWbzaupBMV5uu/yrVSuey4JS1IREQA/gyaTzpMEESAEl7DW9w+V4w==@vger.kernel.org X-Gm-Message-State: AOJu0YxsgZIKKij+ATHjfwwBVzHAWcedKpiOM6STASbRiZAsX5Glfb/V JgvAifjEHwDyJWyTb6MVxXRzH7nRNKIK7XbDQjj3NHLgo9RQ2iKOyUntRp0EYWw= X-Gm-Gg: ASbGncsscjT10aswfQxoBoY6fbHhL5FQRmWA9EhlFSHenUVPvM25nf6g5/AMtaPaaDz cg8SVy94QmLpSqrABjpEHU0AgmJH5Svk6D0uFXEnEl0JawipoxSALhzW8u7e/iBBmzDEQgxCN/u Wb7ByRFlztBPi5mRxN5dNIwmliQoV1Hvb35mdcCnvVr+IBYJFWvxDczW7jZq484RSJhFMDWgsQo /kQScRFlSsJlqH9RlZnExdIpuX3kYd/Tj9v6p5/7qaQKiucqxVld3H7QS0= X-Google-Smtp-Source: AGHT+IH2A1CDE5JVKe2dwzhkvr1V3p3l2bc+Lvq2Hf+xEtxIj89SkyS/KZUYVEcdsfpAcDDhdX6+DQ== X-Received: by 2002:a05:600c:4f85:b0:426:647b:1bfc with SMTP id 5b1f17b1804b1-434a9df22c0mr81950115e9.30.1732810911693; Thu, 28 Nov 2024 08:21:51 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0f70d9csm27004545e9.38.2024.11.28.08.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 08:21:51 -0800 (PST) From: Bryan O'Donoghue Date: Thu, 28 Nov 2024 16:21:49 +0000 Subject: [PATCH v4 1/3] media: venus: Add support for static video encoder/decoder declarations Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-1-fd062b399374@linaro.org> References: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-0-fd062b399374@linaro.org> In-Reply-To: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-0-fd062b399374@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, 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 | 90 +++++++++++++++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 4 ++ 3 files changed, 95 insertions(+) diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig index bfd50e8f34219db8a1de7960d7ea93b20db2982a..bc2e410b29cb415a36540a4f98709eae44f4ec35 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 if ARCH_QCOM 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..8a085611443cfda89ae71496e320dfc1f02ade88 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -286,6 +286,89 @@ static irqreturn_t venus_isr_thread(int irq, void *dev_id) return ret; } +#if defined(CONFIG_OF_DYNAMIC) +static int venus_add_video_core(struct venus_core *core, const char *node_name, + const char *compat) +{ + struct of_changeset *ocs = core->ocs; + struct device *dev = core->dev; + 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_add_dynamic_nodes(struct venus_core *core) +{ + struct device *dev = core->dev; + int ret; + + core->ocs = kmalloc(sizeof(*core->ocs), GFP_KERNEL); + if (!core->ocs) + return -ENOMEM; + + of_changeset_init(core->ocs); + + ret = venus_add_video_core(core, core->res->dec_nodename, "venus-decoder"); + if (ret) + goto err; + + ret = venus_add_video_core(core, core->res->enc_nodename, "venus-encoder"); + if (ret) + goto err; + + ret = of_changeset_apply(core->ocs); + if (ret) { + dev_err(dev, "applying changeset fail ret %d\n", ret); + goto err; + } + + return 0; +err: + of_changeset_destroy(core->ocs); + kfree(core->ocs); + core->ocs = NULL; + return ret; +} + +static void venus_remove_dynamic_nodes(struct venus_core *core) +{ + if (core->ocs) { + of_changeset_revert(core->ocs); + of_changeset_destroy(core->ocs); + kfree(core->ocs); + } +} +#else +static int venus_add_dynamic_nodes(struct venus_core *core) +{ + return 0; +} + +static void venus_remove_dynamic_nodes(struct venus_core *core) {} +#endif + static int venus_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -365,6 +448,11 @@ static int venus_probe(struct platform_device *pdev) if (ret < 0) goto err_runtime_disable; + if (core->res->dec_nodename || core->res->enc_nodename) { + if (venus_add_dynamic_nodes(core)) + goto err_runtime_disable; + } + ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) goto err_runtime_disable; @@ -443,6 +531,8 @@ static void venus_remove(struct platform_device *pdev) venus_firmware_deinit(core); + venus_remove_dynamic_nodes(core); + pm_runtime_put_sync(dev); pm_runtime_disable(dev); diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 27784fd7082c321222b23ca4b2902a04c49e19ca..306231b4f7d0201175974b4a42574f30d23e08f0 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 { @@ -171,6 +173,7 @@ struct venus_format { * @root: debugfs root directory * @venus_ver: the venus firmware version * @dump_core: a flag indicating that a core dump is required + * @ocs: OF changeset pointer */ struct venus_core { void __iomem *base; @@ -235,6 +238,7 @@ struct venus_core { u32 rev; } venus_ver; unsigned long dump_core; + struct of_changeset *ocs; }; struct vdec_controls { From patchwork Thu Nov 28 16:21:50 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: 13888241 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 7BB8D1BDAB9 for ; Thu, 28 Nov 2024 16:21:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732810916; cv=none; b=KbGi1nVfSPx0nct4d4jJqhpTbhRm6VBdkyltPqulA+BepkhzhlhIUxpi/5toO12Qi0TfzndUfJ0sCXwMEYLZ5raYy0JWeUqUzpoa21NoEWfzMo0wO3XShgqkzrrdOZ/8KD9VlRfGOAOcPuwXJ0UjZSCmWRZqscvWrqEqy/QoJL4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732810916; c=relaxed/simple; bh=uHwu28kexnpu01U+BQLqCIx+XHvsd7tHdfHAO+9X+fE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fl9EM2EK4XDI9iVGUSj72X1aP28kYWPddE/GAE/zMkKSM9A0ODaOQCu612rrsvGgF6WzP++QGws1CTjY4V6uxwp3VOq9zBkaIVKU6YeEgd7wEHZTjO26mwNulU3WW1pcKlByG9wYq8dWiS9cOuIZL3tXcToiEISfePDSDuRJGE8= 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=JUe6tDkW; arc=none smtp.client-ip=209.85.221.46 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="JUe6tDkW" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-385d7b4da2bso256273f8f.1 for ; Thu, 28 Nov 2024 08:21:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732810913; x=1733415713; 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=U2ByW5LJaVgwbGGu4xqa6JYQJaVynxhc9VtK5XpZNd0=; b=JUe6tDkWypzDArBQdaQW35vaIWtolgUuBBj+czhkEJRL8AumtxZ8KU5avJjnopWI3z et9hnm0Vi2qk8A1FQrC91FhKnOhmVN45CbWa9cygE3ldd5v90VLDh1pvpUviQBhVdJm8 rme0tMzCFUm2gV58Tn6iAUJ/JwvsG38DnmXcxw7UPmE41BddyRrOZajHOReoU3iBVVGG wlHQNmL3QaHt/tjwkMmeJkKVSaEuG3nrpr1oymEfpya9cuZVghlbkT2HWS6ymsUi9fkH 5khdPYM1jSzCOXICc3NaP5uJ3RlAo25sM50TNJlkYLJyDVPbz2sdCTwTzuCdPB7wuzbK V1RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732810913; x=1733415713; 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=U2ByW5LJaVgwbGGu4xqa6JYQJaVynxhc9VtK5XpZNd0=; b=HuWnZGyvE/04L/+CgnNzppoiNHDsAFXTNFbBnZ5tv+IML1DUoYnyikK7LRBy35y0zY TP0yKD0DOGLDUtZsHBtAnVBgGrBaH2V2l/8/fIhY/F5Ce5lRwPT7fa7wvhWDP1/dF/B0 dUwRJuYcvUqC9OzjfXLDf3BU5aLLLSKSUrKZiHq+wJucmIdKyyTnb68ZLkeZeBhtPuze l/UqoEpSDHe4T9Hyp8QBIzd0ZA7/kOQIZc0VC2zNFhKCXJMi/At4NIHj4zG6KIwfrvt6 EBB34zjQ4qMsENi9BRuMh9tih1+qKuDjmAZSJWz9ULi4yI/L80fVI/X9rEo7/bPtaKce A45Q== X-Forwarded-Encrypted: i=1; AJvYcCUQQDyY0osUG6b14FKmwHQRSf45xIrvCOQJQjgwdblJH1r7MYZMdd4w60xwem+Zga1COjbY5idfPAM3OA==@vger.kernel.org X-Gm-Message-State: AOJu0YyYNjLs4JyeYrXJBwLZGu/U1dXVFryFB6phixUH6o9M5msRUmdY 6AXPLqkravio5edFEO744LI4aH2rAfG9cVIP3/Z6E9Djis/+DQhZyVDBatECzWo= X-Gm-Gg: ASbGncuAXSAM7O9SA+XGme5ubVfneB6DRGdFsrzOfybXS2r+eSt5H8SxYmGHNLkDz/g GAkXhQxRX88osA2HTQMEX8KvtluDNGJXffq+a68dSMElacWNNV10EgXiLyLThWBLeXJLk4Psv+F jLoOXTCnKnIDamxXmd/q1FtsCCC96/e90dThBs2Aotu4uGuEXKHTeVIqCZHufasYwHG6zWU+L/M 0IQkWuzOBExlCq+a1fie3nk6/rLObYgopsycFSPlGa2qt3qZxy9TRMGNCw= X-Google-Smtp-Source: AGHT+IGGiN8vBkxi8NX+D9sBUXrGPX4zuLPArfsKyiosF573lLbt37akFeV+XcprEbuk25Cn/bUWfw== X-Received: by 2002:a5d:5f53:0:b0:382:3f77:8584 with SMTP id ffacd0b85a97d-385c6ebb9ebmr6891625f8f.32.1732810912756; Thu, 28 Nov 2024 08:21:52 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0f70d9csm27004545e9.38.2024.11.28.08.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 08:21:52 -0800 (PST) From: Bryan O'Donoghue Date: Thu, 28 Nov 2024 16:21:50 +0000 Subject: [PATCH v4 2/3] media: venus: Populate video encoder/decoder nodename entries Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-2-fd062b399374@linaro.org> References: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-0-fd062b399374@linaro.org> In-Reply-To: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-0-fd062b399374@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, 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 8a085611443cfda89ae71496e320dfc1f02ade88..1a408c1c2277d77c5fcb67cb94baff6b98c26a2b 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -672,6 +672,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[] = { @@ -881,6 +883,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[] = { @@ -929,6 +933,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[] = { @@ -984,6 +990,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[] = { @@ -1046,6 +1054,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 Thu Nov 28 16:21:51 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: 13888242 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 720CC1C07C2 for ; Thu, 28 Nov 2024 16:21:55 +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=1732810918; cv=none; b=Nc62KUyd6efEETfTEPQS74URUg4I+9Qup+I6/3oyiQ3pxjQ5d74G2k+WFBQYLALF2s11bcAFfP1AMlKvTmCeS+5egZFMHRYOoPawHP35jSZZEsN9ph8hggZJR35N1wxV0Ro8pxiNZ4t0SrniduwzeHe/cSXj4y8/dTwjDf5dCJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732810918; c=relaxed/simple; bh=lveT01XJFbPiCHFrg6nSo0zlm6T0yWAAHdtlgddNXio=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bMyzeKs7o9Ius87q5F8DWqeyCOWahAHDfAFuoABKljKFowas7TNYtKovODALt0pzDiDI6Gz4vJ1NpoMiWNPr8aVXEYYnjZh2ZAY8crLhEcmmKGs2UHmdUI4zveZCvzMssGF6Bzo8tKEYHjJOx1HLXBhiihEgKo/r0YMIJfuz9tg= 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=yRp4f7M3; 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="yRp4f7M3" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-434a2033562so8889095e9.1 for ; Thu, 28 Nov 2024 08:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732810914; x=1733415714; 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=t3dDvW0+Cz6kszp6aCIpBOpaxsGIqiTVCAZVfI6Gurs=; b=yRp4f7M3xtoptnd4IxwdyyAz8Uw+/vU8Ht4nFHYlfOcIdgWy1U3Aj6h5gPhEXo6TGQ Fiom3IVyblar5NyDx5l8BPDwVtRMR8ZT0HSUf4YoR14LI6i+1aonzHYTIcFXfYWzj46w NPeTzbz3xFX/rTo7F4LlNhni9l4BGQC6ZUF7pZDI4Vi/nlIVPJSj02StMFLDWsD3dy+N PTr4vPWR6RTw0mRk4JsvIdn1Eeg7ABekURgwW7ZmpdxDSYsrJns7KCRxR4EDgYYUlVM/ kqlGAiOJinrB/NVAnEeL4pj4pOF9e66+XdO+/uIWscEKXuwqiAri4NgGLg2jnwiZwx8S UhOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732810914; x=1733415714; 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=t3dDvW0+Cz6kszp6aCIpBOpaxsGIqiTVCAZVfI6Gurs=; b=bCq1VqBEdCcWHViZCel33y8ri3UxpMlopLFKenxQ6l13vnest835b8NlfUcB3rQ0gu g0KwkAuE8vURQZraYnCF6YWhT18wN0Cf7s/hgsfXS+T56MJa2Z3JqXR5TbehszakSal0 4YrubRas+VwhJia2w7tiq7KJWB3uXpN6Kcwtv6kb5H2LRXycfAk4Qe3xEgz7kGztkua9 ON3sk//PFkhRXk2vPZzDhenOXu4OR4rlyAAFfLsJZk5x0Z3Of9WBDkRLbwNFFKL1jlMF fE0+dQmSN7lzR3AGX5TtUqJkUw0h29YmCxtIsLsixPmgXqwRwWfSUDNl8IJJsHKgC57p wDaA== X-Forwarded-Encrypted: i=1; AJvYcCUWtweR/SmNOfwB4kjVS7j6Hk5y7pTUKwEBufJB1RVaJI46mZ/STdbjIjFm3sfEfH/n/l9kkYpJOZVXtQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxKyGhjf6QAwCb/7/4ec7i59TiLdvhCSXA+8r+EgfA5d7Y5EaCu 0puwmbCEVn1ozzUictttAISXLdethVdEYfFDlXWmnOMkQT9RocMvxIES81NH1jQ= X-Gm-Gg: ASbGncu2rDjzKoCXARLMpaeY7bTvWkQehtTLHj+Y2Jk1fd2hp6X/h8pTPdQ3qLRmuKW slViymiSJxzlJcH0MwiE17jtTNwlhxZMXyzwaGuPm/Napvett6bWng75oZoWyxMFwAWV6kLY1Fm ousk00shAt95swdbf43Xl1wvIPZSFjDU3EyOr1Hw+SUu/2HjwXPgqV0UbEj+dxojGwZANe571KP /AjsUrgQBjm0QnQnfquW4H9dKT0m1Iphn5egvuKoUbumML3T2Bu+BifDP8= X-Google-Smtp-Source: AGHT+IHxY7oKgFgJZ4sweXccUfXlO3kfxAoksfpsXIIPvc2aGpAbCuTxEbmTKUh3VLkL92Hpd3UGFA== X-Received: by 2002:a05:600c:458b:b0:434:a924:44e9 with SMTP id 5b1f17b1804b1-434a9dcfedfmr76862525e9.15.1732810913825; Thu, 28 Nov 2024 08:21:53 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0f70d9csm27004545e9.38.2024.11.28.08.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 08:21:53 -0800 (PST) From: Bryan O'Donoghue Date: Thu, 28 Nov 2024 16:21:51 +0000 Subject: [PATCH v4 3/3] media: dt-bindings: qcom-venus: Deprecate video-decoder and video-encoder where applicable Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-3-fd062b399374@linaro.org> References: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-0-fd062b399374@linaro.org> In-Reply-To: <20241128-media-staging-24-11-25-rb3-hw-compat-string-v4-0-fd062b399374@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, 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"; - }; };