Received-SPF: pass (google.com: domain of linux-kernel+bounces-120664-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Nas Chung <nas.chung@chipsnmedia.com>
To: Ivan Bornyakov <brnkv.i1@gmail.com>
CC: "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, jackson.lee
	<jackson.lee@chipsnmedia.com>, Mauro Carvalho Chehab <mchehab@kernel.org>,
	Philipp Zabel <p.zabel@pengutronix.de>
Subject: RE: [PATCH v2 4/5] media: chips-media: wave5: drop "sram-size" DT
 prop
Thread-Topic: [PATCH v2 4/5] media: chips-media: wave5: drop "sram-size" DT
 prop
Thread-Index: AQHafn94hZZm1U4NUE6FWrHOISEj9rFLXGrQ
Date: Wed, 27 Mar 2024 10:27:19 +0000
Message-ID:
 <SL2P216MB1246537DD623B813453B28F9FB342@SL2P216MB1246.KORP216.PROD.OUTLOOK.COM>
References: <20240325064102.9278-1-brnkv.i1@gmail.com>
 <20240325064102.9278-5-brnkv.i1@gmail.com>
In-Reply-To: <20240325064102.9278-5-brnkv.i1@gmail.com>
Accept-Language: ko-KR, en-US
Content-Language: ko-KR
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0:
 =?us-ascii?Q?gMNrRvT7CWze0ZeGCkj1dItcM/wu4V6xFTWrQGWHFy91tfeAI7KL4qoOqfGh?=
 =?us-ascii?Q?beyTbsLTNvhtYohS5WANVQYlAHLHMO61D2PhowsbGUrhscJkV6f+OgwWG4Pp?=
 =?us-ascii?Q?7dl8ZtANa1y7uhP+sKIwd7VnaXW4RDJRr80FZ5IaVQqZBoypoY0huieR8I/u?=
 =?us-ascii?Q?cbnI66t76RwLFx0Pk+I463TC87YEm7d1dyXmj9oUfs54re/rMoEerNIe/fIJ?=
 =?us-ascii?Q?3k2h/BWP5q4v0JcSptklq6Txgg0A7cHF03dZbZbHKvfbog0jCLTVxf7fqsMB?=
 =?us-ascii?Q?Ga0WtuQW/pC3KrbFEAF7uYh/opNyksCCQg6z8icjmd3WD1q9D0f07yVpt7e2?=
 =?us-ascii?Q?mfqIc5k9EeBL6ICh/UIXGuU9zgqSce2nGZ36+3yFt4lQYugOMi0gAgrQ0LpH?=
 =?us-ascii?Q?4nmJTkFUnN1qee74xsXS37tr9KZZuUPNZQGeMjsew6X0oSeQraNknDI2OOv/?=
 =?us-ascii?Q?AibsonEAZSmw6iddHCi/LmZspAvV/c/8pZC81VEWpSV4NoPb8kdtZjf7nqmK?=
 =?us-ascii?Q?4q/zrPlK5JE0MzcORvZoSDhqEqSJ7icW6ISEnCsfUc+1coKY/NGjs0tnLjuw?=
 =?us-ascii?Q?5mG7rXpcF1hkY0SOfaLIBIS+QvTp59rHAwkqyR2qVZIa9nSex0m4lyj8EPjA?=
 =?us-ascii?Q?OGksNqOh1Me9nnxRc0Zp1YswDfNcxDQNH9WytpTERorCtd+6k71DpaIEQdLs?=
 =?us-ascii?Q?z69I+ojvtOBizYerIuDMn1JDCfymBlymX2GEwok/At0Wntsfe7FNpNGJi8/Q?=
 =?us-ascii?Q?hiTvF7C6gMZBnj34FQLFakOmO4wxvbzenIAby7stfTIXKd6zLRCeDLMvnYM/?=
 =?us-ascii?Q?XR7BMEwSSLxLiL82hfXhoYkMZlIZicNszxJgZSRHyB1e9aZkWkfIdUC9xR9q?=
 =?us-ascii?Q?5nPNgMqZSXPKUkoDRr7p8Q88uulgzSITYGLzzZUppVC/Zj/pvxAZcXVYEryS?=
 =?us-ascii?Q?JNxRQtskMLRhZH4OOjTinS1fvJmIPcpeugMy20vb9BCIc/b6hOFcSJT45xfS?=
 =?us-ascii?Q?qTNhr/IzPm4Zo482Pa/KymnRH4Q9u0nJkqMzPyfSRdfrkCaDL8nYoqZ45Dn3?=
 =?us-ascii?Q?bkj6WodZT70ZfXaJ4OcDCq/q5K1SsWHgIZLe46s4Wr7r8ZvbR8DGg7Ewy5UE?=
 =?us-ascii?Q?vDmlsmZhhZQP5PqlvNpJqy2GclQ9wSyXRi1HOk2OT8G499XHozjsKHAbWQH0?=
 =?us-ascii?Q?hm50QHwtRC4Jxya4vvV5mMzQq8ahKyvoNHrTQiK2iZ3kVVm3y7oY1RewmDY7?=
 =?us-ascii?Q?vd8kinyRJi2ueFq+T0g7EnKww5DPSfRnSdJGY0ucvjBw766yUO9s5XvluvSs?=
 =?us-ascii?Q?axtS1h8Jee+nkc+axKpVqjbGd3inZGHawcq+LIGexgugWoD227glWQJHk9iS?=
 =?us-ascii?Q?z7zQl4IHl7CfqCzV226gzN0WZWHI/7F7Ljs45He/Vy4QgrxDXAuR6oIuH2DB?=
 =?us-ascii?Q?ja1ONRDyv6td0AoOUMHj+mhD43gCTM+IC5UgAdzv3vveCpOSzIcEcOOtMZtG?=
 =?us-ascii?Q?t7OiPyHdy2PvTLtGZUG6PYZkNOasyfNePJbSACqC85A7b7/MVK86qaJ5L4wV?=
 =?us-ascii?Q?BW4xEgfDXW0G3tYk4D+9ysntC5Dq8IkOUW05Ibsk?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: chipsnmedia.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SL2P216MB1246.KORP216.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: dc07c02d-a41e-4f0b-b33b-08dc4e487bb6
X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Mar 2024 10:27:19.9469
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: jivZ2/8sM/vnmCWkDm3ijE4POk7tiSZB/T5wdD8vdu5S/eoSJ18Mi1DC8QugenFqVHyeV+vT9sFNsIaMs5egPWJovm/zctE4y9mmBlfeJ7o=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SE2P216MB1796

Hi, Ivan.

>-----Original Message-----
>From: Ivan Bornyakov <brnkv.i1@gmail.com>
>Sent: Monday, March 25, 2024 3:41 PM
>To: Nas Chung <nas.chung@chipsnmedia.com>; jackson.lee
><jackson.lee@chipsnmedia.com>; Mauro Carvalho Chehab <mchehab@kernel.org>;
>Philipp Zabel <p.zabel@pengutronix.de>
>Cc: Ivan Bornyakov <brnkv.i1@gmail.com>; linux-media@vger.kernel.org;
>linux-kernel@vger.kernel.org
>Subject: [PATCH v2 4/5] media: chips-media: wave5: drop "sram-size" DT
>prop
>
>Use all available SRAM memory up to WAVE5_MAX_SRAM_SIZE. Remove
>excessive "sram-size" device-tree property as genalloc is already able
>to determine available memory.
>
>Signed-off-by: Ivan Bornyakov <brnkv.i1@gmail.com>
>---
> .../platform/chips-media/wave5/wave5-vdi.c    | 21 ++++++++++---------
> .../platform/chips-media/wave5/wave5-vpu.c    |  7 -------
> .../platform/chips-media/wave5/wave5-vpuapi.h |  1 -
> .../chips-media/wave5/wave5-vpuconfig.h       |  2 ++
> 4 files changed, 13 insertions(+), 18 deletions(-)
>
>diff --git a/drivers/media/platform/chips-media/wave5/wave5-vdi.c
>b/drivers/media/platform/chips-media/wave5/wave5-vdi.c
>index 3809f70bc0b4..a63fffed55e9 100644
>--- a/drivers/media/platform/chips-media/wave5/wave5-vdi.c
>+++ b/drivers/media/platform/chips-media/wave5/wave5-vdi.c
>@@ -174,16 +174,19 @@ int wave5_vdi_allocate_array(struct vpu_device
>*vpu_dev, struct vpu_buf *array,
> void wave5_vdi_allocate_sram(struct vpu_device *vpu_dev)
> {
> 	struct vpu_buf *vb =3D &vpu_dev->sram_buf;
>+	dma_addr_t daddr;
>+	void *vaddr;
>+	size_t size;
>
>-	if (!vpu_dev->sram_pool || !vpu_dev->sram_size)
>+	if (!vpu_dev->sram_pool || vb->vaddr)
> 		return;
>
>-	if (!vb->vaddr) {
>-		vb->size =3D vpu_dev->sram_size;
>-		vb->vaddr =3D gen_pool_dma_alloc(vpu_dev->sram_pool, vb->size,
>-					       &vb->daddr);
>-		if (!vb->vaddr)
>-			vb->size =3D 0;
>+	size =3D min_t(size_t, WAVE5_MAX_SRAM_SIZE, gen_pool_avail(vpu_dev-
>>sram_pool));
>+	vaddr =3D gen_pool_dma_alloc(vpu_dev->sram_pool, size, &daddr);
>+	if (vaddr) {
>+		vb->vaddr =3D vaddr;
>+		vb->daddr =3D daddr;
>+		vb->size =3D size;
> 	}
>
> 	dev_dbg(vpu_dev->dev, "%s: sram daddr: %pad, size: %zu, vaddr:
>0x%p\n",
>@@ -197,9 +200,7 @@ void wave5_vdi_free_sram(struct vpu_device *vpu_dev)
> 	if (!vb->size || !vb->vaddr)
> 		return;
>
>-	if (vb->vaddr)
>-		gen_pool_free(vpu_dev->sram_pool, (unsigned long)vb->vaddr,
>-			      vb->size);
>+	gen_pool_free(vpu_dev->sram_pool, (unsigned long)vb->vaddr, vb-
>>size);
>
> 	memset(vb, 0, sizeof(*vb));
> }
>diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>index 1e631da58e15..2a972cddf4a6 100644
>--- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>@@ -177,13 +177,6 @@ static int wave5_vpu_probe(struct platform_device
>*pdev)
> 		goto err_reset_assert;
> 	}
>
>-	ret =3D of_property_read_u32(pdev->dev.of_node, "sram-size",
>-				   &dev->sram_size);
>-	if (ret) {
>-		dev_warn(&pdev->dev, "sram-size not found\n");
>-		dev->sram_size =3D 0;
>-	}
>-
> 	dev->sram_pool =3D of_gen_pool_get(pdev->dev.of_node, "sram", 0);
> 	if (!dev->sram_pool)
> 		dev_warn(&pdev->dev, "sram node not found\n");
>diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>index da530fd98964..975d96b22191 100644
>--- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>+++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>@@ -750,7 +750,6 @@ struct vpu_device {
> 	struct vpu_attr attr;
> 	struct vpu_buf common_mem;
> 	u32 last_performance_cycles;
>-	u32 sram_size;
> 	struct gen_pool *sram_pool;
> 	struct vpu_buf sram_buf;
> 	void __iomem *vdb_register;
>diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h
>b/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h
>index d9751eedb0f9..9d99afb78c89 100644
>--- a/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h
>+++ b/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h
>@@ -28,6 +28,8 @@
> #define WAVE521ENC_WORKBUF_SIZE         (128 * 1024)      //HEVC 128K, AV=
C
>40K
> #define WAVE521DEC_WORKBUF_SIZE         (1784 * 1024)
>
>+#define WAVE5_MAX_SRAM_SIZE		(64 * 1024)

WAVE521 can support 8K stream decoding/encoding.
So, I suggest the MAX_SRAME_SIZE to 128 * 1024 (128KB).

And, Current driver always enable sec_axi_info option if sram buffer is all=
ocated.
But, we have to enable/disable the sec_axi_info option after checking the a=
llocated sram size is enough to decode/encode current bitstream resolution.
Wave5 can enable/disable the sec_axi_info option for each instance.

How about handle sram-size through match_data ?
I can find some drivers which use match_data to configure the sram size.

We can use current "ti,k3-j721s2-wave521c" device as a 4K supported device.
- .sram_size =3D (64 * 1024);
Driver just allocate the sram-size for max supported resolution of each dev=
ice, and we don't need to check the sram-size is enough or not.

Thanks.
Nas.

>+
> #define MAX_NUM_INSTANCE                32
>
> #define W5_MIN_ENC_PIC_WIDTH            256
>--
>2.44.0