From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Cc: Yong Deng <yong.deng@magewell.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v6 21/43] media: sun6i-csi: Implement address configuration without indirection
Date: Fri, 26 Aug 2022 20:32:18 +0200 [thread overview]
Message-ID: <20220826183240.604834-22-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220826183240.604834-1-paul.kocialkowski@bootlin.com>
Instead of calculating the planar_offset at one point and using it
later in a dedicated function, reimplement address configuration
with v4l2 format info in the buffer_configure function.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 27 ----------------
.../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ------
.../sunxi/sun6i-csi/sun6i_csi_capture.c | 32 ++++++++++++++++++-
3 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index 79d4b00d1fcd..5e03069bd4c3 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -463,7 +463,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)
struct sun6i_csi_config *config = &csi_dev->config;
u32 bytesperline_y;
u32 bytesperline_c;
- int *planar_offset = csi_dev->planar_offset;
u32 width = config->width;
u32 height = config->height;
u32 hor_len = width;
@@ -488,7 +487,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)
SUN6I_CSI_CH_VSIZE_LEN(height) |
SUN6I_CSI_CH_VSIZE_START(0));
- planar_offset[0] = 0;
switch (config->pixelformat) {
case V4L2_PIX_FMT_NV12_16L16:
case V4L2_PIX_FMT_NV12:
@@ -497,23 +495,15 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)
case V4L2_PIX_FMT_NV61:
bytesperline_y = width;
bytesperline_c = width;
- planar_offset[1] = bytesperline_y * height;
- planar_offset[2] = -1;
break;
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_YVU420:
bytesperline_y = width;
bytesperline_c = width / 2;
- planar_offset[1] = bytesperline_y * height;
- planar_offset[2] = planar_offset[1] +
- bytesperline_c * height / 2;
break;
case V4L2_PIX_FMT_YUV422P:
bytesperline_y = width;
bytesperline_c = width / 2;
- planar_offset[1] = bytesperline_y * height;
- planar_offset[2] = planar_offset[1] +
- bytesperline_c * height;
break;
default: /* raw */
dev_dbg(csi_dev->dev,
@@ -522,8 +512,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)
bytesperline_y = (sun6i_csi_get_bpp(config->pixelformat) *
config->width) / 8;
bytesperline_c = 0;
- planar_offset[1] = -1;
- planar_offset[2] = -1;
break;
}
@@ -547,21 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,
return 0;
}
-void sun6i_csi_update_buf_addr(struct sun6i_csi_device *csi_dev,
- dma_addr_t addr)
-{
- regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO0_ADDR_REG,
- SUN6I_CSI_ADDR_VALUE(addr + csi_dev->planar_offset[0]));
- if (csi_dev->planar_offset[1] != -1)
- regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO1_ADDR_REG,
- SUN6I_CSI_ADDR_VALUE(addr +
- csi_dev->planar_offset[1]));
- if (csi_dev->planar_offset[2] != -1)
- regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO2_ADDR_REG,
- SUN6I_CSI_ADDR_VALUE(addr +
- csi_dev->planar_offset[2]));
-}
-
void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable)
{
struct regmap *regmap = csi_dev->regmap;
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
index 4aa9de822d9f..ff7bb7c0de01 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
@@ -60,8 +60,6 @@ struct sun6i_csi_device {
struct clk *clock_mod;
struct clk *clock_ram;
struct reset_control *reset;
-
- int planar_offset[3];
};
struct sun6i_csi_variant {
@@ -92,14 +90,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable);
int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,
struct sun6i_csi_config *config);
-/**
- * sun6i_csi_update_buf_addr() - update the csi frame buffer address
- * @csi: pointer to the csi
- * @addr: frame buffer's physical address
- */
-void sun6i_csi_update_buf_addr(struct sun6i_csi_device *csi_dev,
- dma_addr_t addr);
-
/**
* sun6i_csi_set_stream() - start/stop csi streaming
* @csi: pointer to the csi
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
index f56335cdd477..0d844e3798e4 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
@@ -6,6 +6,7 @@
*/
#include <linux/of.h>
+#include <linux/regmap.h>
#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
@@ -16,6 +17,7 @@
#include "sun6i_csi.h"
#include "sun6i_csi_capture.h"
+#include "sun6i_csi_reg.h"
/* This is got from BSP sources. */
#define MIN_WIDTH (32)
@@ -109,13 +111,41 @@ static void
sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev,
struct sun6i_csi_buffer *csi_buffer)
{
+ struct regmap *regmap = csi_dev->regmap;
+ const struct v4l2_format_info *info;
struct vb2_buffer *vb2_buffer;
+ unsigned int width, height;
dma_addr_t address;
+ u32 pixelformat;
vb2_buffer = &csi_buffer->v4l2_buffer.vb2_buf;
address = vb2_dma_contig_plane_dma_addr(vb2_buffer, 0);
- sun6i_csi_update_buf_addr(csi_dev, address);
+ regmap_write(regmap, SUN6I_CSI_CH_FIFO0_ADDR_REG,
+ SUN6I_CSI_ADDR_VALUE(address));
+
+ sun6i_csi_capture_dimensions(csi_dev, &width, &height);
+ sun6i_csi_capture_format(csi_dev, &pixelformat, NULL);
+
+ info = v4l2_format_info(pixelformat);
+ /* Unsupported formats are single-plane, so we can stop here. */
+ if (!info)
+ return;
+
+ if (info->comp_planes > 1) {
+ address += info->bpp[0] * width * height;
+
+ regmap_write(regmap, SUN6I_CSI_CH_FIFO1_ADDR_REG,
+ SUN6I_CSI_ADDR_VALUE(address));
+ }
+
+ if (info->comp_planes > 2) {
+ address += info->bpp[1] * DIV_ROUND_UP(width, info->hdiv) *
+ DIV_ROUND_UP(height, info->vdiv);
+
+ regmap_write(regmap, SUN6I_CSI_CH_FIFO2_ADDR_REG,
+ SUN6I_CSI_ADDR_VALUE(address));
+ }
}
static void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev)
--
2.37.1
next prev parent reply other threads:[~2022-08-26 18:35 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 18:31 [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 01/43] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 02/43] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 03/43] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 04/43] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 05/43] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 06/43] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 07/43] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 08/43] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 09/43] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 10/43] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 11/43] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 12/43] media: sun6i-csi: Remove controls handler from the driver Paul Kocialkowski
2022-10-31 9:06 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 13/43] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 14/43] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 15/43] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 16/43] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-10-31 9:10 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 17/43] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 18/43] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-10-31 9:15 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 19/43] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 20/43] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-08-26 18:32 ` Paul Kocialkowski [this message]
2022-08-26 18:32 ` [PATCH v6 22/43] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 23/43] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 24/43] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 25/43] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 26/43] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 27/43] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 28/43] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 29/43] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 30/43] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 31/43] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 32/43] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 33/43] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 34/43] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 35/43] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 36/43] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-10-31 9:18 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 37/43] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 38/43] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 39/43] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 40/43] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 41/43] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 42/43] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 43/43] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
2022-09-07 8:47 ` [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Hans Verkuil
2022-09-07 10:03 ` Paul Kocialkowski
2022-10-21 14:13 ` Paul Kocialkowski
2022-10-31 9:21 ` 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=20220826183240.604834-22-paul.kocialkowski@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=jernej.skrabec@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=wens@csie.org \
--cc=yong.deng@magewell.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).