public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: kyrie.wu <kyrie.wu@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Tzung-Bi Shih <tzungbi@chromium.org>
Cc: Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@collabora.com>,
	kyrie wu <kyrie.wu@mediatek.corp-partner.google.com>,
	<linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-mediatek@lists.infradead.org>,
	kyrie.wu <kyrie.wu@mediatek.com>
Subject: [RESEND,V1,06/12] media: mediatek: jpeg: refactor jpeg buffer payload setting
Date: Fri, 10 Jan 2025 09:27:43 +0800	[thread overview]
Message-ID: <20250110012749.30072-7-kyrie.wu@mediatek.com> (raw)
In-Reply-To: <20250110012749.30072-1-kyrie.wu@mediatek.com>

1. for multi-core jpegdec:
   core0: |<-------- decoding buffer0 and resolution changed to smaller
   core1:  |<-------- decoding buffer1
   core0:   |<- handling resolution changing
   core0:    |<- vb2_set_plane_payload
2. the payload size is changed on the step of set format. Because core1
is running and streaming has not been stopped, the format cannot be
set again, resulting in no change in the payload size.
3. at this time, the payload size is bigger than buffer length,
it will print a warnning call trace
4. set payload size must less than buffer length

Signed-off-by: kyrie.wu <kyrie.wu@mediatek.com>
---
 .../media/platform/mediatek/jpeg/mtk_jpeg_core.c   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 4dc6f82d74fa..83f9451fd3ba 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -719,10 +719,18 @@ static int mtk_jpeg_buf_prepare(struct vb2_buffer *vb)
 		plane_fmt = q_data->pix_mp.plane_fmt[i];
 		if (ctx->enable_exif &&
 		    q_data->fmt->fourcc == V4L2_PIX_FMT_JPEG)
-			vb2_set_plane_payload(vb, i, plane_fmt.sizeimage +
-					      MTK_JPEG_MAX_EXIF_SIZE);
+			if (vb->planes[i].length > (plane_fmt.sizeimage +
+			    MTK_JPEG_MAX_EXIF_SIZE))
+				vb2_set_plane_payload(vb, i, plane_fmt.sizeimage +
+						      MTK_JPEG_MAX_EXIF_SIZE);
+			else
+				vb2_set_plane_payload(vb, i, vb->planes[i].length);
+
 		else
-			vb2_set_plane_payload(vb, i,  plane_fmt.sizeimage);
+			if (vb->planes[i].length > plane_fmt.sizeimage)
+				vb2_set_plane_payload(vb, i, plane_fmt.sizeimage);
+			else
+				vb2_set_plane_payload(vb, i, vb->planes[i].length);
 	}
 
 	return 0;
-- 
2.46.0


  parent reply	other threads:[~2025-01-10  1:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-10  1:27 [RESEND,V1,00/12] Enable jpeg enc & dec multi-hardwares for MT8196 kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,01/12] dt-bindings: mediatek: Add mediatek, mt8196-jpgdec compatible kyrie.wu
2025-01-10  7:40   ` Krzysztof Kozlowski
2025-04-07  6:24     ` Kyrie Wu (吴晗)
2025-04-07  6:32       ` Krzysztof Kozlowski
2025-01-10  1:27 ` [RESEND,V1,02/12] dt-bindings: mediatek: Add mediatek, mt8196-jpgenc compatible kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,03/12] media: mediatek: jpeg: add jpeg compatible kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,04/12] media: mediatek: jpeg: add jpeg smmu sid setting kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,05/12] media: mediatek: jpeg: fix jpeg hw count setting kyrie.wu
2025-01-10  1:27 ` kyrie.wu [this message]
2025-01-10  1:27 ` [RESEND,V1,07/12] media: mediatek: jpeg: refactor jpeg dst buffer layout kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,08/12] media: mediatek: jpeg: fix stop streaming flow for multi-core kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,09/12] media: mediatek: jpeg: refactor multi-core clk suspend and resume setting kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,10/12] media: mediatek: jpeg: fix decoding buffer number setting timing issue kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,11/12] media: mediatek: jpeg: refactor decoding resolution change operation kyrie.wu
2025-01-10  1:27 ` [RESEND,V1,12/12] media: mediatek: jpeg: fix remove buffer operation for multi-core kyrie.wu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250110012749.30072-7-kyrie.wu@mediatek.com \
    --to=kyrie.wu@mediatek.com \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=krzk+dt@kernel.org \
    --cc=kyrie.wu@mediatek.corp-partner.google.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=mchehab@kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=robh@kernel.org \
    --cc=tzungbi@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox