From: Changhuang Liang <changhuang.liang@starfivetech.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Jack Zhu <jack.zhu@starfivetech.com>,
Changhuang Liang <changhuang.liang@starfivetech.com>,
Dan Carpenter <dan.carpenter@linaro.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-staging@lists.linux.dev
Subject: [PATCH v2 6/8] staging: media: starfive: Fix bayer output stride configuration
Date: Wed, 10 Apr 2024 02:10:24 -0700 [thread overview]
Message-ID: <20240410091026.50272-7-changhuang.liang@starfivetech.com> (raw)
In-Reply-To: <20240410091026.50272-1-changhuang.liang@starfivetech.com>
Add the bayer output stride configuration. And convert set the stride
be a helper function. Improve readability.
Fixes: e57854628f58 ("media: staging: media: starfive: camss: Add ISP driver")
Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com>
---
.../staging/media/starfive/camss/stf-isp-hw-ops.c | 13 +++++++++----
drivers/staging/media/starfive/camss/stf-isp.c | 12 +++++++++---
drivers/staging/media/starfive/camss/stf-isp.h | 4 ++--
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c b/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
index f170fab2bfb4..c990dc124f77 100644
--- a/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
+++ b/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
@@ -408,6 +408,15 @@ void stf_isp_config_yuv_out_stride(struct stf_isp_dev *isp_dev,
stf_isp_reg_write(isp_dev->stfcamss, ISP_REG_STRIDE, val);
}
+void stf_isp_config_bayer_out_stride(struct stf_isp_dev *isp_dev,
+ u32 width, u8 bpp)
+{
+ u32 val = ALIGN(width * bpp / 8, STFCAMSS_FRAME_WIDTH_ALIGN_128);
+
+ stf_isp_reg_write(isp_dev->stfcamss, ISP_REG_DUMP_CFG_1,
+ DUMP_BURST_LEN(3) | val);
+}
+
static void stf_isp_config_raw_fmt(struct stfcamss *stfcamss, u32 mcode)
{
u32 val, val1;
@@ -459,10 +468,6 @@ void stf_isp_settings(struct stf_isp_dev *isp_dev,
stf_isp_config_crop(stfcamss, crop);
stf_isp_config_raw_fmt(stfcamss, mcode);
- stf_isp_reg_set_bit(stfcamss, ISP_REG_DUMP_CFG_1,
- DUMP_BURST_LEN_MASK | DUMP_SD_MASK,
- DUMP_BURST_LEN(3));
-
stf_isp_reg_write(stfcamss, ISP_REG_ITIIWSR,
ITI_HSIZE(IMAGE_MAX_HEIGH) |
ITI_WSIZE(IMAGE_MAX_WIDTH));
diff --git a/drivers/staging/media/starfive/camss/stf-isp.c b/drivers/staging/media/starfive/camss/stf-isp.c
index fb48e7a29e8c..ef07639bf4d1 100644
--- a/drivers/staging/media/starfive/camss/stf-isp.c
+++ b/drivers/staging/media/starfive/camss/stf-isp.c
@@ -88,22 +88,28 @@ int stf_isp_init(struct stfcamss *stfcamss)
void stf_isp_stream_on(struct stf_isp_dev *isp_dev,
struct v4l2_subdev_state *sd_state)
{
- const struct stf_isp_format_table *fmt_t_src;
- struct v4l2_mbus_framefmt *fmt, *fmt_src;
+ const struct stf_isp_format_table *fmt_t_src, *fmt_t_bayer;
+ struct v4l2_mbus_framefmt *fmt, *fmt_src, *fmt_bayer;
struct v4l2_rect *crop;
- int src;
+ int src, bayer;
fmt_t_src = &isp_dev->formats[STF_ISP_PAD_SRC];
+ fmt_t_bayer = &isp_dev->formats[STF_ISP_PAD_SRC_BAYER];
fmt = v4l2_subdev_state_get_format(sd_state, STF_ISP_PAD_SINK);
fmt_src = v4l2_subdev_state_get_format(sd_state, STF_ISP_PAD_SRC);
+ fmt_bayer = v4l2_subdev_state_get_format(sd_state, STF_ISP_PAD_SRC_BAYER);
crop = v4l2_subdev_state_get_crop(sd_state, STF_ISP_PAD_SINK);
src = stf_isp_g_index_by_mcode(fmt_t_src, fmt_src->code);
+ bayer = stf_isp_g_index_by_mcode(fmt_t_bayer, fmt_bayer->code);
stf_isp_reset(isp_dev);
stf_isp_init_cfg(isp_dev);
stf_isp_settings(isp_dev, crop, fmt->code);
stf_isp_config_yuv_out_stride(isp_dev, crop->width,
fmt_t_src->fmts[src].bpp);
+ stf_isp_config_bayer_out_stride(isp_dev, crop->width,
+ fmt_t_bayer->fmts[bayer].bpp);
+
stf_isp_stream_set(isp_dev);
}
diff --git a/drivers/staging/media/starfive/camss/stf-isp.h b/drivers/staging/media/starfive/camss/stf-isp.h
index 8505603bdbc5..546c79332e9a 100644
--- a/drivers/staging/media/starfive/camss/stf-isp.h
+++ b/drivers/staging/media/starfive/camss/stf-isp.h
@@ -77,8 +77,6 @@
#define DUMP_SHT(n) ((n) << 20)
#define DUMP_BURST_LEN(n) ((n) << 16)
#define DUMP_SD(n) ((n) << 0)
-#define DUMP_BURST_LEN_MASK GENMASK(17, 16)
-#define DUMP_SD_MASK GENMASK(15, 0)
#define ISP_REG_DEC_CFG 0x030
#define DEC_V_KEEP(n) ((n) << 24)
@@ -586,6 +584,8 @@ void stf_isp_stream_on(struct stf_isp_dev *isp_dev,
struct v4l2_subdev_state *sd_state);
void stf_isp_config_yuv_out_stride(struct stf_isp_dev *isp_dev,
u32 width, u8 bpp);
+void stf_isp_config_bayer_out_stride(struct stf_isp_dev *isp_dev,
+ u32 width, u8 bpp);
int stf_isp_init(struct stfcamss *stfcamss);
int stf_isp_register(struct stf_isp_dev *isp_dev, struct v4l2_device *v4l2_dev);
int stf_isp_unregister(struct stf_isp_dev *isp_dev);
--
2.25.1
next prev parent reply other threads:[~2024-04-10 9:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 9:10 [PATCH v2 0/8] Add ISP Bayer for StarFive Changhuang Liang
2024-04-10 9:10 ` [PATCH v2 1/8] staging: media: starfive: Get rid of current_fmt Changhuang Liang
2024-04-10 9:10 ` [PATCH v2 2/8] staging: media: starfive: Add bayer pad for ISP Changhuang Liang
2024-04-10 9:10 ` [PATCH v2 3/8] staging: media: starfive: Use PAD_SINK instead of PAD_SRC for crop Changhuang Liang
2024-04-10 9:10 ` [PATCH v2 4/8] staging: media: starfive: Introduce isp_stream Changhuang Liang
2024-04-10 9:10 ` [PATCH v2 5/8] staging: media: starfive: Add ISP bayer video device Changhuang Liang
2024-04-10 9:10 ` Changhuang Liang [this message]
2024-04-10 9:10 ` [PATCH v2 7/8] staging: media: starfive: Move the struct media_pipeline position Changhuang Liang
2024-04-10 9:10 ` [PATCH v2 8/8] admin-guide: media: Update documents for StarFive Camera Subsystem Changhuang Liang
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=20240410091026.50272-7-changhuang.liang@starfivetech.com \
--to=changhuang.liang@starfivetech.com \
--cc=bryan.odonoghue@linaro.org \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jack.zhu@starfivetech.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).