All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
To: linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
	Jacek Anaszewski <jacek.anaszewski@gmail.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
	Thierry Escande <thierry.escande@collabora.com>,
	Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH 2/2] media: s5p-jpeg: set w/h when encoding
Date: Fri, 11 Aug 2017 13:50:01 +0200	[thread overview]
Message-ID: <1502452201-17171-3-git-send-email-andrzej.p@samsung.com> (raw)
In-Reply-To: <1502452201-17171-1-git-send-email-andrzej.p@samsung.com>

q_data w/h must be set when encoding.

Fixes: 1c84e7f9d5dc596be (media: s5p-jpeg: Add support for resolution change event)
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
---
 drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index c00e3a1..e1babb8 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1634,6 +1634,12 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
 			FMT_TYPE_OUTPUT : FMT_TYPE_CAPTURE;
 
 	q_data->fmt = s5p_jpeg_find_format(ct, pix->pixelformat, f_type);
+	if (ct->mode == S5P_JPEG_ENCODE ||
+		(ct->mode == S5P_JPEG_DECODE &&
+		q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG)) {
+		q_data->w = pix->width;
+		q_data->h = pix->height;
+	}
 	if (q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG) {
 		/*
 		 * During encoding Exynos4x12 SoCs access wider memory area
@@ -1641,8 +1647,6 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
 		 * the JPEG_IMAGE_SIZE register. In order to avoid sysmmu
 		 * page fault calculate proper buffer size in such a case.
 		 */
-		q_data->w = pix->width;
-		q_data->h = pix->height;
 		if (ct->jpeg->variant->hw_ex4_compat &&
 		    f_type == FMT_TYPE_OUTPUT && ct->mode == S5P_JPEG_ENCODE)
 			q_data->size = exynos4_jpeg_get_output_buffer_size(ct,
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: andrzej.p@samsung.com (Andrzej Pietrasiewicz)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] media: s5p-jpeg: set w/h when encoding
Date: Fri, 11 Aug 2017 13:50:01 +0200	[thread overview]
Message-ID: <1502452201-17171-3-git-send-email-andrzej.p@samsung.com> (raw)
In-Reply-To: <1502452201-17171-1-git-send-email-andrzej.p@samsung.com>

q_data w/h must be set when encoding.

Fixes: 1c84e7f9d5dc596be (media: s5p-jpeg: Add support for resolution change event)
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
---
 drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index c00e3a1..e1babb8 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1634,6 +1634,12 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
 			FMT_TYPE_OUTPUT : FMT_TYPE_CAPTURE;
 
 	q_data->fmt = s5p_jpeg_find_format(ct, pix->pixelformat, f_type);
+	if (ct->mode == S5P_JPEG_ENCODE ||
+		(ct->mode == S5P_JPEG_DECODE &&
+		q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG)) {
+		q_data->w = pix->width;
+		q_data->h = pix->height;
+	}
 	if (q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG) {
 		/*
 		 * During encoding Exynos4x12 SoCs access wider memory area
@@ -1641,8 +1647,6 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)
 		 * the JPEG_IMAGE_SIZE register. In order to avoid sysmmu
 		 * page fault calculate proper buffer size in such a case.
 		 */
-		q_data->w = pix->width;
-		q_data->h = pix->height;
 		if (ct->jpeg->variant->hw_ex4_compat &&
 		    f_type == FMT_TYPE_OUTPUT && ct->mode == S5P_JPEG_ENCODE)
 			q_data->size = exynos4_jpeg_get_output_buffer_size(ct,
-- 
1.9.1

  parent reply	other threads:[~2017-08-11 11:50 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20170808112254eucas1p20aacd5bb0737ff85ba4756724af189aa@eucas1p2.samsung.com>
2017-08-08 11:22 ` [PATCH 0/5] s5p-jpeg fixes Andrzej Pietrasiewicz
2017-08-08 11:22   ` Andrzej Pietrasiewicz
     [not found]   ` <CGME20170808112715eucas1p264001c0fd86af71f3d06d6ece23db857@eucas1p2.samsung.com>
2017-08-08 11:27     ` [PATCH 1/5] media: platform: s5p-jpeg: Fix crash in jpeg isr due to multiple interrupts Andrzej Pietrasiewicz
2017-08-08 11:27       ` Andrzej Pietrasiewicz
     [not found]       ` <CGME20170808112715eucas1p263e17ba53577e0c4b46cc43bf8376db3@eucas1p2.samsung.com>
2017-08-08 11:27         ` [PATCH 2/5] media: platform: s5p-jpeg: disable encoder/decoder in exynos4-like hardware after use Andrzej Pietrasiewicz
2017-08-08 11:27           ` Andrzej Pietrasiewicz
     [not found]       ` <CGME20170808112716eucas1p27388118c826671edd88e79e68ceb7821@eucas1p2.samsung.com>
2017-08-08 11:27         ` [PATCH 3/5] media: platform: s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function Andrzej Pietrasiewicz
2017-08-08 11:27           ` Andrzej Pietrasiewicz
     [not found]       ` <CGME20170808112716eucas1p10a5069ad7ddad2eae5b8dca4f466feee@eucas1p1.samsung.com>
2017-08-08 11:27         ` [PATCH 4/5] media: platform: s5p-jpeg: fix number of components macro Andrzej Pietrasiewicz
2017-08-08 11:27           ` Andrzej Pietrasiewicz
2017-08-10 14:09           ` Sylwester Nawrocki
2017-08-10 14:09             ` Sylwester Nawrocki
     [not found]       ` <CGME20170808112717eucas1p21f42a5991fc862df2d010a7ccfae634b@eucas1p2.samsung.com>
2017-08-08 11:27         ` [PATCH 5/5] media: platform: s5p-jpeg: directly use parsed subsampling on 5433 Andrzej Pietrasiewicz
2017-08-08 11:27           ` Andrzej Pietrasiewicz
     [not found]   ` <CGME20170811115011eucas1p2d31daaa9e6f8d142291d9352ad5b732c@eucas1p2.samsung.com>
2017-08-11 11:49     ` [PATCH 0/2] More s5p-jpeg fixes Andrzej Pietrasiewicz
2017-08-11 11:49       ` Andrzej Pietrasiewicz
     [not found]       ` <CGME20170811115011eucas1p263bb57512af4ce8cee995ecfe92067ca@eucas1p2.samsung.com>
2017-08-11 11:50         ` [PATCH 1/2] media: s5p-jpeg: don't overwrite result's "size" member Andrzej Pietrasiewicz
2017-08-11 11:50           ` Andrzej Pietrasiewicz
     [not found]       ` <CGME20170811115012eucas1p218b11e4b15ff2eb88910e58619d96a67@eucas1p2.samsung.com>
2017-08-11 11:50         ` Andrzej Pietrasiewicz [this message]
2017-08-11 11:50           ` [PATCH 2/2] media: s5p-jpeg: set w/h when encoding Andrzej Pietrasiewicz
2017-08-14 20:31       ` [PATCH 0/2] More s5p-jpeg fixes Jacek Anaszewski
2017-08-14 20:31         ` Jacek Anaszewski
2017-08-14 19:56   ` [PATCH 0/5] " Jacek Anaszewski
2017-08-14 19:56     ` Jacek Anaszewski

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=1502452201-17171-3-git-send-email-andrzej.p@samsung.com \
    --to=andrzej.p@samsung.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=jacek.anaszewski@gmail.com \
    --cc=krzk@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mchehab@osg.samsung.com \
    --cc=thierry.escande@collabora.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.