From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org,
robert.foss@linaro.org, jonathan@marek.ca
Cc: andrey.konovalov@linaro.org, todor.too@gmail.com,
agross@kernel.org, bjorn.andersson@linaro.org,
mchehab@kernel.org, jgrahsl@snap.com, hfink@snap.com,
bryan.odonoghue@linaro.org
Subject: [PATCH v2 05/19] media: camss: csid-170: fix non-10bit formats
Date: Wed, 24 Nov 2021 17:59:07 +0000 [thread overview]
Message-ID: <20211124175921.1048375-6-bryan.odonoghue@linaro.org> (raw)
In-Reply-To: <20211124175921.1048375-1-bryan.odonoghue@linaro.org>
From: Jonathan Marek <jonathan@marek.ca>
Use the decode_format/data_type from the "format" struct instead of a
hardcoded 10-bit format.
Fixes: eebe6d00e9bf ("media: camss: Add support for CSID hardware version Titan 170")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Tested-by: Julian Grahsl <jgrahsl@snap.com>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
drivers/media/platform/qcom/camss/camss-csid-170.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c
index ac22ff29d2a9..aa65043c3303 100644
--- a/drivers/media/platform/qcom/camss/camss-csid-170.c
+++ b/drivers/media/platform/qcom/camss/camss-csid-170.c
@@ -366,7 +366,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable)
val |= input_format->width & 0x1fff << TPG_DT_n_CFG_0_FRAME_WIDTH;
writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_0(0));
- val = DATA_TYPE_RAW_10BIT << TPG_DT_n_CFG_1_DATA_TYPE;
+ val = format->data_type << TPG_DT_n_CFG_1_DATA_TYPE;
writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_1(0));
val = tg->mode << TPG_DT_n_CFG_2_PAYLOAD_MODE;
@@ -382,8 +382,9 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable)
val = 1 << RDI_CFG0_BYTE_CNTR_EN;
val |= 1 << RDI_CFG0_FORMAT_MEASURE_EN;
val |= 1 << RDI_CFG0_TIMESTAMP_EN;
+ /* note: for non-RDI path, this should be format->decode_format */
val |= DECODE_FORMAT_PAYLOAD_ONLY << RDI_CFG0_DECODE_FORMAT;
- val |= DATA_TYPE_RAW_10BIT << RDI_CFG0_DATA_TYPE;
+ val |= format->data_type << RDI_CFG0_DATA_TYPE;
val |= vc << RDI_CFG0_VIRTUAL_CHANNEL;
val |= dt_id << RDI_CFG0_DT_ID;
writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
--
2.33.0
next prev parent reply other threads:[~2021-11-24 17:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 17:59 [PATCH v2 00/19] CAMSS: Add SM8250 support Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 01/19] media: dt-bindings: media: camss: Add qcom,sm8250-camss binding Bryan O'Donoghue
2021-12-02 13:06 ` Hans Verkuil
2021-12-02 13:11 ` Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 02/19] media: camss: csiphy-3ph: don't print HW version as an error Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 03/19] media: camss: csiphy-3ph: disable interrupts Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 04/19] media: camss: csiphy-3ph: add support for SM8250 CSI DPHY Bryan O'Donoghue
2021-11-24 17:59 ` Bryan O'Donoghue [this message]
2021-11-24 17:59 ` [PATCH v2 06/19] media: camss: csid-170: don't enable unused irqs Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 07/19] media: camss: csid-170: remove stray comment Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 08/19] media: camss: csid-170: support more than one lite vfe Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 09/19] media: camss: csid-170: set the right HALT_CMD when disabled Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 10/19] media: camss: csid: allow csid to work without a regulator Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 11/19] media: camss: remove vdda-csiN from sdm845 resources Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 12/19] media: camss: fix VFE irq name Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 13/19] media: camss: vfe-170: fix "VFE halt timeout" error Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 14/19] media: camss: Add initial support for VFE hardware version Titan 480 Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 15/19] media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 16/19] media: camss: add support for SM8250 camss Bryan O'Donoghue
2021-11-24 17:59 ` [PATCH v2 17/19] media: camss: Add SM8250 bandwdith configuration support Bryan O'Donoghue
2021-11-25 10:27 ` Robert Foss
2021-11-24 17:59 ` [PATCH v2 18/19] media: camss: Do vfe_get/vfe_put for csid on sm8250 Bryan O'Donoghue
2021-11-25 10:43 ` Robert Foss
2021-11-24 17:59 ` [PATCH v2 19/19] media: camss: Apply vfe_get/vfe_put fix to SDM845 Bryan O'Donoghue
2021-11-25 10:45 ` Robert Foss
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=20211124175921.1048375-6-bryan.odonoghue@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=agross@kernel.org \
--cc=andrey.konovalov@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=hfink@snap.com \
--cc=jgrahsl@snap.com \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=robert.foss@linaro.org \
--cc=todor.too@gmail.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;
as well as URLs for NNTP newsgroup(s).