From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: linux-media@vger.kernel.org, dafna.hirschfeld@collabora.com,
helen.koike@collabora.com, ezequiel@collabora.com,
hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com,
sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org,
mchehab@kernel.org, laurent.pinchart@ideasonboard.com
Subject: [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register
Date: Thu, 26 Mar 2020 21:16:07 +0100 [thread overview]
Message-ID: <20200326201610.31762-2-dafna.hirschfeld@collabora.com> (raw)
In-Reply-To: <20200326201610.31762-1-dafna.hirschfeld@collabora.com>
When writing to the RKISP1_CIF_MI_XTD_FORMAT_CTRL register
in mainpath, a redundant mask that clears the related swap
flag is applied and then the flag is set again.
In the selfpath, a mask that clears the swap setting is applied
instead of adding the setting.
This patch fixes those issues by just adding the swap setting.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-capture.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 45d237a77ca4..84a3cf565106 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -432,8 +432,7 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
if (cap->pix.cfg->uv_swap) {
reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
- reg = (reg & ~BIT(0)) |
- RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
+ reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
}
@@ -470,8 +469,8 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap)
if (cap->pix.cfg->uv_swap) {
u32 reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
- rkisp1_write(rkisp1, reg & ~BIT(1),
- RKISP1_CIF_MI_XTD_FORMAT_CTRL);
+ reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;
+ rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
}
rkisp1_mi_config_ctrl(cap);
--
2.17.1
next prev parent reply other threads:[~2020-03-26 20:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 20:16 [PATCH 0/4] media: staging: rkisp1: cap: various fixes for capture formats Dafna Hirschfeld
2020-03-26 20:16 ` Dafna Hirschfeld [this message]
2020-03-30 19:11 ` [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register Helen Koike
2020-03-26 20:16 ` [PATCH 2/4] media: staging: rkisp1: cap: support uv swap only for semiplanar formats Dafna Hirschfeld
2020-03-30 19:12 ` Helen Koike
2020-03-26 20:16 ` [PATCH 3/4] media: staging: rkisp1: cap: support uv swapped plane formats Dafna Hirschfeld
2020-03-30 19:13 ` Helen Koike
2020-03-26 20:16 ` [PATCH 4/4] media: staging: rkisp1: cap: remove unsupported formats Dafna Hirschfeld
2020-03-30 19:20 ` Helen Koike
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=20200326201610.31762-2-dafna.hirschfeld@collabora.com \
--to=dafna.hirschfeld@collabora.com \
--cc=dafna3@gmail.com \
--cc=ezequiel@collabora.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).