Linux Media Controller development
 help / color / mirror / Atom feed
From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
	linux-kernel@vger.kernel.org
Cc: Tomasz Figa <tfiga@chromium.org>,
	kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>,
	Heiko Stuebner <heiko@sntech.de>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Alexandre Courbot <acourbot@chromium.org>,
	Jeffrey Kardatzke <jkardatzke@chromium.org>,
	gustavo.padovan@collabora.com,
	Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH v3 1/3] media: rkvdec: Fix .buf_prepare
Date: Tue,  5 May 2020 10:41:08 -0300	[thread overview]
Message-ID: <20200505134110.3435-2-ezequiel@collabora.com> (raw)
In-Reply-To: <20200505134110.3435-1-ezequiel@collabora.com>

The driver should only set the payload on .buf_prepare
if the buffer is CAPTURE type, or if an OUTPUT buffer
has a zeroed payload.

Fix it.

Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver")
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 drivers/staging/media/rkvdec/rkvdec.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
index 225eeca73356..4df2a248ab96 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -456,7 +456,15 @@ static int rkvdec_buf_prepare(struct vb2_buffer *vb)
 		if (vb2_plane_size(vb, i) < sizeimage)
 			return -EINVAL;
 	}
-	vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage);
+
+	/*
+	 * Buffer's bytesused is written by the driver for CAPTURE buffers,
+	 * or if the application passed zero bytesused on an OUTPUT buffer.
+	 */
+	if (!V4L2_TYPE_IS_OUTPUT(vq->type) ||
+	    (V4L2_TYPE_IS_OUTPUT(vq->type) && !vb2_get_plane_payload(vb, 0)))
+		vb2_set_plane_payload(vb, 0,
+				      f->fmt.pix_mp.plane_fmt[0].sizeimage);
 	return 0;
 }
 
-- 
2.26.0.rc2


  reply	other threads:[~2020-05-05 13:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-05 13:41 [PATCH v3 0/3] media: rkvdec: Add a VP9 backend Ezequiel Garcia
2020-05-05 13:41 ` Ezequiel Garcia [this message]
2020-05-05 13:56   ` [PATCH v3 1/3] media: rkvdec: Fix .buf_prepare Tomasz Figa
2020-05-05 13:59     ` Ezequiel Garcia
2020-05-05 14:05       ` Tomasz Figa
2020-05-05 14:27         ` Ezequiel Garcia
2020-05-13 23:38           ` Nicolas Dufresne
2020-05-14 14:50   ` Nicolas Dufresne
2020-05-05 13:41 ` [PATCH v3 2/3] media: uapi: Add VP9 stateless decoder controls Ezequiel Garcia
2020-05-08 10:27   ` Hans Verkuil
2020-05-08 12:28     ` Ezequiel Garcia
2020-05-08 13:16       ` Hans Verkuil
2020-05-11 12:17         ` Nicolas Dufresne
2020-05-05 13:41 ` [PATCH v3 3/3] media: rkvdec: Add the VP9 backend Ezequiel Garcia
2020-05-08 10:34   ` Hans Verkuil
2020-05-08 16:26     ` Ezequiel Garcia
2020-05-08 16:56       ` Tomasz Figa
2020-05-11 13:26         ` Ezequiel Garcia
2020-05-08 11:21   ` Jonas Karlman

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=20200505134110.3435-2-ezequiel@collabora.com \
    --to=ezequiel@collabora.com \
    --cc=acourbot@chromium.org \
    --cc=gustavo.padovan@collabora.com \
    --cc=heiko@sntech.de \
    --cc=hverkuil@xs4all.nl \
    --cc=jkardatzke@chromium.org \
    --cc=jonas@kwiboo.se \
    --cc=kernel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=tfiga@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