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 10/32] media: camss: csid: Configure data type and decode format properly
Date: Fri, 22 Jun 2018 18:33:19 +0300 [thread overview]
Message-ID: <1529681621-9682-11-git-send-email-todor.tomov@linaro.org> (raw)
In-Reply-To: <1529681621-9682-1-git-send-email-todor.tomov@linaro.org>
The CSID decodes the input data stream. When the input comes from
the Test Generator the format of the stream is set on the source
media pad. When the input comes from the CSIPHY the format is the
one on the sink media pad. Use the proper format for each case.
Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
---
drivers/media/platform/qcom/camss/camss-csid.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index c0fef17..3cde07e 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -384,9 +384,6 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
!media_entity_remote_pad(&csid->pads[MSM_CSID_PAD_SINK]))
return -ENOLINK;
- dt = csid_get_fmt_entry(csid->fmt[MSM_CSID_PAD_SRC].code)->
- data_type;
-
if (tg->enabled) {
/* Config Test Generator */
struct v4l2_mbus_framefmt *f =
@@ -408,6 +405,9 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
writel_relaxed(val, csid->base +
CAMSS_CSID_TG_DT_n_CGG_0(0));
+ dt = csid_get_fmt_entry(
+ csid->fmt[MSM_CSID_PAD_SRC].code)->data_type;
+
/* 5:0 data type */
val = dt;
writel_relaxed(val, csid->base +
@@ -417,6 +417,9 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
val = tg->payload_mode;
writel_relaxed(val, csid->base +
CAMSS_CSID_TG_DT_n_CGG_2(0));
+
+ df = csid_get_fmt_entry(
+ csid->fmt[MSM_CSID_PAD_SRC].code)->decode_format;
} else {
struct csid_phy_config *phy = &csid->phy;
@@ -431,13 +434,16 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
writel_relaxed(val,
csid->base + CAMSS_CSID_CORE_CTRL_1);
+
+ dt = csid_get_fmt_entry(
+ csid->fmt[MSM_CSID_PAD_SINK].code)->data_type;
+ df = csid_get_fmt_entry(
+ csid->fmt[MSM_CSID_PAD_SINK].code)->decode_format;
}
/* Config LUT */
dt_shift = (cid % 4) * 8;
- df = csid_get_fmt_entry(csid->fmt[MSM_CSID_PAD_SINK].code)->
- decode_format;
val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
val &= ~(0xff << dt_shift);
--
2.7.4
next prev parent reply other threads:[~2018-06-22 15:40 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-22 15:33 [PATCH 00/32] Qualcomm Camera Subsystem driver - 8x96 support Todor Tomov
2018-06-22 15:33 ` [PATCH 01/32] doc-rst: Add packed Bayer raw14 pixel formats Todor Tomov
2018-06-22 15:33 ` [PATCH 02/32] media: v4l: Add new 2X8 10-bit grayscale media bus code Todor Tomov
2018-06-22 15:33 ` [PATCH 03/32] media: v4l: Add new 10-bit packed grayscale format Todor Tomov
2018-06-22 15:33 ` [PATCH 04/32] media: Rename CAMSS driver path Todor Tomov
2018-06-26 13:53 ` Sakari Ailus
2018-06-22 15:33 ` [PATCH 05/32] media: camss: Use SPDX license headers Todor Tomov
2018-06-22 15:33 ` [PATCH 06/32] media: camss: Fix OF node usage Todor Tomov
2018-06-22 15:33 ` [PATCH 07/32] media: camss: csiphy: Ensure clock mux config is done before the rest Todor Tomov
2018-06-22 15:33 ` [PATCH 08/32] media: camss: Unify the clock names Todor Tomov
2018-07-02 7:46 ` Hans Verkuil
2018-06-22 15:33 ` [PATCH 09/32] media: camss: csiphy: Update settle count calculation Todor Tomov
2018-06-22 15:33 ` Todor Tomov [this message]
2018-06-22 15:33 ` [PATCH 11/32] media: camss: vfe: Fix to_vfe() macro member name Todor Tomov
2018-06-22 15:33 ` [PATCH 12/32] media: camss: vfe: Get line pointer as container of video_out Todor Tomov
2018-06-22 15:33 ` [PATCH 13/32] media: camss: vfe: Do not disable CAMIF when clearing its status Todor Tomov
2018-06-22 15:33 ` [PATCH 14/32] media: dt-bindings: media: qcom,camss: Fix whitespaces Todor Tomov
2018-07-03 19:36 ` Rob Herring
2018-06-22 15:33 ` [PATCH 15/32] media: dt-bindings: media: qcom,camss: Add 8996 bindings Todor Tomov
2018-07-03 19:51 ` Rob Herring
2018-06-22 15:33 ` [PATCH 16/32] media: camss: Add 8x96 resources Todor Tomov
2018-06-22 15:33 ` [PATCH 17/32] media: camss: Add basic runtime PM support Todor Tomov
2018-06-22 15:33 ` [PATCH 18/32] media: camss: csiphy: Split to hardware dependent and independent parts Todor Tomov
2018-06-22 15:33 ` [PATCH 19/32] media: camss: csiphy: Unify lane handling Todor Tomov
2018-06-22 15:33 ` [PATCH 20/32] media: camss: csiphy: Add support for 8x96 Todor Tomov
2018-06-22 15:33 ` [PATCH 21/32] media: camss: csid: " Todor Tomov
2018-06-22 15:33 ` [PATCH 22/32] media: camss: ispif: " Todor Tomov
2018-06-22 15:33 ` [PATCH 23/32] media: camss: vfe: Split to hardware dependent and independent parts Todor Tomov
2018-06-22 15:33 ` [PATCH 24/32] media: camss: vfe: Add support for 8x96 Todor Tomov
2018-06-22 15:33 ` [PATCH 25/32] media: camss: Format configuration per hardware version Todor Tomov
2018-06-22 15:33 ` [PATCH 26/32] media: camss: vfe: Different format support on source pad Todor Tomov
2018-06-22 15:33 ` [PATCH 27/32] media: camss: vfe: Add support for UYVY output from VFE on 8x96 Todor Tomov
2018-06-22 15:33 ` [PATCH 28/32] media: camss: csid: Different format support on source pad Todor Tomov
2018-06-22 15:33 ` [PATCH 29/32] media: camss: csid: MIPI10 to Plain16 format conversion Todor Tomov
2018-06-22 15:33 ` [PATCH 30/32] media: camss: Add support for RAW MIPI14 on 8x96 Todor Tomov
2018-06-22 15:33 ` [PATCH 31/32] media: camss: Add support for 10-bit grayscale formats Todor Tomov
2018-06-22 15:33 ` [PATCH 32/32] media: doc: media/v4l-drivers: Update Qualcomm CAMSS driver document for 8x96 Todor Tomov
2018-07-02 8:01 ` [PATCH 00/32] Qualcomm Camera Subsystem driver - 8x96 support Hans Verkuil
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=1529681621-9682-11-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®