All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Bakker <xc-racer2@live.ca>
To: kyungmin.park@samsung.com, s.nawrocki@samsung.com,
	mchehab@kernel.org, kgene@kernel.org, krzk@kernel.org,
	linux-media@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jonathan Bakker <xc-racer2@live.ca>
Subject: [PATCH 06/11] media: exynos4-is: Properly set JPEG options when not using CSIS
Date: Sat, 25 Apr 2020 19:26:45 -0700	[thread overview]
Message-ID: <BN6PR04MB06606F63C7ACE765B57331A1A3AE0@BN6PR04MB0660.namprd04.prod.outlook.com> (raw)
In-Reply-To: <20200426022650.10355-1-xc-racer2@live.ca>

Commit ee7160e57c98 ("[media] s5p-fimc: Add support for JPEG capture")
added support for JPEG capture, but missed setting a register when the
CSIS device wasn't in use.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
 drivers/media/platform/exynos4-is/fimc-reg.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/exynos4-is/fimc-reg.c
index 5ce2bdebd424..269a98fca1e8 100644
--- a/drivers/media/platform/exynos4-is/fimc-reg.c
+++ b/drivers/media/platform/exynos4-is/fimc-reg.c
@@ -606,6 +606,11 @@ int fimc_hw_set_camera_source(struct fimc_dev *fimc,
 	switch (source->fimc_bus_type) {
 	case FIMC_BUS_TYPE_ITU_601:
 	case FIMC_BUS_TYPE_ITU_656:
+		if (fimc_fmt_is_user_defined(f->fmt->color)) {
+			cfg |= FIMC_REG_CISRCFMT_ITU601_8BIT;
+			break;
+		}
+
 		for (i = 0; i < ARRAY_SIZE(pix_desc); i++) {
 			if (vc->ci_fmt.code == pix_desc[i].pixelcode) {
 				cfg = pix_desc[i].cisrcfmt;
@@ -707,6 +712,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
 	case FIMC_BUS_TYPE_ITU_601...FIMC_BUS_TYPE_ITU_656:
 		if (source->mux_id == 0) /* ITU-A, ITU-B: 0, 1 */
 			cfg |= FIMC_REG_CIGCTRL_SELCAM_ITU_A;
+		if (vid_cap->ci_fmt.code == MEDIA_BUS_FMT_JPEG_1X8)
+			cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
 		break;
 	case FIMC_BUS_TYPE_LCD_WRITEBACK_A:
 		cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
-- 
2.20.1


WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Bakker <xc-racer2@live.ca>
To: kyungmin.park@samsung.com, s.nawrocki@samsung.com,
	mchehab@kernel.org, kgene@kernel.org, krzk@kernel.org,
	linux-media@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jonathan Bakker <xc-racer2@live.ca>
Subject: [PATCH 06/11] media: exynos4-is: Properly set JPEG options when not using CSIS
Date: Sat, 25 Apr 2020 19:26:45 -0700	[thread overview]
Message-ID: <BN6PR04MB06606F63C7ACE765B57331A1A3AE0@BN6PR04MB0660.namprd04.prod.outlook.com> (raw)
In-Reply-To: <20200426022650.10355-1-xc-racer2@live.ca>

Commit ee7160e57c98 ("[media] s5p-fimc: Add support for JPEG capture")
added support for JPEG capture, but missed setting a register when the
CSIS device wasn't in use.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
 drivers/media/platform/exynos4-is/fimc-reg.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/exynos4-is/fimc-reg.c
index 5ce2bdebd424..269a98fca1e8 100644
--- a/drivers/media/platform/exynos4-is/fimc-reg.c
+++ b/drivers/media/platform/exynos4-is/fimc-reg.c
@@ -606,6 +606,11 @@ int fimc_hw_set_camera_source(struct fimc_dev *fimc,
 	switch (source->fimc_bus_type) {
 	case FIMC_BUS_TYPE_ITU_601:
 	case FIMC_BUS_TYPE_ITU_656:
+		if (fimc_fmt_is_user_defined(f->fmt->color)) {
+			cfg |= FIMC_REG_CISRCFMT_ITU601_8BIT;
+			break;
+		}
+
 		for (i = 0; i < ARRAY_SIZE(pix_desc); i++) {
 			if (vc->ci_fmt.code == pix_desc[i].pixelcode) {
 				cfg = pix_desc[i].cisrcfmt;
@@ -707,6 +712,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
 	case FIMC_BUS_TYPE_ITU_601...FIMC_BUS_TYPE_ITU_656:
 		if (source->mux_id == 0) /* ITU-A, ITU-B: 0, 1 */
 			cfg |= FIMC_REG_CIGCTRL_SELCAM_ITU_A;
+		if (vid_cap->ci_fmt.code == MEDIA_BUS_FMT_JPEG_1X8)
+			cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
 		break;
 	case FIMC_BUS_TYPE_LCD_WRITEBACK_A:
 		cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-04-26  2:27 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200426022650.10355-1-xc-racer2@live.ca>
2020-04-26  2:26 ` [PATCH 01/11] media: exynos4-is: Remove static driver data for S5PV210 FIMC variants Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 17:33   ` Tomasz Figa
2020-07-07 17:33     ` Tomasz Figa
2020-07-08 14:45   ` Sylwester Nawrocki
2020-07-08 14:45     ` Sylwester Nawrocki
2020-04-26  2:26 ` [PATCH 02/11] media: exynos4-is: Request syscon only if ISP writeback is present Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 17:34   ` Tomasz Figa
2020-07-07 17:34     ` Tomasz Figa
2020-07-08 14:47   ` Sylwester Nawrocki
2020-07-08 14:47     ` Sylwester Nawrocki
2020-04-26  2:26 ` [PATCH 03/11] media: exynos4-is: Fix nullptr when no CSIS device present Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 17:55   ` Tomasz Figa
2020-07-07 17:55     ` Tomasz Figa
2020-07-08 15:11     ` Sylwester Nawrocki
2020-07-08 15:11       ` Sylwester Nawrocki
2020-07-11 16:27       ` Jonathan Bakker
2020-07-11 16:27         ` Jonathan Bakker
2020-07-08 14:49   ` Sylwester Nawrocki
2020-07-08 14:49     ` Sylwester Nawrocki
2020-04-26  2:26 ` [PATCH 04/11] media: exynos4-is: Correct missing entity function initialization Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:09   ` Tomasz Figa
2020-07-07 18:09     ` Tomasz Figa
2020-07-08 15:34     ` Sylwester Nawrocki
2020-07-08 15:34       ` Sylwester Nawrocki
2020-07-11 16:35       ` Jonathan Bakker
2020-07-11 16:35         ` Jonathan Bakker
2020-04-26  2:26 ` [PATCH 05/11] media: exynos4-is: Improve support for sensors with multiple pads Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:13   ` Tomasz Figa
2020-07-07 18:13     ` Tomasz Figa
2020-07-11 18:21     ` Jonathan Bakker
2020-07-11 18:21       ` Jonathan Bakker
2020-04-26  2:26 ` Jonathan Bakker [this message]
2020-04-26  2:26   ` [PATCH 06/11] media: exynos4-is: Properly set JPEG options when not using CSIS Jonathan Bakker
2020-07-07 18:23   ` Tomasz Figa
2020-07-07 18:23     ` Tomasz Figa
2020-07-08 15:45     ` Sylwester Nawrocki
2020-07-08 15:45       ` Sylwester Nawrocki
2020-07-11 16:43       ` Jonathan Bakker
2020-07-11 16:43         ` Jonathan Bakker
2020-07-08 15:46   ` Sylwester Nawrocki
2020-07-08 15:46     ` Sylwester Nawrocki
2020-04-26  2:26 ` [PATCH 07/11] media: exynos4-is: Add support for multiple sensors on one port Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:36   ` Tomasz Figa
2020-07-07 18:36     ` Tomasz Figa
2020-07-11 16:48     ` Jonathan Bakker
2020-07-11 16:48       ` Jonathan Bakker
2020-04-26  2:26 ` [PATCH 08/11] media: exynos4-is: Remove inh_sensor_ctrls Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:37   ` Tomasz Figa
2020-07-07 18:37     ` Tomasz Figa
2020-07-08 15:47   ` Sylwester Nawrocki
2020-07-08 15:47     ` Sylwester Nawrocki
2020-04-26  2:26 ` [PATCH 09/11] media: exynos4-is: Remove unused struct member input_index Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:38   ` Tomasz Figa
2020-07-07 18:38     ` Tomasz Figa
2020-07-08 15:49   ` Sylwester Nawrocki
2020-07-08 15:49     ` Sylwester Nawrocki
2020-04-26  2:26 ` [PATCH 10/11] media: exynos4-is: Prevent duplicate call to media_pipeline_stop Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:44   ` Tomasz Figa
2020-07-07 18:44     ` Tomasz Figa
2020-07-11 18:17     ` Jonathan Bakker
2020-07-11 18:17       ` Jonathan Bakker
2020-07-20 13:10       ` Tomasz Figa
2020-07-20 13:10         ` Tomasz Figa
2020-07-24 23:46         ` Jonathan Bakker
2020-07-24 23:46           ` Jonathan Bakker
2020-07-24 23:46           ` Jonathan Bakker
2020-07-27 13:48           ` Tomasz Figa
2020-07-27 13:48             ` Tomasz Figa
2020-07-27 13:48             ` Tomasz Figa
2020-04-26  2:26 ` [PATCH 11/11] media: exynos4-is: Correct parallel port probing Jonathan Bakker
2020-04-26  2:26   ` Jonathan Bakker
2020-07-07 18:48   ` Tomasz Figa
2020-07-07 18:48     ` Tomasz Figa
2020-07-08 16:15   ` Sylwester Nawrocki
2020-07-08 16:15     ` Sylwester Nawrocki
2020-07-11 18:18     ` Jonathan Bakker
2020-07-11 18:18       ` Jonathan Bakker

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=BN6PR04MB06606F63C7ACE765B57331A1A3AE0@BN6PR04MB0660.namprd04.prod.outlook.com \
    --to=xc-racer2@live.ca \
    --cc=kgene@kernel.org \
    --cc=krzk@kernel.org \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=s.nawrocki@samsung.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.