Linux-Samsung-soc Archive on lore.kernel.org
 help / color / 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: devicetree@vger.kernel.org, robh+dt@kernel.org,
	Jonathan Bakker <xc-racer2@live.ca>
Subject: [PATCH v2 05/11] media: exynos4-is: Properly set JPEG options for parallel ports
Date: Thu, 30 Jul 2020 16:01:08 -0700
Message-ID: <BN6PR04MB06606078C5234BE00FDDA682A3710@BN6PR04MB0660.namprd04.prod.outlook.com> (raw)
In-Reply-To: <20200730230114.8572-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
parallel port was used rather than the CSIS device.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes from v1:
- Re-wording commit message
- Add R-b tag
---
 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


  parent reply index

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200730230114.8572-1-xc-racer2@live.ca>
2020-07-30 23:01 ` [PATCH v2 01/11] media: exynos4-is: Remove static driver data for S5PV210 FIMC variants Jonathan Bakker
2020-07-30 23:01 ` [PATCH v2 02/11] media: exynos4-is: Request syscon only if ISP writeback is present Jonathan Bakker
2020-07-30 23:01 ` [PATCH v2 03/11] media: exynos4-is: Fix nullptr when no CSIS device present Jonathan Bakker
2020-07-30 23:01 ` [PATCH v2 04/11] media: exynos4-is: Correct missing entity function initialization Jonathan Bakker
2020-07-31  9:41   ` Sylwester Nawrocki
2020-07-30 23:01 ` Jonathan Bakker [this message]
2020-07-30 23:01 ` [PATCH v2 06/11] media: exynos4-is: Use global num_sensors rather than local index Jonathan Bakker
2020-07-31  9:44   ` Sylwester Nawrocki
2020-07-30 23:01 ` [PATCH v2 07/11] media: exynos4-is: Add support for multiple sensors on one port Jonathan Bakker
2020-07-31  9:49   ` Sylwester Nawrocki
2020-07-30 23:01 ` [PATCH v2 08/11] media: exynos4-is: Remove inh_sensor_ctrls Jonathan Bakker
2020-07-30 23:01 ` [PATCH v2 09/11] media: exynos4-is: Remove unused struct member input_index Jonathan Bakker
2020-07-30 23:01 ` [PATCH v2 10/11] media: exynos4-is: Handle duplicate calls to vidioc_streamoff Jonathan Bakker
2020-07-31  9:54   ` Sylwester Nawrocki
2020-07-30 23:01 ` [PATCH v2 11/11] dt-bindings: media: Correct samsung-fimc parallel port numbering Jonathan Bakker
2020-07-31  9:59   ` Sylwester Nawrocki
2020-07-31 22:43   ` Rob Herring

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=BN6PR04MB06606078C5234BE00FDDA682A3710@BN6PR04MB0660.namprd04.prod.outlook.com \
    --to=xc-racer2@live.ca \
    --cc=devicetree@vger.kernel.org \
    --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=robh+dt@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

Linux-Samsung-soc Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-samsung-soc/0 linux-samsung-soc/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-samsung-soc linux-samsung-soc/ https://lore.kernel.org/linux-samsung-soc \
		linux-samsung-soc@vger.kernel.org
	public-inbox-index linux-samsung-soc

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-samsung-soc


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git