mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Todor Tomov <todor.tomov@linaro.org>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
	hans.verkuil@cisco.com,
	laurent.pinchart+renesas@ideasonboard.com,
	linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Todor Tomov <todor.tomov@linaro.org>
Subject: [PATCH v4 29/34] media: camss: csid: Different format support on source pad
Date: Wed, 25 Jul 2018 19:38:38 +0300	[thread overview]
Message-ID: <1532536723-19062-30-git-send-email-todor.tomov@linaro.org> (raw)
In-Reply-To: <1532536723-19062-1-git-send-email-todor.tomov@linaro.org>

Usually the format on the source pad is the same as on the sink pad.
However the CSID is able to do some format conversions. To support
this make the format on the source pad selectable amongst a list
of formats. This list can be different for each sink pad format.
This is still not used but will be when the format conversions
are implemented.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
---
 drivers/media/platform/qcom/camss/camss-csid.c | 69 +++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 13 deletions(-)

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index db960da..cf543fa 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -300,6 +300,47 @@ static const struct csid_format csid_formats_8x96[] = {
 	}
 };
 
+static u32 csid_find_code(u32 *code, unsigned int n_code,
+			  unsigned int index, u32 req_code)
+{
+	int i;
+
+	if (!req_code && (index >= n_code))
+		return 0;
+
+	for (i = 0; i < n_code; i++)
+		if (req_code) {
+			if (req_code == code[i])
+				return req_code;
+		} else {
+			if (i == index)
+				return code[i];
+		}
+
+	return code[0];
+}
+
+static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
+			     unsigned int index, u32 src_req_code)
+{
+	if (csid->camss->version == CAMSS_8x16) {
+		if (index > 0)
+			return 0;
+
+		return sink_code;
+	} else if (csid->camss->version == CAMSS_8x96) {
+		switch (sink_code) {
+		default:
+			if (index > 0)
+				return 0;
+
+			return sink_code;
+		}
+	} else {
+		return 0;
+	}
+}
+
 static const struct csid_format *csid_get_fmt_entry(
 					const struct csid_format *formats,
 					unsigned int nformat,
@@ -674,15 +715,15 @@ static void csid_try_format(struct csid_device *csid,
 
 	case MSM_CSID_PAD_SRC:
 		if (csid->testgen_mode->cur.val == 0) {
-			/* Test generator is disabled, keep pad formats */
-			/* in sync - set and return a format same as sink pad */
-			struct v4l2_mbus_framefmt format;
+			/* Test generator is disabled, */
+			/* keep pad formats in sync */
+			u32 code = fmt->code;
 
-			format = *__csid_get_format(csid, cfg,
-						    MSM_CSID_PAD_SINK, which);
-			*fmt = format;
+			*fmt = *__csid_get_format(csid, cfg,
+						      MSM_CSID_PAD_SINK, which);
+			fmt->code = csid_src_pad_code(csid, fmt->code, 0, code);
 		} else {
-			/* Test generator is enabled, set format on source*/
+			/* Test generator is enabled, set format on source */
 			/* pad to allow test generator usage */
 
 			for (i = 0; i < csid->nformats; i++)
@@ -716,7 +757,6 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd,
 			       struct v4l2_subdev_mbus_code_enum *code)
 {
 	struct csid_device *csid = v4l2_get_subdevdata(sd);
-	struct v4l2_mbus_framefmt *format;
 
 	if (code->pad == MSM_CSID_PAD_SINK) {
 		if (code->index >= csid->nformats)
@@ -725,13 +765,16 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd,
 		code->code = csid->formats[code->index].code;
 	} else {
 		if (csid->testgen_mode->cur.val == 0) {
-			if (code->index > 0)
-				return -EINVAL;
+			struct v4l2_mbus_framefmt *sink_fmt;
 
-			format = __csid_get_format(csid, cfg, MSM_CSID_PAD_SINK,
-						   code->which);
+			sink_fmt = __csid_get_format(csid, cfg,
+						     MSM_CSID_PAD_SINK,
+						     code->which);
 
-			code->code = format->code;
+			code->code = csid_src_pad_code(csid, sink_fmt->code,
+						       code->index, 0);
+			if (!code->code)
+				return -EINVAL;
 		} else {
 			if (code->index >= csid->nformats)
 				return -EINVAL;
-- 
2.7.4


  parent reply	other threads:[~2018-07-25 16:40 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-25 16:38 [PATCH v4 00/34] Qualcomm Camera Subsystem driver - 8x96 support Todor Tomov
2018-07-25 16:38 ` [PATCH v4 01/34] doc-rst: Add packed Bayer raw14 pixel formats Todor Tomov
2018-07-25 16:38 ` [PATCH v4 02/34] media: v4l: Add new 2X8 10-bit grayscale media bus code Todor Tomov
2018-07-25 16:38 ` [PATCH v4 03/34] media: v4l: Add new 10-bit packed grayscale format Todor Tomov
2018-07-25 16:38 ` [PATCH v4 04/34] media: Rename CAMSS driver path Todor Tomov
2018-07-25 16:38 ` [PATCH v4 05/34] media: camss: Use SPDX license headers Todor Tomov
2018-07-25 16:38 ` [PATCH v4 06/34] media: camss: Fix OF node usage Todor Tomov
2018-07-25 16:38 ` [PATCH v4 07/34] media: camss: csiphy: Ensure clock mux config is done before the rest Todor Tomov
2018-07-25 16:38 ` [PATCH v4 08/34] media: dt-bindings: media: qcom,camss: Unify the clock names Todor Tomov
2018-07-30 22:29   ` Rob Herring
2018-07-25 16:38 ` [PATCH v4 09/34] media: camss: " Todor Tomov
2018-07-25 16:38 ` [PATCH v4 10/34] media: camss: csiphy: Update settle count calculation Todor Tomov
2018-07-25 16:38 ` [PATCH v4 11/34] media: camss: csid: Configure data type and decode format properly Todor Tomov
2018-07-25 16:38 ` [PATCH v4 12/34] media: camss: vfe: Fix to_vfe() macro member name Todor Tomov
2018-07-25 16:38 ` [PATCH v4 13/34] media: camss: vfe: Get line pointer as container of video_out Todor Tomov
2018-07-25 16:38 ` [PATCH v4 14/34] media: camss: vfe: Do not disable CAMIF when clearing its status Todor Tomov
2018-07-25 16:38 ` [PATCH v4 15/34] media: dt-bindings: media: qcom,camss: Fix whitespaces Todor Tomov
2018-07-25 16:38 ` [PATCH v4 16/34] media: dt-bindings: media: qcom,camss: Add 8996 bindings Todor Tomov
2018-07-25 16:38 ` [PATCH v4 17/34] media: camss: Add 8x96 resources Todor Tomov
2018-07-25 16:38 ` [PATCH v4 18/34] media: camss: Add basic runtime PM support Todor Tomov
2018-07-25 16:38 ` [PATCH v4 19/34] media: camss: csiphy: Split to hardware dependent and independent parts Todor Tomov
2018-07-25 16:38 ` [PATCH v4 20/34] media: camss: csiphy: Unify lane handling Todor Tomov
2018-07-25 16:38 ` [PATCH v4 21/34] media: camss: csiphy: Add support for 8x96 Todor Tomov
2018-07-25 16:38 ` [PATCH v4 22/34] media: camss: csid: " Todor Tomov
2018-07-25 16:38 ` [PATCH v4 23/34] media: camss: ispif: " Todor Tomov
2018-07-25 16:38 ` [PATCH v4 24/34] media: camss: vfe: Split to hardware dependent and independent parts Todor Tomov
2018-07-25 16:38 ` [PATCH v4 25/34] media: camss: vfe: Add support for 8x96 Todor Tomov
2018-07-25 16:38 ` [PATCH v4 26/34] media: camss: Format configuration per hardware version Todor Tomov
2018-07-25 16:38 ` [PATCH v4 27/34] media: camss: vfe: Different format support on source pad Todor Tomov
2018-07-25 16:38 ` [PATCH v4 28/34] media: camss: vfe: Add support for UYVY output from VFE on 8x96 Todor Tomov
2018-07-25 16:38 ` Todor Tomov [this message]
2018-07-25 16:38 ` [PATCH v4 30/34] media: camss: csid: MIPI10 to Plain16 format conversion Todor Tomov
2018-07-25 16:38 ` [PATCH v4 31/34] media: camss: Add support for RAW MIPI14 on 8x96 Todor Tomov
2018-07-25 16:38 ` [PATCH v4 32/34] media: camss: Add support for 10-bit grayscale formats Todor Tomov
2018-07-25 16:38 ` [PATCH v4 33/34] media: doc: media/v4l-drivers: Update Qualcomm CAMSS driver document for 8x96 Todor Tomov
2018-07-25 16:38 ` [PATCH v4 34/34] media: camss: csid: Add support for events triggered by user controls Todor Tomov
2018-07-26 12:40 ` [PATCH v4 00/34] Qualcomm Camera Subsystem driver - 8x96 support Sakari Ailus

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=1532536723-19062-30-git-send-email-todor.tomov@linaro.org \
    --to=todor.tomov@linaro.org \
    --cc=hans.verkuil@cisco.com \
    --cc=laurent.pinchart+renesas@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®