* [PATCH 00/25] OMAP4 ISS fixes
@ 2013-12-04 0:56 Laurent Pinchart
2013-12-04 0:56 ` [PATCH 01/25] v4l: omap4iss: Replace printk by dev_err Laurent Pinchart
` (24 more replies)
0 siblings, 25 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Hello,
Here's a first round of fixes for the OMAP4 ISS driver, based on top of the
linuxtv master branch. Given the very diverse nature of the patches, please
see the individual commit messages for more information.
Laurent Pinchart (25):
v4l: omap4iss: Replace printk by dev_err
v4l: omap4iss: Don't split log strings on multiple lines
v4l: omap4iss: Restrict line lengths to 80 characters where possible
v4l: omap4iss: Remove double semicolon at end of line
v4l: omap4iss: Define more ISS and ISP IRQ register bits
v4l: omap4iss: isif: Define more VDINT registers
v4l: omap4iss: Enhance IRQ debugging
v4l: omap4iss: Don't make IRQ debugging functions inline
v4l: omap4iss: Fix operators precedence in ternary operators
v4l: omap4iss: isif: Ignore VD0 interrupts when no buffer is available
v4l: omap4iss: ipipeif: Shift input data according to the input format
v4l: omap4iss: csi2: Enable automatic ULP mode transition
v4l: omap4iss: Create and use register access functions
v4l: omap4iss: csi: Create and use register access functions
v4l: omap4iss: resizer: Stop the whole resizer to avoid FIFO overflows
v4l: omap4iss: Convert hexadecimal constants to lower case
v4l: omap4iss: Add description field to iss_format_info structure
v4l: omap4iss: Make __iss_video_get_format() return a
v4l2_mbus_framefmt
v4l: omap4iss: Add enum_fmt_vid_cap ioctl support
v4l: omap4iss: Propagate stop timeouts from submodules to the driver
core
v4l: omap4iss: Enable/disabling the ISP interrupts globally
v4l: omap4iss: Reset the ISS when the pipeline can't be stopped
v4l: omap4iss: csi2: Replace manual if statement with a subclk field
v4l: omap4iss: Cancel streaming when a fatal error occurs
v4l: omap4iss: resizer: Fix comment regarding bypass mode
drivers/staging/media/omap4iss/iss.c | 337 +++++++++++-------
drivers/staging/media/omap4iss/iss.h | 89 ++++-
drivers/staging/media/omap4iss/iss_csi2.c | 184 +++++-----
drivers/staging/media/omap4iss/iss_csi2.h | 8 +-
drivers/staging/media/omap4iss/iss_csiphy.c | 39 ++-
drivers/staging/media/omap4iss/iss_csiphy.h | 6 +-
drivers/staging/media/omap4iss/iss_ipipe.c | 59 ++--
drivers/staging/media/omap4iss/iss_ipipeif.c | 180 +++++-----
drivers/staging/media/omap4iss/iss_regs.h | 502 ++++++++++++++-------------
drivers/staging/media/omap4iss/iss_resizer.c | 242 ++++++-------
drivers/staging/media/omap4iss/iss_video.c | 174 ++++++++--
drivers/staging/media/omap4iss/iss_video.h | 8 +-
12 files changed, 1046 insertions(+), 782 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 01/25] v4l: omap4iss: Replace printk by dev_err
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 02/25] v4l: omap4iss: Don't split log strings on multiple lines Laurent Pinchart
` (23 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
dev_err is preferred over printk(KERN_ERR) when a device pointer is
available.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 8 ++++----
drivers/staging/media/omap4iss/iss_csi2.c | 7 ++++---
drivers/staging/media/omap4iss/iss_csiphy.c | 2 +-
drivers/staging/media/omap4iss/iss_video.c | 3 ++-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index b7c8a6b..3ac986e 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1108,7 +1108,7 @@ static int iss_register_entities(struct iss_device *iss)
iss->media_dev.link_notify = iss_pipeline_link_notify;
ret = media_device_register(&iss->media_dev);
if (ret < 0) {
- printk(KERN_ERR "%s: Media device registration failed (%d)\n",
+ dev_err(iss->dev, "%s: Media device registration failed (%d)\n",
__func__, ret);
return ret;
}
@@ -1116,7 +1116,7 @@ static int iss_register_entities(struct iss_device *iss)
iss->v4l2_dev.mdev = &iss->media_dev;
ret = v4l2_device_register(iss->dev, &iss->v4l2_dev);
if (ret < 0) {
- printk(KERN_ERR "%s: V4L2 device registration failed (%d)\n",
+ dev_err(iss->dev, "%s: V4L2 device registration failed (%d)\n",
__func__, ret);
goto done;
}
@@ -1175,8 +1175,8 @@ static int iss_register_entities(struct iss_device *iss)
break;
default:
- printk(KERN_ERR "%s: invalid interface type %u\n",
- __func__, subdevs->interface);
+ dev_err(iss->dev, "%s: invalid interface type %u\n",
+ __func__, subdevs->interface);
ret = -EINVAL;
goto done;
}
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index 0ee8381..9ced9ce 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -517,7 +517,8 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
} while (soft_reset_retries < 5);
if (soft_reset_retries == 5) {
- printk(KERN_ERR "CSI2: Soft reset try count exceeded!\n");
+ dev_err(csi2->iss->dev,
+ "CSI2: Soft reset try count exceeded!\n");
return -EBUSY;
}
@@ -535,8 +536,8 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
} while (--i > 0);
if (i == 0) {
- printk(KERN_ERR
- "CSI2: Reset for CSI2_96M_FCLK domain Failed!\n");
+ dev_err(csi2->iss->dev,
+ "CSI2: Reset for CSI2_96M_FCLK domain Failed!\n");
return -EBUSY;
}
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index 2afea98..e0d0247 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -78,7 +78,7 @@ static int csiphy_set_power(struct iss_csiphy *phy, u32 power)
} while ((reg != power >> 2) && (retry_count < 250));
if (retry_count == 250) {
- printk(KERN_ERR "CSI2 CIO set power failed!\n");
+ dev_err(phy->iss->dev, "CSI2 CIO set power failed!\n");
return -EBUSY;
}
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 766491e..5a92bac 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -1116,7 +1116,8 @@ int omap4iss_video_register(struct iss_video *video, struct v4l2_device *vdev)
ret = video_register_device(&video->video, VFL_TYPE_GRABBER, -1);
if (ret < 0)
- printk(KERN_ERR "%s: could not register video device (%d)\n",
+ dev_err(video->iss->dev,
+ "%s: could not register video device (%d)\n",
__func__, ret);
return ret;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 02/25] v4l: omap4iss: Don't split log strings on multiple lines
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
2013-12-04 0:56 ` [PATCH 01/25] v4l: omap4iss: Replace printk by dev_err Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 03/25] v4l: omap4iss: Restrict line lengths to 80 characters where possible Laurent Pinchart
` (22 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Non-split strings help grepping for messages.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 6 +++---
drivers/staging/media/omap4iss/iss_csi2.c | 13 ++++---------
drivers/staging/media/omap4iss/iss_resizer.c | 5 +----
drivers/staging/media/omap4iss/iss_video.c | 4 ++--
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 3ac986e..53dcb54 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1073,9 +1073,9 @@ iss_register_subdev_group(struct iss_device *iss,
adapter = i2c_get_adapter(board_info->i2c_adapter_id);
if (adapter == NULL) {
- dev_err(iss->dev, "%s: Unable to get I2C adapter %d for "
- "device %s\n", __func__,
- board_info->i2c_adapter_id,
+ dev_err(iss->dev,
+ "%s: Unable to get I2C adapter %d for device %s\n",
+ __func__, board_info->i2c_adapter_id,
board_info->board_info->type);
continue;
}
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index 9ced9ce..c3a5fca 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -754,8 +754,8 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2)
CSI2_COMPLEXIO_IRQSTATUS);
writel(cpxio1_irqstatus,
csi2->regs1 + CSI2_COMPLEXIO_IRQSTATUS);
- dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ "
- "%x\n", cpxio1_irqstatus);
+ dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ %x\n",
+ cpxio1_irqstatus);
pipe->error = true;
}
@@ -764,13 +764,8 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2)
CSI2_IRQ_ECC_NO_CORRECTION |
CSI2_IRQ_COMPLEXIO_ERR |
CSI2_IRQ_FIFO_OVF)) {
- dev_dbg(iss->dev, "CSI2 Err:"
- " OCP:%d,"
- " Short_pack:%d,"
- " ECC:%d,"
- " CPXIO:%d,"
- " FIFO_OVF:%d,"
- "\n",
+ dev_dbg(iss->dev,
+ "CSI2 Err: OCP:%d SHORT:%d ECC:%d CPXIO:%d OVF:%d\n",
(csi2_irqstatus &
CSI2_IRQ_OCP_ERR) ? 1 : 0,
(csi2_irqstatus &
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index cb5df52..e5a3a8cf 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -321,10 +321,7 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK |
ISP5_IRQ_RSZ_FIFO_OVF)) {
- dev_dbg(iss->dev, "RSZ Err:"
- " FIFO_IN_BLK:%d,"
- " FIFO_OVF:%d,"
- "\n",
+ dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n",
(events &
ISP5_IRQ_RSZ_FIFO_IN_BLK) ? 1 : 0,
(events &
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 5a92bac..3e543d9 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -324,8 +324,8 @@ static int iss_video_buf_prepare(struct vb2_buffer *vb)
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
if (!IS_ALIGNED(addr, 32)) {
- dev_dbg(video->iss->dev, "Buffer address must be "
- "aligned to 32 bytes boundary.\n");
+ dev_dbg(video->iss->dev,
+ "Buffer address must be aligned to 32 bytes boundary.\n");
return -EINVAL;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 03/25] v4l: omap4iss: Restrict line lengths to 80 characters where possible
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
2013-12-04 0:56 ` [PATCH 01/25] v4l: omap4iss: Replace printk by dev_err Laurent Pinchart
2013-12-04 0:56 ` [PATCH 02/25] v4l: omap4iss: Don't split log strings on multiple lines Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 04/25] v4l: omap4iss: Remove double semicolon at end of line Laurent Pinchart
` (21 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_csiphy.c | 6 ++-
drivers/staging/media/omap4iss/iss_ipipeif.c | 63 ++++++++++++++++------------
drivers/staging/media/omap4iss/iss_resizer.c | 47 ++++++++++++---------
drivers/staging/media/omap4iss/iss_video.c | 11 +++--
4 files changed, 74 insertions(+), 53 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index e0d0247..25e6f89 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -178,7 +178,8 @@ int omap4iss_csiphy_config(struct iss_device *iss,
if (lanes->data[i].pos == 0)
continue;
- if (lanes->data[i].pol > 1 || lanes->data[i].pos > (csi2->phy->max_data_lanes + 1))
+ if (lanes->data[i].pol > 1 ||
+ lanes->data[i].pos > (csi2->phy->max_data_lanes + 1))
return -EINVAL;
if (used_lanes & (1 << lanes->data[i].pos))
@@ -188,7 +189,8 @@ int omap4iss_csiphy_config(struct iss_device *iss,
csi2->phy->used_data_lanes++;
}
- if (lanes->clk.pol > 1 || lanes->clk.pos > (csi2->phy->max_data_lanes + 1))
+ if (lanes->clk.pol > 1 ||
+ lanes->clk.pos > (csi2->phy->max_data_lanes + 1))
return -EINVAL;
if (lanes->clk.pos == 0 || used_lanes & (1 << lanes->clk.pos))
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index acc6005..eee6891 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -23,10 +23,6 @@
#include "iss_regs.h"
#include "iss_ipipeif.h"
-static struct v4l2_mbus_framefmt *
-__ipipeif_get_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *fh,
- unsigned int pad, enum v4l2_subdev_format_whence which);
-
static const unsigned int ipipeif_fmts[] = {
V4L2_MBUS_FMT_SGRBG10_1X10,
V4L2_MBUS_FMT_SRGGB10_1X10,
@@ -274,7 +270,8 @@ static void ipipeif_isif0_isr(struct iss_ipipeif_device *ipipeif)
*/
void omap4iss_ipipeif_isr(struct iss_ipipeif_device *ipipeif, u32 events)
{
- if (omap4iss_module_sync_is_stopping(&ipipeif->wait, &ipipeif->stopping))
+ if (omap4iss_module_sync_is_stopping(&ipipeif->wait,
+ &ipipeif->stopping))
return;
if (events & ISP5_IRQ_ISIF0)
@@ -285,7 +282,8 @@ void omap4iss_ipipeif_isr(struct iss_ipipeif_device *ipipeif, u32 events)
* ISP video operations
*/
-static int ipipeif_video_queue(struct iss_video *video, struct iss_buffer *buffer)
+static int ipipeif_video_queue(struct iss_video *video,
+ struct iss_buffer *buffer)
{
struct iss_ipipeif_device *ipipeif = container_of(video,
struct iss_ipipeif_device, video_out);
@@ -385,8 +383,9 @@ static int ipipeif_set_stream(struct v4l2_subdev *sd, int enable)
}
static struct v4l2_mbus_framefmt *
-__ipipeif_get_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *fh,
- unsigned int pad, enum v4l2_subdev_format_whence which)
+__ipipeif_get_format(struct iss_ipipeif_device *ipipeif,
+ struct v4l2_subdev_fh *fh, unsigned int pad,
+ enum v4l2_subdev_format_whence which)
{
if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_format(fh, pad);
@@ -402,9 +401,10 @@ __ipipeif_get_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *
* @fmt: Format
*/
static void
-ipipeif_try_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *fh,
- unsigned int pad, struct v4l2_mbus_framefmt *fmt,
- enum v4l2_subdev_format_whence which)
+ipipeif_try_format(struct iss_ipipeif_device *ipipeif,
+ struct v4l2_subdev_fh *fh, unsigned int pad,
+ struct v4l2_mbus_framefmt *fmt,
+ enum v4l2_subdev_format_whence which)
{
struct v4l2_mbus_framefmt *format;
unsigned int width = fmt->width;
@@ -413,8 +413,8 @@ ipipeif_try_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *fh
switch (pad) {
case IPIPEIF_PAD_SINK:
- /* TODO: If the IPIPEIF output formatter pad is connected directly
- * to the resizer, only YUV formats can be used.
+ /* TODO: If the IPIPEIF output formatter pad is connected
+ * directly to the resizer, only YUV formats can be used.
*/
for (i = 0; i < ARRAY_SIZE(ipipeif_fmts); i++) {
if (fmt->code == ipipeif_fmts[i])
@@ -431,7 +431,8 @@ ipipeif_try_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *fh
break;
case IPIPEIF_PAD_SOURCE_ISIF_SF:
- format = __ipipeif_get_format(ipipeif, fh, IPIPEIF_PAD_SINK, which);
+ format = __ipipeif_get_format(ipipeif, fh, IPIPEIF_PAD_SINK,
+ which);
memcpy(fmt, format, sizeof(*fmt));
/* The data formatter truncates the number of horizontal output
@@ -445,7 +446,8 @@ ipipeif_try_format(struct iss_ipipeif_device *ipipeif, struct v4l2_subdev_fh *fh
break;
case IPIPEIF_PAD_SOURCE_VP:
- format = __ipipeif_get_format(ipipeif, fh, IPIPEIF_PAD_SINK, which);
+ format = __ipipeif_get_format(ipipeif, fh, IPIPEIF_PAD_SINK,
+ which);
memcpy(fmt, format, sizeof(*fmt));
fmt->width = clamp_t(u32, width, 32, fmt->width);
@@ -514,7 +516,8 @@ static int ipipeif_enum_frame_size(struct v4l2_subdev *sd,
format.code = fse->code;
format.width = 1;
format.height = 1;
- ipipeif_try_format(ipipeif, fh, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);
+ ipipeif_try_format(ipipeif, fh, fse->pad, &format,
+ V4L2_SUBDEV_FORMAT_TRY);
fse->min_width = format.width;
fse->min_height = format.height;
@@ -524,7 +527,8 @@ static int ipipeif_enum_frame_size(struct v4l2_subdev *sd,
format.code = fse->code;
format.width = -1;
format.height = -1;
- ipipeif_try_format(ipipeif, fh, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);
+ ipipeif_try_format(ipipeif, fh, fse->pad, &format,
+ V4L2_SUBDEV_FORMAT_TRY);
fse->max_width = format.width;
fse->max_height = format.height;
@@ -578,14 +582,16 @@ static int ipipeif_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
/* Propagate the format from sink to source */
if (fmt->pad == IPIPEIF_PAD_SINK) {
- format = __ipipeif_get_format(ipipeif, fh, IPIPEIF_PAD_SOURCE_ISIF_SF,
- fmt->which);
+ format = __ipipeif_get_format(ipipeif, fh,
+ IPIPEIF_PAD_SOURCE_ISIF_SF,
+ fmt->which);
*format = fmt->format;
- ipipeif_try_format(ipipeif, fh, IPIPEIF_PAD_SOURCE_ISIF_SF, format,
- fmt->which);
+ ipipeif_try_format(ipipeif, fh, IPIPEIF_PAD_SOURCE_ISIF_SF,
+ format, fmt->which);
- format = __ipipeif_get_format(ipipeif, fh, IPIPEIF_PAD_SOURCE_VP,
- fmt->which);
+ format = __ipipeif_get_format(ipipeif, fh,
+ IPIPEIF_PAD_SOURCE_VP,
+ fmt->which);
*format = fmt->format;
ipipeif_try_format(ipipeif, fh, IPIPEIF_PAD_SOURCE_VP, format,
fmt->which);
@@ -594,7 +600,8 @@ static int ipipeif_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
return 0;
}
-static int ipipeif_link_validate(struct v4l2_subdev *sd, struct media_link *link,
+static int ipipeif_link_validate(struct v4l2_subdev *sd,
+ struct media_link *link,
struct v4l2_subdev_format *source_fmt,
struct v4l2_subdev_format *sink_fmt)
{
@@ -618,7 +625,8 @@ static int ipipeif_link_validate(struct v4l2_subdev *sd, struct media_link *link
* formats are initialized on the file handle. Otherwise active formats are
* initialized on the device.
*/
-static int ipipeif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+static int ipipeif_init_formats(struct v4l2_subdev *sd,
+ struct v4l2_subdev_fh *fh)
{
struct v4l2_subdev_format format;
@@ -778,8 +786,9 @@ static int ipipeif_init_entities(struct iss_ipipeif_device *ipipeif)
return ret;
/* Connect the IPIPEIF subdev to the video node. */
- ret = media_entity_create_link(&ipipeif->subdev.entity, IPIPEIF_PAD_SOURCE_ISIF_SF,
- &ipipeif->video_out.video.entity, 0, 0);
+ ret = media_entity_create_link(&ipipeif->subdev.entity,
+ IPIPEIF_PAD_SOURCE_ISIF_SF,
+ &ipipeif->video_out.video.entity, 0, 0);
if (ret < 0)
return ret;
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index e5a3a8cf..08b2505 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -23,10 +23,6 @@
#include "iss_regs.h"
#include "iss_resizer.h"
-static struct v4l2_mbus_framefmt *
-__resizer_get_format(struct iss_resizer_device *resizer, struct v4l2_subdev_fh *fh,
- unsigned int pad, enum v4l2_subdev_format_whence which);
-
static const unsigned int resizer_fmts[] = {
V4L2_MBUS_FMT_UYVY8_1X16,
V4L2_MBUS_FMT_YUYV8_1X16,
@@ -329,7 +325,8 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
pipe->error = true;
}
- if (omap4iss_module_sync_is_stopping(&resizer->wait, &resizer->stopping))
+ if (omap4iss_module_sync_is_stopping(&resizer->wait,
+ &resizer->stopping))
return;
if (events & ISP5_IRQ_RSZ_INT_DMA)
@@ -340,7 +337,8 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
* ISS video operations
*/
-static int resizer_video_queue(struct iss_video *video, struct iss_buffer *buffer)
+static int resizer_video_queue(struct iss_video *video,
+ struct iss_buffer *buffer)
{
struct iss_resizer_device *resizer = container_of(video,
struct iss_resizer_device, video_out);
@@ -453,8 +451,9 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable)
}
static struct v4l2_mbus_framefmt *
-__resizer_get_format(struct iss_resizer_device *resizer, struct v4l2_subdev_fh *fh,
- unsigned int pad, enum v4l2_subdev_format_whence which)
+__resizer_get_format(struct iss_resizer_device *resizer,
+ struct v4l2_subdev_fh *fh, unsigned int pad,
+ enum v4l2_subdev_format_whence which)
{
if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_format(fh, pad);
@@ -470,9 +469,10 @@ __resizer_get_format(struct iss_resizer_device *resizer, struct v4l2_subdev_fh *
* @fmt: Format
*/
static void
-resizer_try_format(struct iss_resizer_device *resizer, struct v4l2_subdev_fh *fh,
- unsigned int pad, struct v4l2_mbus_framefmt *fmt,
- enum v4l2_subdev_format_whence which)
+resizer_try_format(struct iss_resizer_device *resizer,
+ struct v4l2_subdev_fh *fh, unsigned int pad,
+ struct v4l2_mbus_framefmt *fmt,
+ enum v4l2_subdev_format_whence which)
{
enum v4l2_mbus_pixelcode pixelcode;
struct v4l2_mbus_framefmt *format;
@@ -498,7 +498,8 @@ resizer_try_format(struct iss_resizer_device *resizer, struct v4l2_subdev_fh *fh
case RESIZER_PAD_SOURCE_MEM:
pixelcode = fmt->code;
- format = __resizer_get_format(resizer, fh, RESIZER_PAD_SINK, which);
+ format = __resizer_get_format(resizer, fh, RESIZER_PAD_SINK,
+ which);
memcpy(fmt, format, sizeof(*fmt));
if ((pixelcode == V4L2_MBUS_FMT_YUYV8_1_5X8) &&
@@ -586,7 +587,8 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd,
format.code = fse->code;
format.width = 1;
format.height = 1;
- resizer_try_format(resizer, fh, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);
+ resizer_try_format(resizer, fh, fse->pad, &format,
+ V4L2_SUBDEV_FORMAT_TRY);
fse->min_width = format.width;
fse->min_height = format.height;
@@ -596,7 +598,8 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd,
format.code = fse->code;
format.width = -1;
format.height = -1;
- resizer_try_format(resizer, fh, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);
+ resizer_try_format(resizer, fh, fse->pad, &format,
+ V4L2_SUBDEV_FORMAT_TRY);
fse->max_width = format.width;
fse->max_height = format.height;
@@ -650,8 +653,9 @@ static int resizer_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
/* Propagate the format from sink to source */
if (fmt->pad == RESIZER_PAD_SINK) {
- format = __resizer_get_format(resizer, fh, RESIZER_PAD_SOURCE_MEM,
- fmt->which);
+ format = __resizer_get_format(resizer, fh,
+ RESIZER_PAD_SOURCE_MEM,
+ fmt->which);
*format = fmt->format;
resizer_try_format(resizer, fh, RESIZER_PAD_SOURCE_MEM, format,
fmt->which);
@@ -660,7 +664,8 @@ static int resizer_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
return 0;
}
-static int resizer_link_validate(struct v4l2_subdev *sd, struct media_link *link,
+static int resizer_link_validate(struct v4l2_subdev *sd,
+ struct media_link *link,
struct v4l2_subdev_format *source_fmt,
struct v4l2_subdev_format *sink_fmt)
{
@@ -684,7 +689,8 @@ static int resizer_link_validate(struct v4l2_subdev *sd, struct media_link *link
* formats are initialized on the file handle. Otherwise active formats are
* initialized on the device.
*/
-static int resizer_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+static int resizer_init_formats(struct v4l2_subdev *sd,
+ struct v4l2_subdev_fh *fh)
{
struct v4l2_subdev_format format;
@@ -833,8 +839,9 @@ static int resizer_init_entities(struct iss_resizer_device *resizer)
return ret;
/* Connect the RESIZER subdev to the video node. */
- ret = media_entity_create_link(&resizer->subdev.entity, RESIZER_PAD_SOURCE_MEM,
- &resizer->video_out.video.entity, 0, 0);
+ ret = media_entity_create_link(&resizer->subdev.entity,
+ RESIZER_PAD_SOURCE_MEM,
+ &resizer->video_out.video.entity, 0, 0);
if (ret < 0)
return ret;
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 3e543d9..0a7137b 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -282,7 +282,8 @@ iss_video_check_format(struct iss_video *video, struct iss_video_fh *vfh)
* Video queue operations
*/
-static int iss_video_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
+static int iss_video_queue_setup(struct vb2_queue *vq,
+ const struct v4l2_format *fmt,
unsigned int *count, unsigned int *num_planes,
unsigned int sizes[], void *alloc_ctxs[])
{
@@ -298,7 +299,7 @@ static int iss_video_queue_setup(struct vb2_queue *vq, const struct v4l2_format
alloc_ctxs[0] = video->alloc_ctx;
- *count = min(*count, (unsigned int)(video->capture_mem / PAGE_ALIGN(sizes[0])));
+ *count = min(*count, video->capture_mem / PAGE_ALIGN(sizes[0]));
return 0;
}
@@ -425,11 +426,13 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
* first, so the input number might lag behind by 1 in some cases.
*/
if (video == pipe->output && !pipe->do_propagation)
- buf->vb.v4l2_buf.sequence = atomic_inc_return(&pipe->frame_number);
+ buf->vb.v4l2_buf.sequence =
+ atomic_inc_return(&pipe->frame_number);
else
buf->vb.v4l2_buf.sequence = atomic_read(&pipe->frame_number);
- vb2_buffer_done(&buf->vb, pipe->error ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
+ vb2_buffer_done(&buf->vb, pipe->error ?
+ VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
pipe->error = false;
spin_lock_irqsave(&video->qlock, flags);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 04/25] v4l: omap4iss: Remove double semicolon at end of line
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (2 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 03/25] v4l: omap4iss: Restrict line lengths to 80 characters where possible Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 05/25] v4l: omap4iss: Define more ISS and ISP IRQ register bits Laurent Pinchart
` (20 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_video.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 0a7137b..7763b8d 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -1039,7 +1039,7 @@ static int iss_video_mmap(struct file *file, struct vm_area_struct *vma)
{
struct iss_video_fh *vfh = to_iss_video_fh(file->private_data);
- return vb2_mmap(&vfh->queue, vma);;
+ return vb2_mmap(&vfh->queue, vma);
}
static struct v4l2_file_operations iss_video_fops = {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 05/25] v4l: omap4iss: Define more ISS and ISP IRQ register bits
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (3 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 04/25] v4l: omap4iss: Remove double semicolon at end of line Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 06/25] v4l: omap4iss: isif: Define more VDINT registers Laurent Pinchart
` (19 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 26 ++++++++++----------
drivers/staging/media/omap4iss/iss_ipipeif.c | 2 +-
drivers/staging/media/omap4iss/iss_regs.h | 36 +++++++++++++++++++++-------
drivers/staging/media/omap4iss/iss_resizer.c | 4 ++--
4 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 53dcb54..815b09b 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -40,9 +40,9 @@ static void iss_print_status(struct iss_device *iss)
ISS_PRINT_REGISTER(iss, HL_REVISION);
ISS_PRINT_REGISTER(iss, HL_SYSCONFIG);
- ISS_PRINT_REGISTER(iss, HL_IRQSTATUS_5);
- ISS_PRINT_REGISTER(iss, HL_IRQENABLE_5_SET);
- ISS_PRINT_REGISTER(iss, HL_IRQENABLE_5_CLR);
+ ISS_PRINT_REGISTER(iss, HL_IRQSTATUS(5));
+ ISS_PRINT_REGISTER(iss, HL_IRQENABLE_SET(5));
+ ISS_PRINT_REGISTER(iss, HL_IRQENABLE_CLR(5));
ISS_PRINT_REGISTER(iss, CTRL);
ISS_PRINT_REGISTER(iss, CLKCTRL);
ISS_PRINT_REGISTER(iss, CLKSTAT);
@@ -75,8 +75,8 @@ static void iss_enable_interrupts(struct iss_device *iss)
static const u32 hl_irq = ISS_HL_IRQ_CSIA | ISS_HL_IRQ_CSIB | ISS_HL_IRQ_ISP(0);
/* Enable HL interrupts */
- writel(hl_irq, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS_5);
- writel(hl_irq, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQENABLE_5_SET);
+ writel(hl_irq, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS(5));
+ writel(hl_irq, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQENABLE_SET(5));
}
@@ -86,7 +86,7 @@ static void iss_enable_interrupts(struct iss_device *iss)
*/
static void iss_disable_interrupts(struct iss_device *iss)
{
- writel(-1, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQENABLE_5_CLR);
+ writel(-1, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQENABLE_CLR(5));
}
/*
@@ -96,10 +96,10 @@ static void iss_disable_interrupts(struct iss_device *iss)
void omap4iss_isp_enable_interrupts(struct iss_device *iss)
{
static const u32 isp_irq = ISP5_IRQ_OCP_ERR |
- ISP5_IRQ_RSZ_FIFO_IN_BLK |
+ ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR |
ISP5_IRQ_RSZ_FIFO_OVF |
ISP5_IRQ_RSZ_INT_DMA |
- ISP5_IRQ_ISIF0;
+ ISP5_IRQ_ISIF_INT(0);
/* Enable ISP interrupts */
writel(isp_irq, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_IRQSTATUS(0));
@@ -256,16 +256,16 @@ static inline void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
*/
static irqreturn_t iss_isr(int irq, void *_iss)
{
- static const u32 ipipeif_events = ISP5_IRQ_IPIPEIF |
- ISP5_IRQ_ISIF0;
- static const u32 resizer_events = ISP5_IRQ_RSZ_FIFO_IN_BLK |
+ static const u32 ipipeif_events = ISP5_IRQ_IPIPEIF_IRQ |
+ ISP5_IRQ_ISIF_INT(0);
+ static const u32 resizer_events = ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR |
ISP5_IRQ_RSZ_FIFO_OVF |
ISP5_IRQ_RSZ_INT_DMA;
struct iss_device *iss = _iss;
u32 irqstatus;
- irqstatus = readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS_5);
- writel(irqstatus, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS_5);
+ irqstatus = readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS(5));
+ writel(irqstatus, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS(5));
if (irqstatus & ISS_HL_IRQ_CSIA)
omap4iss_csi2_isr(&iss->csi2a);
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index eee6891..e96040f 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -274,7 +274,7 @@ void omap4iss_ipipeif_isr(struct iss_ipipeif_device *ipipeif, u32 events)
&ipipeif->stopping))
return;
- if (events & ISP5_IRQ_ISIF0)
+ if (events & ISP5_IRQ_ISIF_INT(0))
ipipeif_isif0_isr(ipipeif);
}
diff --git a/drivers/staging/media/omap4iss/iss_regs.h b/drivers/staging/media/omap4iss/iss_regs.h
index 7327d0c..16975ca 100644
--- a/drivers/staging/media/omap4iss/iss_regs.h
+++ b/drivers/staging/media/omap4iss/iss_regs.h
@@ -24,12 +24,16 @@
#define ISS_HL_SYSCONFIG_IDLEMODE_SMARTIDLE 0x2
#define ISS_HL_SYSCONFIG_SOFTRESET (1 << 0)
-#define ISS_HL_IRQSTATUS_5 (0x24 + (0x10 * 5))
-#define ISS_HL_IRQENABLE_5_SET (0x28 + (0x10 * 5))
-#define ISS_HL_IRQENABLE_5_CLR (0x2C + (0x10 * 5))
+#define ISS_HL_IRQSTATUS_RAW(i) (0x20 + (0x10 * (i)))
+#define ISS_HL_IRQSTATUS(i) (0x24 + (0x10 * (i)))
+#define ISS_HL_IRQENABLE_SET(i) (0x28 + (0x10 * (i)))
+#define ISS_HL_IRQENABLE_CLR(i) (0x2c + (0x10 * (i)))
+#define ISS_HL_IRQ_HS_VS (1 << 17)
+#define ISS_HL_IRQ_SIMCOP(i) (1 << (12 + (i)))
#define ISS_HL_IRQ_BTE (1 << 11)
#define ISS_HL_IRQ_CBUFF (1 << 10)
+#define ISS_HL_IRQ_CCP2(i) (1 << ((i) > 3 ? 16 : 14 + (i)))
#define ISS_HL_IRQ_CSIB (1 << 5)
#define ISS_HL_IRQ_CSIA (1 << 4)
#define ISS_HL_IRQ_ISP(i) (1 << (i))
@@ -267,16 +271,30 @@
/* Bits shared for ISP5_IRQ* registers */
#define ISP5_IRQ_OCP_ERR (1 << 31)
+#define ISP5_IRQ_IPIPE_INT_DPC_RNEW1 (1 << 29)
+#define ISP5_IRQ_IPIPE_INT_DPC_RNEW0 (1 << 28)
+#define ISP5_IRQ_IPIPE_INT_DPC_INIT (1 << 27)
+#define ISP5_IRQ_IPIPE_INT_EOF (1 << 25)
+#define ISP5_IRQ_H3A_INT_EOF (1 << 24)
+#define ISP5_IRQ_RSZ_INT_EOF1 (1 << 23)
#define ISP5_IRQ_RSZ_INT_EOF0 (1 << 22)
-#define ISP5_IRQ_RSZ_FIFO_IN_BLK (1 << 19)
+#define ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR (1 << 19)
#define ISP5_IRQ_RSZ_FIFO_OVF (1 << 18)
+#define ISP5_IRQ_RSZ_INT_CYC_RSZB (1 << 17)
#define ISP5_IRQ_RSZ_INT_CYC_RSZA (1 << 16)
#define ISP5_IRQ_RSZ_INT_DMA (1 << 15)
-#define ISP5_IRQ_IPIPEIF (1 << 9)
-#define ISP5_IRQ_ISIF3 (1 << 3)
-#define ISP5_IRQ_ISIF2 (1 << 2)
-#define ISP5_IRQ_ISIF1 (1 << 1)
-#define ISP5_IRQ_ISIF0 (1 << 0)
+#define ISP5_IRQ_RSZ_INT_LAST_PIX (1 << 14)
+#define ISP5_IRQ_RSZ_INT_REG (1 << 13)
+#define ISP5_IRQ_H3A_INT (1 << 12)
+#define ISP5_IRQ_AF_INT (1 << 11)
+#define ISP5_IRQ_AEW_INT (1 << 10)
+#define ISP5_IRQ_IPIPEIF_IRQ (1 << 9)
+#define ISP5_IRQ_IPIPE_INT_HST (1 << 8)
+#define ISP5_IRQ_IPIPE_INT_BSC (1 << 7)
+#define ISP5_IRQ_IPIPE_INT_DMA (1 << 6)
+#define ISP5_IRQ_IPIPE_INT_LAST_PIX (1 << 5)
+#define ISP5_IRQ_IPIPE_INT_REG (1 << 4)
+#define ISP5_IRQ_ISIF_INT(i) (1 << (i))
#define ISP5_CTRL (0x006C)
#define ISP5_CTRL_MSTANDBY (1 << 24)
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 08b2505..272b92a 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -315,11 +315,11 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
struct iss_pipeline *pipe =
to_iss_pipeline(&resizer->subdev.entity);
- if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK |
+ if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR |
ISP5_IRQ_RSZ_FIFO_OVF)) {
dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n",
(events &
- ISP5_IRQ_RSZ_FIFO_IN_BLK) ? 1 : 0,
+ ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR) ? 1 : 0,
(events &
ISP5_IRQ_RSZ_FIFO_OVF) ? 1 : 0);
pipe->error = true;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 06/25] v4l: omap4iss: isif: Define more VDINT registers
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (4 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 05/25] v4l: omap4iss: Define more ISS and ISP IRQ register bits Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 07/25] v4l: omap4iss: Enhance IRQ debugging Laurent Pinchart
` (18 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_ipipeif.c | 4 ++--
drivers/staging/media/omap4iss/iss_regs.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index e96040f..5464742 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -67,7 +67,7 @@ static void ipipeif_print_status(struct iss_ipipeif_device *ipipeif)
ISIF_PRINT_REGISTER(iss, SPH);
ISIF_PRINT_REGISTER(iss, LNH);
ISIF_PRINT_REGISTER(iss, LNV);
- ISIF_PRINT_REGISTER(iss, VDINT0);
+ ISIF_PRINT_REGISTER(iss, VDINT(0));
ISIF_PRINT_REGISTER(iss, HSIZE);
ISP5_PRINT_REGISTER(iss, SYSCONFIG);
@@ -213,7 +213,7 @@ cont_raw:
/* Generate ISIF0 on the last line of the image */
writel(format->height - 1,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_VDINT0);
+ iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_VDINT(0));
/* IPIPEIF_PAD_SOURCE_ISIF_SF */
format = &ipipeif->formats[IPIPEIF_PAD_SOURCE_ISIF_SF];
diff --git a/drivers/staging/media/omap4iss/iss_regs.h b/drivers/staging/media/omap4iss/iss_regs.h
index 16975ca..d969351 100644
--- a/drivers/staging/media/omap4iss/iss_regs.h
+++ b/drivers/staging/media/omap4iss/iss_regs.h
@@ -363,8 +363,8 @@
#define ISIF_CCOLP_CP3_F0_B (3 << 0)
#define ISIF_CCOLP_CP3_F0_GB (2 << 0)
-#define ISIF_VDINT0 (0x0070)
-#define ISIF_VDINT0_MASK (0x7FFF)
+#define ISIF_VDINT(i) (0x0070 + (i) * 4)
+#define ISIF_VDINT_MASK (0x7fff)
#define ISIF_CGAMMAWD (0x0080)
#define ISIF_CGAMMAWD_GWDI_MASK (0xF << 1)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 07/25] v4l: omap4iss: Enhance IRQ debugging
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (5 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 06/25] v4l: omap4iss: isif: Define more VDINT registers Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 08/25] v4l: omap4iss: Don't make IRQ debugging functions inline Laurent Pinchart
` (17 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Add a pretty print function for ISP IRQs and remove the _INT suffix from
interrupt names to enhance readability.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 121 +++++++++++++++++++++++++----------
1 file changed, 87 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 815b09b..65a1680 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -197,43 +197,44 @@ void omap4iss_configure_bridge(struct iss_device *iss,
writel(isp5ctrl_val, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL);
}
+#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
static inline void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
{
- static const char *name[] = {
- "ISP_IRQ0",
- "ISP_IRQ1",
- "ISP_IRQ2",
- "ISP_IRQ3",
- "CSIA_IRQ",
- "CSIB_IRQ",
- "CCP2_IRQ0",
- "CCP2_IRQ1",
- "CCP2_IRQ2",
- "CCP2_IRQ3",
- "CBUFF_IRQ",
- "BTE_IRQ",
- "SIMCOP_IRQ0",
- "SIMCOP_IRQ1",
- "SIMCOP_IRQ2",
- "SIMCOP_IRQ3",
- "CCP2_IRQ8",
- "HS_VS_IRQ",
- "res18",
- "res19",
- "res20",
- "res21",
- "res22",
- "res23",
- "res24",
- "res25",
- "res26",
- "res27",
- "res28",
- "res29",
- "res30",
- "res31",
+ static const char * const name[] = {
+ "ISP_0",
+ "ISP_1",
+ "ISP_2",
+ "ISP_3",
+ "CSIA",
+ "CSIB",
+ "CCP2_0",
+ "CCP2_1",
+ "CCP2_2",
+ "CCP2_3",
+ "CBUFF",
+ "BTE",
+ "SIMCOP_0",
+ "SIMCOP_1",
+ "SIMCOP_2",
+ "SIMCOP_3",
+ "CCP2_8",
+ "HS_VS",
+ "18",
+ "19",
+ "20",
+ "21",
+ "22",
+ "23",
+ "24",
+ "25",
+ "26",
+ "27",
+ "28",
+ "29",
+ "30",
+ "31",
};
- int i;
+ unsigned int i;
dev_dbg(iss->dev, "ISS IRQ: ");
@@ -244,6 +245,54 @@ static inline void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
pr_cont("\n");
}
+static inline void iss_isp_isr_dbg(struct iss_device *iss, u32 irqstatus)
+{
+ static const char * const name[] = {
+ "ISIF_0",
+ "ISIF_1",
+ "ISIF_2",
+ "ISIF_3",
+ "IPIPEREQ",
+ "IPIPELAST_PIX",
+ "IPIPEDMA",
+ "IPIPEBSC",
+ "IPIPEHST",
+ "IPIPEIF",
+ "AEW",
+ "AF",
+ "H3A",
+ "RSZ_REG",
+ "RSZ_LAST_PIX",
+ "RSZ_DMA",
+ "RSZ_CYC_RZA",
+ "RSZ_CYC_RZB",
+ "RSZ_FIFO_OVF",
+ "RSZ_FIFO_IN_BLK_ERR",
+ "20",
+ "21",
+ "RSZ_EOF0",
+ "RSZ_EOF1",
+ "H3A_EOF",
+ "IPIPE_EOF",
+ "26",
+ "IPIPE_DPC_INI",
+ "IPIPE_DPC_RNEW0",
+ "IPIPE_DPC_RNEW1",
+ "30",
+ "OCP_ERR",
+ };
+ unsigned int i;
+
+ dev_dbg(iss->dev, "ISP IRQ: ");
+
+ for (i = 0; i < ARRAY_SIZE(name); i++) {
+ if ((1 << i) & irqstatus)
+ pr_cont("%s ", name[i]);
+ }
+ pr_cont("\n");
+}
+#endif
+
/*
* iss_isr - Interrupt Service Routine for ISS module.
* @irq: Not used currently.
@@ -290,6 +339,10 @@ static irqreturn_t iss_isr(int irq, void *_iss)
if (isp_irqstatus & resizer_events)
omap4iss_resizer_isr(&iss->resizer,
isp_irqstatus & resizer_events);
+
+#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
+ iss_isp_isr_dbg(iss, isp_irqstatus);
+#endif
}
omap4iss_flush(iss);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 08/25] v4l: omap4iss: Don't make IRQ debugging functions inline
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (6 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 07/25] v4l: omap4iss: Enhance IRQ debugging Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 09/25] v4l: omap4iss: Fix operators precedence in ternary operators Laurent Pinchart
` (16 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Let the compiler decide.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 65a1680..e6528fa 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -198,7 +198,7 @@ void omap4iss_configure_bridge(struct iss_device *iss,
}
#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
-static inline void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
+static void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
{
static const char * const name[] = {
"ISP_0",
@@ -245,7 +245,7 @@ static inline void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
pr_cont("\n");
}
-static inline void iss_isp_isr_dbg(struct iss_device *iss, u32 irqstatus)
+static void iss_isp_isr_dbg(struct iss_device *iss, u32 irqstatus)
{
static const char * const name[] = {
"ISIF_0",
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 09/25] v4l: omap4iss: Fix operators precedence in ternary operators
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (7 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 08/25] v4l: omap4iss: Don't make IRQ debugging functions inline Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 10/25] v4l: omap4iss: isif: Ignore VD0 interrupts when no buffer is available Laurent Pinchart
` (15 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
The ternary operator ? : has a low precedence. Use parenthesis where
needed.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_csi2.c | 20 +++++++-------------
drivers/staging/media/omap4iss/iss_ipipe.c | 2 +-
drivers/staging/media/omap4iss/iss_ipipeif.c | 4 ++--
drivers/staging/media/omap4iss/iss_resizer.c | 12 +++++-------
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index c3a5fca..ac5868ac 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -274,7 +274,7 @@ static void csi2_set_outaddr(struct iss_csi2_device *csi2, u32 addr)
*/
static inline int is_usr_def_mapping(u32 format_id)
{
- return ((format_id & 0xF0) == 0x40) ? 1 : 0;
+ return (format_id & 0xF0) == 0x40 ? 1 : 0;
}
/*
@@ -766,16 +766,11 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2)
CSI2_IRQ_FIFO_OVF)) {
dev_dbg(iss->dev,
"CSI2 Err: OCP:%d SHORT:%d ECC:%d CPXIO:%d OVF:%d\n",
- (csi2_irqstatus &
- CSI2_IRQ_OCP_ERR) ? 1 : 0,
- (csi2_irqstatus &
- CSI2_IRQ_SHORT_PACKET) ? 1 : 0,
- (csi2_irqstatus &
- CSI2_IRQ_ECC_NO_CORRECTION) ? 1 : 0,
- (csi2_irqstatus &
- CSI2_IRQ_COMPLEXIO_ERR) ? 1 : 0,
- (csi2_irqstatus &
- CSI2_IRQ_FIFO_OVF) ? 1 : 0);
+ csi2_irqstatus & CSI2_IRQ_OCP_ERR ? 1 : 0,
+ csi2_irqstatus & CSI2_IRQ_SHORT_PACKET ? 1 : 0,
+ csi2_irqstatus & CSI2_IRQ_ECC_NO_CORRECTION ? 1 : 0,
+ csi2_irqstatus & CSI2_IRQ_COMPLEXIO_ERR ? 1 : 0,
+ csi2_irqstatus & CSI2_IRQ_FIFO_OVF ? 1 : 0);
pipe->error = true;
}
@@ -1209,8 +1204,7 @@ static int csi2_link_setup(struct media_entity *entity,
return -EINVAL;
}
- ctrl->vp_only_enable =
- (csi2->output & CSI2_OUTPUT_MEMORY) ? false : true;
+ ctrl->vp_only_enable = csi2->output & CSI2_OUTPUT_MEMORY ? false : true;
ctrl->vp_clk_enable = !!(csi2->output & CSI2_OUTPUT_IPIPEIF);
return 0;
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c
index fc38a5c5..bdafd78 100644
--- a/drivers/staging/media/omap4iss/iss_ipipe.c
+++ b/drivers/staging/media/omap4iss/iss_ipipe.c
@@ -75,7 +75,7 @@ static void ipipe_enable(struct iss_ipipe_device *ipipe, u8 enable)
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_EN) &
~IPIPE_SRC_EN_EN) |
- enable ? IPIPE_SRC_EN_EN : 0,
+ (enable ? IPIPE_SRC_EN_EN : 0),
iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_EN);
}
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 5464742..3d6cc88 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -85,7 +85,7 @@ static void ipipeif_write_enable(struct iss_ipipeif_device *ipipeif, u8 enable)
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN) &
~ISIF_SYNCEN_DWEN) |
- enable ? ISIF_SYNCEN_DWEN : 0,
+ (enable ? ISIF_SYNCEN_DWEN : 0),
iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN);
}
@@ -100,7 +100,7 @@ static void ipipeif_enable(struct iss_ipipeif_device *ipipeif, u8 enable)
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN) &
~ISIF_SYNCEN_SYEN) |
- enable ? ISIF_SYNCEN_SYEN : 0,
+ (enable ? ISIF_SYNCEN_SYEN : 0),
iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN);
}
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 272b92a..68eb2a7 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -118,13 +118,13 @@ static void resizer_enable(struct iss_resizer_device *resizer, u8 enable)
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_EN) &
~RSZ_SRC_EN_SRC_EN) |
- enable ? RSZ_SRC_EN_SRC_EN : 0,
+ (enable ? RSZ_SRC_EN_SRC_EN : 0),
iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_EN);
/* TODO: Enable RSZB */
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN) &
~RSZ_EN_EN) |
- enable ? RSZ_EN_EN : 0,
+ (enable ? RSZ_EN_EN : 0),
iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN);
}
@@ -202,7 +202,7 @@ static void resizer_configure(struct iss_resizer_device *resizer)
/* Select RSZ input */
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0) &
~RSZ_SRC_FMT0_SEL) |
- (resizer->input == RESIZER_INPUT_IPIPEIF) ? RSZ_SRC_FMT0_SEL : 0,
+ (resizer->input == RESIZER_INPUT_IPIPEIF ? RSZ_SRC_FMT0_SEL : 0),
iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0);
/* RSZ ignores WEN signal from IPIPE/IPIPEIF */
@@ -318,10 +318,8 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR |
ISP5_IRQ_RSZ_FIFO_OVF)) {
dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n",
- (events &
- ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR) ? 1 : 0,
- (events &
- ISP5_IRQ_RSZ_FIFO_OVF) ? 1 : 0);
+ events & ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR ? 1 : 0,
+ events & ISP5_IRQ_RSZ_FIFO_OVF ? 1 : 0);
pipe->error = true;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 10/25] v4l: omap4iss: isif: Ignore VD0 interrupts when no buffer is available
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (8 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 09/25] v4l: omap4iss: Fix operators precedence in ternary operators Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 11/25] v4l: omap4iss: ipipeif: Shift input data according to the input format Laurent Pinchart
` (14 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
The ISIF generates VD0 interrupts even when writes are disabled.
Disabling the ISIF when no buffer is available is thus not be enough, we
need to handle the situation explicitly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_ipipeif.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 3d6cc88..47fb1d6 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -235,6 +235,13 @@ static void ipipeif_isr_buffer(struct iss_ipipeif_device *ipipeif)
{
struct iss_buffer *buffer;
+ /* The ISIF generates VD0 interrupts even when writes are disabled.
+ * deal with it anyway). Disabling the ISIF when no buffer is available
+ * is thus not be enough, we need to handle the situation explicitly.
+ */
+ if (list_empty(&ipipeif->video_out.dmaqueue))
+ return;
+
ipipeif_write_enable(ipipeif, 0);
buffer = omap4iss_video_buffer_next(&ipipeif->video_out);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 11/25] v4l: omap4iss: ipipeif: Shift input data according to the input format
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (9 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 10/25] v4l: omap4iss: isif: Ignore VD0 interrupts when no buffer is available Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 12/25] v4l: omap4iss: csi2: Enable automatic ULP mode transition Laurent Pinchart
` (13 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Input samples must be left-aligned on the ISIF 16-bit data bus.
Configure the 16-to-16-bit selector to shift data according to the input
format.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_ipipeif.c | 4 +++-
drivers/staging/media/omap4iss/iss_regs.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 47fb1d6..2853851 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -129,6 +129,7 @@ static void ipipeif_set_outaddr(struct iss_ipipeif_device *ipipeif, u32 addr)
static void ipipeif_configure(struct iss_ipipeif_device *ipipeif)
{
struct iss_device *iss = to_iss_device(ipipeif);
+ const struct iss_format_info *info;
struct v4l2_mbus_framefmt *format;
u32 isif_ccolp = 0;
@@ -194,9 +195,10 @@ cont_raw:
ISIF_MODESET_INPMOD_RAW | ISIF_MODESET_CCDW_2BIT,
iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET);
+ info = omap4iss_video_format_info(format->code);
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD) &
~ISIF_CGAMMAWD_GWDI_MASK) |
- ISIF_CGAMMAWD_GWDI_BIT11,
+ ISIF_CGAMMAWD_GWDI(info->bpp),
iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD);
/* Set RAW Bayer pattern */
diff --git a/drivers/staging/media/omap4iss/iss_regs.h b/drivers/staging/media/omap4iss/iss_regs.h
index d969351..5995e62 100644
--- a/drivers/staging/media/omap4iss/iss_regs.h
+++ b/drivers/staging/media/omap4iss/iss_regs.h
@@ -368,7 +368,7 @@
#define ISIF_CGAMMAWD (0x0080)
#define ISIF_CGAMMAWD_GWDI_MASK (0xF << 1)
-#define ISIF_CGAMMAWD_GWDI_BIT11 (0x4 << 1)
+#define ISIF_CGAMMAWD_GWDI(bpp) ((16 - (bpp)) << 1)
#define ISIF_CCDCFG (0x0088)
#define ISIF_CCDCFG_Y8POS (1 << 11)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 12/25] v4l: omap4iss: csi2: Enable automatic ULP mode transition
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (10 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 11/25] v4l: omap4iss: ipipeif: Shift input data according to the input format Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 13/25] v4l: omap4iss: Create and use register access functions Laurent Pinchart
` (12 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Automatically switch between ULP and ON states based on ULPM signal from
complex I/O.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_csiphy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index 25e6f89..d5c7cec 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -63,8 +63,8 @@ static int csiphy_set_power(struct iss_csiphy *phy, u32 power)
writel((readl(phy->cfg_regs + CSI2_COMPLEXIO_CFG) &
~CSI2_COMPLEXIO_CFG_PWD_CMD_MASK) |
- power,
- phy->cfg_regs + CSI2_COMPLEXIO_CFG);
+ power | CSI2_COMPLEXIO_CFG_PWR_AUTO,
+ phy->cfg_regs + CSI2_COMPLEXIO_CFG);
retry_count = 0;
do {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 13/25] v4l: omap4iss: Create and use register access functions
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (11 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 12/25] v4l: omap4iss: csi2: Enable automatic ULP mode transition Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 14/25] v4l: omap4iss: csi: " Laurent Pinchart
` (11 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Replace the direct readl/writel calls with helper functions that take an
ISS pointer and compute the register memory address. Also add bit clear,
set and update helpers.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 96 ++++++++--------
drivers/staging/media/omap4iss/iss.h | 80 +++++++++++++
drivers/staging/media/omap4iss/iss_ipipe.c | 53 ++++-----
drivers/staging/media/omap4iss/iss_ipipeif.c | 94 +++++++--------
drivers/staging/media/omap4iss/iss_resizer.c | 166 ++++++++++++---------------
5 files changed, 265 insertions(+), 224 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index e6528fa..ba8460d 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -32,7 +32,7 @@
#define ISS_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###ISS " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_##name))
static void iss_print_status(struct iss_device *iss)
{
@@ -62,8 +62,8 @@ static void iss_print_status(struct iss_device *iss)
*/
void omap4iss_flush(struct iss_device *iss)
{
- writel(0, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_REVISION);
- readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_REVISION);
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_REVISION, 0);
+ iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_HL_REVISION);
}
/*
@@ -75,8 +75,8 @@ static void iss_enable_interrupts(struct iss_device *iss)
static const u32 hl_irq = ISS_HL_IRQ_CSIA | ISS_HL_IRQ_CSIB | ISS_HL_IRQ_ISP(0);
/* Enable HL interrupts */
- writel(hl_irq, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS(5));
- writel(hl_irq, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQENABLE_SET(5));
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQSTATUS(5), hl_irq);
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQENABLE_SET(5), hl_irq);
}
@@ -86,7 +86,7 @@ static void iss_enable_interrupts(struct iss_device *iss)
*/
static void iss_disable_interrupts(struct iss_device *iss)
{
- writel(-1, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQENABLE_CLR(5));
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQENABLE_CLR(5), -1);
}
/*
@@ -102,8 +102,9 @@ void omap4iss_isp_enable_interrupts(struct iss_device *iss)
ISP5_IRQ_ISIF_INT(0);
/* Enable ISP interrupts */
- writel(isp_irq, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_IRQSTATUS(0));
- writel(isp_irq, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_IRQENABLE_SET(0));
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQSTATUS(0), isp_irq);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQENABLE_SET(0),
+ isp_irq);
}
/*
@@ -112,7 +113,7 @@ void omap4iss_isp_enable_interrupts(struct iss_device *iss)
*/
void omap4iss_isp_disable_interrupts(struct iss_device *iss)
{
- writel(-1, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_IRQENABLE_CLR(0));
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQENABLE_CLR(0), -1);
}
int omap4iss_get_external_info(struct iss_pipeline *pipe,
@@ -169,11 +170,11 @@ void omap4iss_configure_bridge(struct iss_device *iss,
u32 issctrl_val;
u32 isp5ctrl_val;
- issctrl_val = readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_CTRL);
+ issctrl_val = iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_CTRL);
issctrl_val &= ~ISS_CTRL_INPUT_SEL_MASK;
issctrl_val &= ~ISS_CTRL_CLK_DIV_MASK;
- isp5ctrl_val = readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL);
+ isp5ctrl_val = iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL);
switch (input) {
case IPIPEIF_INPUT_CSI2A:
@@ -193,8 +194,8 @@ void omap4iss_configure_bridge(struct iss_device *iss,
isp5ctrl_val |= ISP5_CTRL_VD_PULSE_EXT | ISP5_CTRL_PSYNC_CLK_SEL |
ISP5_CTRL_SYNC_ENABLE;
- writel(issctrl_val, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_CTRL);
- writel(isp5ctrl_val, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL);
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_CTRL, issctrl_val);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL, isp5ctrl_val);
}
#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
@@ -313,8 +314,8 @@ static irqreturn_t iss_isr(int irq, void *_iss)
struct iss_device *iss = _iss;
u32 irqstatus;
- irqstatus = readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS(5));
- writel(irqstatus, iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_IRQSTATUS(5));
+ irqstatus = iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQSTATUS(5));
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQSTATUS(5), irqstatus);
if (irqstatus & ISS_HL_IRQ_CSIA)
omap4iss_csi2_isr(&iss->csi2a);
@@ -323,10 +324,10 @@ static irqreturn_t iss_isr(int irq, void *_iss)
omap4iss_csi2_isr(&iss->csi2b);
if (irqstatus & ISS_HL_IRQ_ISP(0)) {
- u32 isp_irqstatus = readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] +
- ISP5_IRQSTATUS(0));
- writel(isp_irqstatus, iss->regs[OMAP4_ISS_MEM_ISP_SYS1] +
- ISP5_IRQSTATUS(0));
+ u32 isp_irqstatus = iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1,
+ ISP5_IRQSTATUS(0));
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQSTATUS(0),
+ isp_irqstatus);
if (isp_irqstatus & ISP5_IRQ_OCP_ERR)
dev_dbg(iss->dev, "ISP5 OCP Error!\n");
@@ -689,12 +690,11 @@ static int iss_reset(struct iss_device *iss)
{
unsigned long timeout = 0;
- writel(readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_SYSCONFIG) |
- ISS_HL_SYSCONFIG_SOFTRESET,
- iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_SYSCONFIG);
+ iss_reg_set(iss, OMAP4_ISS_MEM_TOP, ISS_HL_SYSCONFIG,
+ ISS_HL_SYSCONFIG_SOFTRESET);
- while (readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_SYSCONFIG) &
- ISS_HL_SYSCONFIG_SOFTRESET) {
+ while (iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_HL_SYSCONFIG) &
+ ISS_HL_SYSCONFIG_SOFTRESET) {
if (timeout++ > 100) {
dev_alert(iss->dev, "cannot reset ISS\n");
return -ETIMEDOUT;
@@ -710,18 +710,15 @@ static int iss_isp_reset(struct iss_device *iss)
unsigned long timeout = 0;
/* Fist, ensure that the ISP is IDLE (no transactions happening) */
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_SYSCONFIG) &
- ~ISP5_SYSCONFIG_STANDBYMODE_MASK) |
- ISP5_SYSCONFIG_STANDBYMODE_SMART,
- iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_SYSCONFIG);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG,
+ ISP5_SYSCONFIG_STANDBYMODE_MASK,
+ ISP5_SYSCONFIG_STANDBYMODE_SMART);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL) |
- ISP5_CTRL_MSTANDBY,
- iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL);
+ iss_reg_set(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL, ISP5_CTRL_MSTANDBY);
for (;;) {
- if (readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL) &
- ISP5_CTRL_MSTANDBY_WAIT)
+ if (iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL) &
+ ISP5_CTRL_MSTANDBY_WAIT)
break;
if (timeout++ > 1000) {
dev_alert(iss->dev, "cannot set ISP5 to standby\n");
@@ -731,13 +728,12 @@ static int iss_isp_reset(struct iss_device *iss)
}
/* Now finally, do the reset */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_SYSCONFIG) |
- ISP5_SYSCONFIG_SOFTRESET,
- iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_SYSCONFIG);
+ iss_reg_set(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG,
+ ISP5_SYSCONFIG_SOFTRESET);
timeout = 0;
- while (readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_SYSCONFIG) &
- ISP5_SYSCONFIG_SOFTRESET) {
+ while (iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG) &
+ ISP5_SYSCONFIG_SOFTRESET) {
if (timeout++ > 1000) {
dev_alert(iss->dev, "cannot reset ISP5\n");
return -ETIMEDOUT;
@@ -848,15 +844,14 @@ static int __iss_subclk_update(struct iss_device *iss)
if (iss->subclk_resources & OMAP4_ISS_SUBCLK_ISP)
clk |= ISS_CLKCTRL_ISP;
- writel((readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_CLKCTRL) &
- ~ISS_CLKCTRL_MASK) | clk,
- iss->regs[OMAP4_ISS_MEM_TOP] + ISS_CLKCTRL);
+ iss_reg_update(iss, OMAP4_ISS_MEM_TOP, ISS_CLKCTRL,
+ ISS_CLKCTRL_MASK, clk);
/* Wait for HW assertion */
while (--timeout > 0) {
udelay(1);
- if ((readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_CLKSTAT) &
- ISS_CLKCTRL_MASK) == clk)
+ if ((iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_CLKSTAT) &
+ ISS_CLKCTRL_MASK) == clk)
break;
}
@@ -911,9 +906,8 @@ static void __iss_isp_subclk_update(struct iss_device *iss)
if (clk)
clk |= ISP5_CTRL_BL_CLK_ENABLE;
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL) &
- ~ISS_ISP5_CLKCTRL_MASK) | clk,
- iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL,
+ ISS_ISP5_CLKCTRL_MASK, clk);
}
void omap4iss_isp_subclk_enable(struct iss_device *iss,
@@ -1380,7 +1374,7 @@ static int iss_probe(struct platform_device *pdev)
if (ret < 0)
goto error_iss;
- iss->revision = readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_REVISION);
+ iss->revision = iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_HL_REVISION);
dev_info(iss->dev, "Revision %08x found\n", iss->revision);
for (i = 1; i < OMAP4_ISS_MEM_LAST; i++) {
@@ -1390,9 +1384,9 @@ static int iss_probe(struct platform_device *pdev)
}
/* Configure BTE BW_LIMITER field to max recommended value (1 GB) */
- writel((readl(iss->regs[OMAP4_ISS_MEM_BTE] + BTE_CTRL) & ~BTE_CTRL_BW_LIMITER_MASK) |
- (18 << BTE_CTRL_BW_LIMITER_SHIFT),
- iss->regs[OMAP4_ISS_MEM_BTE] + BTE_CTRL);
+ iss_reg_update(iss, OMAP4_ISS_MEM_BTE, BTE_CTRL,
+ BTE_CTRL_BW_LIMITER_MASK,
+ 18 << BTE_CTRL_BW_LIMITER_SHIFT);
/* Perform ISP reset */
ret = omap4iss_subclk_enable(iss, OMAP4_ISS_SUBCLK_ISP);
@@ -1404,7 +1398,7 @@ static int iss_probe(struct platform_device *pdev)
goto error_iss;
dev_info(iss->dev, "ISP Revision %08x found\n",
- readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_REVISION));
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_REVISION));
/* Interrupt */
iss->irq_num = platform_get_irq(pdev, 0);
diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index f33664d..660809e 100644
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -150,4 +150,84 @@ int omap4iss_register_entities(struct platform_device *pdev,
struct v4l2_device *v4l2_dev);
void omap4iss_unregister_entities(struct platform_device *pdev);
+/*
+ * iss_reg_read - Read the value of an OMAP4 ISS register
+ * @iss: the ISS device
+ * @res: memory resource in which the register is located
+ * @offset: register offset in the memory resource
+ *
+ * Return the register value.
+ */
+static inline
+u32 iss_reg_read(struct iss_device *iss, enum iss_mem_resources res,
+ u32 offset)
+{
+ return readl(iss->regs[res] + offset);
+}
+
+/*
+ * iss_reg_write - Write a value to an OMAP4 ISS register
+ * @iss: the ISS device
+ * @res: memory resource in which the register is located
+ * @offset: register offset in the memory resource
+ * @value: value to be written
+ */
+static inline
+void iss_reg_write(struct iss_device *iss, enum iss_mem_resources res,
+ u32 offset, u32 value)
+{
+ writel(value, iss->regs[res] + offset);
+}
+
+/*
+ * iss_reg_clr - Clear bits in an OMAP4 ISS register
+ * @iss: the ISS device
+ * @res: memory resource in which the register is located
+ * @offset: register offset in the memory resource
+ * @clr: bit mask to be cleared
+ */
+static inline
+void iss_reg_clr(struct iss_device *iss, enum iss_mem_resources res,
+ u32 offset, u32 clr)
+{
+ u32 v = iss_reg_read(iss, res, offset);
+
+ iss_reg_write(iss, res, offset, v & ~clr);
+}
+
+/*
+ * iss_reg_set - Set bits in an OMAP4 ISS register
+ * @iss: the ISS device
+ * @res: memory resource in which the register is located
+ * @offset: register offset in the memory resource
+ * @set: bit mask to be set
+ */
+static inline
+void iss_reg_set(struct iss_device *iss, enum iss_mem_resources res,
+ u32 offset, u32 set)
+{
+ u32 v = iss_reg_read(iss, res, offset);
+
+ iss_reg_write(iss, res, offset, v | set);
+}
+
+/*
+ * iss_reg_update - Clear and set bits in an OMAP4 ISS register
+ * @iss: the ISS device
+ * @res: memory resource in which the register is located
+ * @offset: register offset in the memory resource
+ * @clr: bit mask to be cleared
+ * @set: bit mask to be set
+ *
+ * Clear the clr mask first and then set the set mask.
+ */
+static inline
+void iss_reg_update(struct iss_device *iss, enum iss_mem_resources res,
+ u32 offset, u32 clr, u32 set)
+{
+ u32 v = iss_reg_read(iss, res, offset);
+
+ iss_reg_write(iss, res, offset, (v & ~clr) | set);
+}
+
#endif /* _OMAP4_ISS_H_ */
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c
index bdafd78..d0b9f8c 100644
--- a/drivers/staging/media/omap4iss/iss_ipipe.c
+++ b/drivers/staging/media/omap4iss/iss_ipipe.c
@@ -42,7 +42,7 @@ static const unsigned int ipipe_fmts[] = {
*/
#define IPIPE_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_##name))
static void ipipe_print_status(struct iss_ipipe_device *ipipe)
{
@@ -73,10 +73,8 @@ static void ipipe_enable(struct iss_ipipe_device *ipipe, u8 enable)
{
struct iss_device *iss = to_iss_device(ipipe);
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_EN) &
- ~IPIPE_SRC_EN_EN) |
- (enable ? IPIPE_SRC_EN_EN : 0),
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_EN);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_EN,
+ IPIPE_SRC_EN_EN, enable ? IPIPE_SRC_EN_EN : 0);
}
/* -----------------------------------------------------------------------------
@@ -92,31 +90,28 @@ static void ipipe_configure(struct iss_ipipe_device *ipipe)
format = &ipipe->formats[IPIPE_PAD_SINK];
/* NOTE: Currently just supporting pipeline IN: RGB, OUT: YUV422 */
- writel(IPIPE_SRC_FMT_RAW2YUV,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_FMT);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_FMT,
+ IPIPE_SRC_FMT_RAW2YUV);
/* Enable YUV444 -> YUV422 conversion */
- writel(IPIPE_YUV_PHS_LPF,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_YUV_PHS);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_YUV_PHS,
+ IPIPE_YUV_PHS_LPF);
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_VPS);
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_HPS);
- writel((format->height - 2) & IPIPE_SRC_VSZ_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_VSZ);
- writel((format->width - 1) & IPIPE_SRC_HSZ_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_HSZ);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_VPS, 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_HPS, 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_VSZ,
+ (format->height - 2) & IPIPE_SRC_VSZ_MASK);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_HSZ,
+ (format->width - 1) & IPIPE_SRC_HSZ_MASK);
/* Ignore ipipeif_wrt signal, and operate on-the-fly. */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_MODE) &
- ~(IPIPE_SRC_MODE_WRT | IPIPE_SRC_MODE_OST),
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_MODE);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_MODE,
+ IPIPE_SRC_MODE_WRT | IPIPE_SRC_MODE_OST);
/* HACK: Values tuned for Ducati SW (OV) */
- writel(IPIPE_SRC_COL_EE_B |
- IPIPE_SRC_COL_EO_GB |
- IPIPE_SRC_COL_OE_GR |
- IPIPE_SRC_COL_OO_R,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_SRC_COL);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_SRC_COL,
+ IPIPE_SRC_COL_EE_B | IPIPE_SRC_COL_EO_GB |
+ IPIPE_SRC_COL_OE_GR | IPIPE_SRC_COL_OO_R);
/* IPIPE_PAD_SOURCE_VP */
format = &ipipe->formats[IPIPE_PAD_SOURCE_VP];
@@ -147,15 +142,13 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable)
omap4iss_isp_subclk_enable(iss, OMAP4_ISS_ISP_SUBCLK_IPIPE);
/* Enable clk_arm_g0 */
- writel(IPIPE_GCK_MMR_REG,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_GCK_MMR);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_GCK_MMR,
+ IPIPE_GCK_MMR_REG);
/* Enable clk_pix_g[3:0] */
- writel(IPIPE_GCK_PIX_G3 |
- IPIPE_GCK_PIX_G2 |
- IPIPE_GCK_PIX_G1 |
- IPIPE_GCK_PIX_G0,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPE] + IPIPE_GCK_PIX);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_GCK_PIX,
+ IPIPE_GCK_PIX_G3 | IPIPE_GCK_PIX_G2 |
+ IPIPE_GCK_PIX_G1 | IPIPE_GCK_PIX_G0);
}
switch (enable) {
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 2853851..2d11f62 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -40,15 +40,15 @@ static const unsigned int ipipeif_fmts[] = {
*/
#define IPIPEIF_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###IPIPEIF " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_IPIPEIF, IPIPEIF_##name))
#define ISIF_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###ISIF " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_##name))
#define ISP5_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###ISP5 " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_##name))
static void ipipeif_print_status(struct iss_ipipeif_device *ipipeif)
{
@@ -83,10 +83,8 @@ static void ipipeif_write_enable(struct iss_ipipeif_device *ipipeif, u8 enable)
{
struct iss_device *iss = to_iss_device(ipipeif);
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN) &
- ~ISIF_SYNCEN_DWEN) |
- (enable ? ISIF_SYNCEN_DWEN : 0),
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_SYNCEN,
+ ISIF_SYNCEN_DWEN, enable ? ISIF_SYNCEN_DWEN : 0);
}
/*
@@ -98,10 +96,8 @@ static void ipipeif_enable(struct iss_ipipeif_device *ipipeif, u8 enable)
{
struct iss_device *iss = to_iss_device(ipipeif);
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN) &
- ~ISIF_SYNCEN_SYEN) |
- (enable ? ISIF_SYNCEN_SYEN : 0),
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SYNCEN);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_SYNCEN,
+ ISIF_SYNCEN_SYEN, enable ? ISIF_SYNCEN_SYEN : 0);
}
/* -----------------------------------------------------------------------------
@@ -120,10 +116,10 @@ static void ipipeif_set_outaddr(struct iss_ipipeif_device *ipipeif, u32 addr)
struct iss_device *iss = to_iss_device(ipipeif);
/* Save address splitted in Base Address H & L */
- writel((addr >> (16 + 5)) & ISIF_CADU_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CADU);
- writel((addr >> 5) & ISIF_CADL_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CADL);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_CADU,
+ (addr >> (16 + 5)) & ISIF_CADU_MASK);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_CADL,
+ (addr >> 5) & ISIF_CADL_MASK);
}
static void ipipeif_configure(struct iss_ipipeif_device *ipipeif)
@@ -139,25 +135,20 @@ static void ipipeif_configure(struct iss_ipipeif_device *ipipeif)
format = &ipipeif->formats[IPIPEIF_PAD_SINK];
/* IPIPEIF with YUV422 input from ISIF */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_CFG1) &
- ~(IPIPEIF_CFG1_INPSRC1_MASK | IPIPEIF_CFG1_INPSRC2_MASK),
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_CFG1);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_IPIPEIF, IPIPEIF_CFG1,
+ IPIPEIF_CFG1_INPSRC1_MASK | IPIPEIF_CFG1_INPSRC2_MASK);
/* Select ISIF/IPIPEIF input format */
switch (format->code) {
case V4L2_MBUS_FMT_UYVY8_1X16:
case V4L2_MBUS_FMT_YUYV8_1X16:
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET) &
- ~(ISIF_MODESET_CCDMD |
- ISIF_MODESET_INPMOD_MASK |
- ISIF_MODESET_CCDW_MASK)) |
- ISIF_MODESET_INPMOD_YCBCR16,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET);
-
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_CFG2) &
- ~IPIPEIF_CFG2_YUV8) |
- IPIPEIF_CFG2_YUV16,
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_CFG2);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_MODESET,
+ ISIF_MODESET_CCDMD | ISIF_MODESET_INPMOD_MASK |
+ ISIF_MODESET_CCDW_MASK,
+ ISIF_MODESET_INPMOD_YCBCR16);
+
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_IPIPEIF, IPIPEIF_CFG2,
+ IPIPEIF_CFG2_YUV8, IPIPEIF_CFG2_YUV16);
break;
case V4L2_MBUS_FMT_SGRBG10_1X10:
@@ -184,44 +175,41 @@ static void ipipeif_configure(struct iss_ipipeif_device *ipipeif)
ISIF_CCOLP_CP2_F0_R |
ISIF_CCOLP_CP3_F0_GR;
cont_raw:
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_CFG2) &
- ~IPIPEIF_CFG2_YUV16),
- iss->regs[OMAP4_ISS_MEM_ISP_IPIPEIF] + IPIPEIF_CFG2);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_IPIPEIF, IPIPEIF_CFG2,
+ IPIPEIF_CFG2_YUV16);
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET) &
- ~(ISIF_MODESET_CCDMD |
- ISIF_MODESET_INPMOD_MASK |
- ISIF_MODESET_CCDW_MASK)) |
- ISIF_MODESET_INPMOD_RAW | ISIF_MODESET_CCDW_2BIT,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_MODESET,
+ ISIF_MODESET_CCDMD | ISIF_MODESET_INPMOD_MASK |
+ ISIF_MODESET_CCDW_MASK, ISIF_MODESET_INPMOD_RAW |
+ ISIF_MODESET_CCDW_2BIT);
info = omap4iss_video_format_info(format->code);
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD) &
- ~ISIF_CGAMMAWD_GWDI_MASK) |
- ISIF_CGAMMAWD_GWDI(info->bpp),
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_CGAMMAWD,
+ ISIF_CGAMMAWD_GWDI_MASK,
+ ISIF_CGAMMAWD_GWDI(info->bpp));
/* Set RAW Bayer pattern */
- writel(isif_ccolp,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CCOLP);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_CCOLP,
+ isif_ccolp);
break;
}
- writel(0 & ISIF_SPH_MASK, iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_SPH);
- writel((format->width - 1) & ISIF_LNH_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_LNH);
- writel((format->height - 1) & ISIF_LNV_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_LNV);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_SPH, 0 & ISIF_SPH_MASK);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_LNH,
+ (format->width - 1) & ISIF_LNH_MASK);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_LNV,
+ (format->height - 1) & ISIF_LNV_MASK);
/* Generate ISIF0 on the last line of the image */
- writel(format->height - 1,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_VDINT(0));
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_VDINT(0),
+ format->height - 1);
/* IPIPEIF_PAD_SOURCE_ISIF_SF */
format = &ipipeif->formats[IPIPEIF_PAD_SOURCE_ISIF_SF];
- writel((ipipeif->video_out.bpl_value >> 5) & ISIF_HSIZE_HSIZE_MASK,
- iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_HSIZE);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_ISIF, ISIF_HSIZE,
+ (ipipeif->video_out.bpl_value >> 5) &
+ ISIF_HSIZE_HSIZE_MASK);
/* IPIPEIF_PAD_SOURCE_VP */
/* Do nothing? */
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 68eb2a7..793325c 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -36,11 +36,11 @@ static const unsigned int resizer_fmts[] = {
*/
#define RSZ_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###RSZ " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_##name))
#define RZA_PRINT_REGISTER(iss, name)\
dev_dbg(iss->dev, "###RZA " #name "=0x%08x\n", \
- readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_##name))
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_##name))
static void resizer_print_status(struct iss_resizer_device *resizer)
{
@@ -116,16 +116,12 @@ static void resizer_enable(struct iss_resizer_device *resizer, u8 enable)
{
struct iss_device *iss = to_iss_device(resizer);
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_EN) &
- ~RSZ_SRC_EN_SRC_EN) |
- (enable ? RSZ_SRC_EN_SRC_EN : 0),
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_EN);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_EN,
+ RSZ_SRC_EN_SRC_EN, enable ? RSZ_SRC_EN_SRC_EN : 0);
/* TODO: Enable RSZB */
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN) &
- ~RSZ_EN_EN) |
- (enable ? RSZ_EN_EN : 0),
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_EN, RSZ_EN_EN,
+ enable ? RSZ_EN_EN : 0);
}
/* -----------------------------------------------------------------------------
@@ -148,16 +144,16 @@ static void resizer_set_outaddr(struct iss_resizer_device *resizer, u32 addr)
outformat = &resizer->formats[RESIZER_PAD_SOURCE_MEM];
/* Save address splitted in Base Address H & L */
- writel((addr >> 16) & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_BAD_H);
- writel(addr & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_BAD_L);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_BAD_H,
+ (addr >> 16) & 0xffff);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_BAD_L,
+ addr & 0xffff);
/* SAD = BAD */
- writel((addr >> 16) & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_SAD_H);
- writel(addr & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_SAD_L);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_SAD_H,
+ (addr >> 16) & 0xffff);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_SAD_L,
+ addr & 0xffff);
/* Program UV buffer address... Hardcoded to be contiguous! */
if ((informat->code == V4L2_MBUS_FMT_UYVY8_1X16) &&
@@ -173,16 +169,16 @@ static void resizer_set_outaddr(struct iss_resizer_device *resizer, u32 addr)
}
/* Save address splitted in Base Address H & L */
- writel((c_addr >> 16) & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_BAD_H);
- writel(c_addr & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_BAD_L);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_BAD_H,
+ (c_addr >> 16) & 0xffff);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_BAD_L,
+ c_addr & 0xffff);
/* SAD = BAD */
- writel((c_addr >> 16) & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_SAD_H);
- writel(c_addr & 0xffff,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_SAD_L);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_SAD_H,
+ (c_addr >> 16) & 0xffff);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_SAD_L,
+ c_addr & 0xffff);
}
}
@@ -195,70 +191,70 @@ static void resizer_configure(struct iss_resizer_device *resizer)
outformat = &resizer->formats[RESIZER_PAD_SOURCE_MEM];
/* Make sure we don't bypass the resizer */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0) &
- ~RSZ_SRC_FMT0_BYPASS,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_FMT0,
+ RSZ_SRC_FMT0_BYPASS);
/* Select RSZ input */
- writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0) &
- ~RSZ_SRC_FMT0_SEL) |
- (resizer->input == RESIZER_INPUT_IPIPEIF ? RSZ_SRC_FMT0_SEL : 0),
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0);
+ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_FMT0,
+ RSZ_SRC_FMT0_SEL,
+ resizer->input == RESIZER_INPUT_IPIPEIF ?
+ RSZ_SRC_FMT0_SEL : 0);
/* RSZ ignores WEN signal from IPIPE/IPIPEIF */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_MODE) &
- ~RSZ_SRC_MODE_WRT,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_MODE);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_MODE,
+ RSZ_SRC_MODE_WRT);
/* Set Resizer in free-running mode */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_MODE) &
- ~RSZ_SRC_MODE_OST,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_MODE);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_MODE,
+ RSZ_SRC_MODE_OST);
/* Init Resizer A */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_MODE) &
- ~RZA_MODE_ONE_SHOT,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_MODE);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_MODE,
+ RZA_MODE_ONE_SHOT);
/* Set size related things now */
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_VPS);
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_HPS);
- writel(informat->height - 2, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_VSZ);
- writel(informat->width - 1, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_HSZ);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_VPS, 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_HPS, 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_VSZ,
+ informat->height - 2);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_HSZ,
+ informat->width - 1);
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_I_VPS);
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_I_HPS);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_I_VPS, 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_I_HPS, 0);
- writel(outformat->height - 2, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_O_VSZ);
- writel(outformat->width - 1, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_O_HSZ);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_O_VSZ,
+ outformat->height - 2);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_O_HSZ,
+ outformat->width - 1);
- writel(0x100, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_V_DIF);
- writel(0x100, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_H_DIF);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_V_DIF, 0x100);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_H_DIF, 0x100);
/* Buffer output settings */
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_PTR_S);
- writel(outformat->height - 1,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_PTR_E);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_PTR_S, 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_PTR_E,
+ outformat->height - 1);
- writel(resizer->video_out.bpl_value,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_Y_OFT);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_Y_OFT,
+ resizer->video_out.bpl_value);
/* UYVY -> NV12 conversion */
if ((informat->code == V4L2_MBUS_FMT_UYVY8_1X16) &&
(outformat->code == V4L2_MBUS_FMT_YUYV8_1_5X8)) {
- writel(RSZ_420_CEN | RSZ_420_YEN,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_420);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_420,
+ RSZ_420_CEN | RSZ_420_YEN);
/* UV Buffer output settings */
- writel(0, iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_PTR_S);
- writel(outformat->height - 1,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_PTR_E);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_PTR_S,
+ 0);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_PTR_E,
+ outformat->height - 1);
- writel(resizer->video_out.bpl_value,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_SDR_C_OFT);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_SDR_C_OFT,
+ resizer->video_out.bpl_value);
} else {
- writel(0,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_420);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_420, 0);
}
omap4iss_isp_enable_interrupts(iss);
@@ -273,9 +269,7 @@ static void resizer_isr_buffer(struct iss_resizer_device *resizer)
struct iss_device *iss = to_iss_device(resizer);
struct iss_buffer *buffer;
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN) &
- ~RSZ_EN_EN,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_EN, RSZ_EN_EN);
buffer = omap4iss_video_buffer_next(&resizer->video_out);
if (buffer == NULL)
@@ -283,9 +277,7 @@ static void resizer_isr_buffer(struct iss_resizer_device *resizer)
resizer_set_outaddr(resizer, buffer->iss_addr);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN) |
- RSZ_EN_EN,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN);
+ iss_reg_set(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_EN, RSZ_EN_EN);
}
/*
@@ -386,17 +378,14 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable)
omap4iss_isp_subclk_enable(iss, OMAP4_ISS_ISP_SUBCLK_RSZ);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_MMR) |
- RSZ_GCK_MMR_MMR,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_MMR);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_SDR) |
- RSZ_GCK_SDR_CORE,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_SDR);
+ iss_reg_set(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_GCK_MMR,
+ RSZ_GCK_MMR_MMR);
+ iss_reg_set(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_GCK_SDR,
+ RSZ_GCK_SDR_CORE);
/* FIXME: Enable RSZB also */
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SYSCONFIG) |
- RSZ_SYSCONFIG_RSZA_CLK_EN,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SYSCONFIG);
+ iss_reg_set(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SYSCONFIG,
+ RSZ_SYSCONFIG_RSZA_CLK_EN);
}
switch (enable) {
@@ -430,15 +419,12 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable)
resizer_enable(resizer, 0);
omap4iss_isp_disable_interrupts(iss);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SYSCONFIG) &
- ~RSZ_SYSCONFIG_RSZA_CLK_EN,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SYSCONFIG);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_SDR) &
- ~RSZ_GCK_SDR_CORE,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_SDR);
- writel(readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_MMR) &
- ~RSZ_GCK_MMR_MMR,
- iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_GCK_MMR);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SYSCONFIG,
+ RSZ_SYSCONFIG_RSZA_CLK_EN);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_GCK_SDR,
+ RSZ_GCK_SDR_CORE);
+ iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_GCK_MMR,
+ RSZ_GCK_MMR_MMR);
omap4iss_isp_subclk_disable(iss, OMAP4_ISS_ISP_SUBCLK_RSZ);
iss_video_dmaqueue_flags_clr(video_out);
break;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 14/25] v4l: omap4iss: csi: Create and use register access functions
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (12 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 13/25] v4l: omap4iss: Create and use register access functions Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 15/25] v4l: omap4iss: resizer: Stop the whole resizer to avoid FIFO overflows Laurent Pinchart
` (10 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Replace the direct readl/writel calls with helper functions.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_csi2.c | 122 +++++++++++++---------------
drivers/staging/media/omap4iss/iss_csi2.h | 6 +-
drivers/staging/media/omap4iss/iss_csiphy.c | 27 +++---
drivers/staging/media/omap4iss/iss_csiphy.h | 6 +-
4 files changed, 76 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index ac5868ac..f8d6472 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -29,9 +29,8 @@ static void csi2_if_enable(struct iss_csi2_device *csi2, u8 enable)
{
struct iss_csi2_ctrl_cfg *currctrl = &csi2->ctrl;
- writel((readl(csi2->regs1 + CSI2_CTRL) & ~CSI2_CTRL_IF_EN) |
- (enable ? CSI2_CTRL_IF_EN : 0),
- csi2->regs1 + CSI2_CTRL);
+ iss_reg_update(csi2->iss, csi2->regs1, CSI2_CTRL, CSI2_CTRL_IF_EN,
+ enable ? CSI2_CTRL_IF_EN : 0);
currctrl->if_enable = enable;
}
@@ -90,7 +89,7 @@ static void csi2_recv_config(struct iss_csi2_device *csi2,
*/
reg |= CSI2_CTRL_ENDIANNESS;
- writel(reg, csi2->regs1 + CSI2_CTRL);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTRL, reg);
}
static const unsigned int csi2_input_fmts[] = {
@@ -260,10 +259,10 @@ static void csi2_set_outaddr(struct iss_csi2_device *csi2, u32 addr)
ctx->ping_addr = addr;
ctx->pong_addr = addr;
- writel(ctx->ping_addr,
- csi2->regs1 + CSI2_CTX_PING_ADDR(ctx->ctxnum));
- writel(ctx->pong_addr,
- csi2->regs1 + CSI2_CTX_PONG_ADDR(ctx->ctxnum));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_PING_ADDR(ctx->ctxnum),
+ ctx->ping_addr);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_PONG_ADDR(ctx->ctxnum),
+ ctx->pong_addr);
}
/*
@@ -288,7 +287,7 @@ static void csi2_ctx_enable(struct iss_csi2_device *csi2, u8 ctxnum, u8 enable)
struct iss_csi2_ctx_cfg *ctx = &csi2->contexts[ctxnum];
u32 reg;
- reg = readl(csi2->regs1 + CSI2_CTX_CTRL1(ctxnum));
+ reg = iss_reg_read(csi2->iss, csi2->regs1, CSI2_CTX_CTRL1(ctxnum));
if (enable) {
unsigned int skip = 0;
@@ -306,7 +305,7 @@ static void csi2_ctx_enable(struct iss_csi2_device *csi2, u8 ctxnum, u8 enable)
reg &= ~CSI2_CTX_CTRL1_CTX_EN;
}
- writel(reg, csi2->regs1 + CSI2_CTX_CTRL1(ctxnum));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_CTRL1(ctxnum), reg);
ctx->enabled = enable;
}
@@ -330,7 +329,7 @@ static void csi2_ctx_config(struct iss_csi2_device *csi2,
if (ctx->checksum_enabled)
reg |= CSI2_CTX_CTRL1_CS_EN;
- writel(reg, csi2->regs1 + CSI2_CTX_CTRL1(ctx->ctxnum));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_CTRL1(ctx->ctxnum), reg);
/* Set up CSI2_CTx_CTRL2 */
reg = ctx->virtual_id << CSI2_CTX_CTRL2_VIRTUAL_ID_SHIFT;
@@ -342,23 +341,20 @@ static void csi2_ctx_config(struct iss_csi2_device *csi2,
if (is_usr_def_mapping(ctx->format_id))
reg |= 2 << CSI2_CTX_CTRL2_USER_DEF_MAP_SHIFT;
- writel(reg, csi2->regs1 + CSI2_CTX_CTRL2(ctx->ctxnum));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_CTRL2(ctx->ctxnum), reg);
/* Set up CSI2_CTx_CTRL3 */
- writel(ctx->alpha << CSI2_CTX_CTRL3_ALPHA_SHIFT,
- csi2->regs1 + CSI2_CTX_CTRL3(ctx->ctxnum));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_CTRL3(ctx->ctxnum),
+ ctx->alpha << CSI2_CTX_CTRL3_ALPHA_SHIFT);
/* Set up CSI2_CTx_DAT_OFST */
- reg = readl(csi2->regs1 + CSI2_CTX_DAT_OFST(ctx->ctxnum));
- reg &= ~CSI2_CTX_DAT_OFST_MASK;
- reg |= ctx->data_offset;
- writel(reg, csi2->regs1 + CSI2_CTX_DAT_OFST(ctx->ctxnum));
+ iss_reg_update(csi2->iss, csi2->regs1, CSI2_CTX_DAT_OFST(ctx->ctxnum),
+ CSI2_CTX_DAT_OFST_MASK, ctx->data_offset);
- writel(ctx->ping_addr,
- csi2->regs1 + CSI2_CTX_PING_ADDR(ctx->ctxnum));
-
- writel(ctx->pong_addr,
- csi2->regs1 + CSI2_CTX_PONG_ADDR(ctx->ctxnum));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_PING_ADDR(ctx->ctxnum),
+ ctx->ping_addr);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_PONG_ADDR(ctx->ctxnum),
+ ctx->pong_addr);
}
/*
@@ -370,7 +366,7 @@ static void csi2_timing_config(struct iss_csi2_device *csi2,
{
u32 reg;
- reg = readl(csi2->regs1 + CSI2_TIMING);
+ reg = iss_reg_read(csi2->iss, csi2->regs1, CSI2_TIMING);
if (timing->force_rx_mode)
reg |= CSI2_TIMING_FORCE_RX_MODE_IO1;
@@ -391,7 +387,7 @@ static void csi2_timing_config(struct iss_csi2_device *csi2,
reg |= timing->stop_state_counter <<
CSI2_TIMING_STOP_STATE_COUNTER_IO1_SHIFT;
- writel(reg, csi2->regs1 + CSI2_TIMING);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_TIMING, reg);
}
/*
@@ -407,14 +403,14 @@ static void csi2_irq_ctx_set(struct iss_csi2_device *csi2, int enable)
reg |= CSI2_CTX_IRQ_FS;
for (i = 0; i < 8; i++) {
- writel(reg, csi2->regs1 + CSI2_CTX_IRQSTATUS(i));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_IRQSTATUS(i),
+ reg);
if (enable)
- writel(readl(csi2->regs1 + CSI2_CTX_IRQENABLE(i)) | reg,
- csi2->regs1 + CSI2_CTX_IRQENABLE(i));
+ iss_reg_set(csi2->iss, csi2->regs1,
+ CSI2_CTX_IRQENABLE(i), reg);
else
- writel(readl(csi2->regs1 + CSI2_CTX_IRQENABLE(i)) &
- ~reg,
- csi2->regs1 + CSI2_CTX_IRQENABLE(i));
+ iss_reg_clr(csi2->iss, csi2->regs1,
+ CSI2_CTX_IRQENABLE(i), reg);
}
}
@@ -452,12 +448,13 @@ static void csi2_irq_complexio1_set(struct iss_csi2_device *csi2, int enable)
CSI2_COMPLEXIO_IRQ_ERRESC1 |
CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS1 |
CSI2_COMPLEXIO_IRQ_ERRSOTHS1;
- writel(reg, csi2->regs1 + CSI2_COMPLEXIO_IRQSTATUS);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_COMPLEXIO_IRQSTATUS, reg);
if (enable)
- reg |= readl(csi2->regs1 + CSI2_COMPLEXIO_IRQENABLE);
+ iss_reg_set(csi2->iss, csi2->regs1, CSI2_COMPLEXIO_IRQENABLE,
+ reg);
else
- reg = 0;
- writel(reg, csi2->regs1 + CSI2_COMPLEXIO_IRQENABLE);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_COMPLEXIO_IRQENABLE,
+ 0);
}
/*
@@ -474,13 +471,11 @@ static void csi2_irq_status_set(struct iss_csi2_device *csi2, int enable)
CSI2_IRQ_COMPLEXIO_ERR |
CSI2_IRQ_FIFO_OVF |
CSI2_IRQ_CONTEXT0;
- writel(reg, csi2->regs1 + CSI2_IRQSTATUS);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_IRQSTATUS, reg);
if (enable)
- reg |= readl(csi2->regs1 + CSI2_IRQENABLE);
+ iss_reg_set(csi2->iss, csi2->regs1, CSI2_IRQENABLE, reg);
else
- reg = 0;
-
- writel(reg, csi2->regs1 + CSI2_IRQENABLE);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_IRQENABLE, 0);
}
/*
@@ -502,13 +497,12 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
if (csi2->phy->phy_in_use)
return -EBUSY;
- writel(readl(csi2->regs1 + CSI2_SYSCONFIG) |
- CSI2_SYSCONFIG_SOFT_RESET,
- csi2->regs1 + CSI2_SYSCONFIG);
+ iss_reg_set(csi2->iss, csi2->regs1, CSI2_SYSCONFIG,
+ CSI2_SYSCONFIG_SOFT_RESET);
do {
- reg = readl(csi2->regs1 + CSI2_SYSSTATUS) &
- CSI2_SYSSTATUS_RESET_DONE;
+ reg = iss_reg_read(csi2->iss, csi2->regs1, CSI2_SYSSTATUS)
+ & CSI2_SYSSTATUS_RESET_DONE;
if (reg == CSI2_SYSSTATUS_RESET_DONE)
break;
soft_reset_retries++;
@@ -522,13 +516,12 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
return -EBUSY;
}
- writel(readl(csi2->regs1 + CSI2_COMPLEXIO_CFG) |
- CSI2_COMPLEXIO_CFG_RESET_CTRL,
- csi2->regs1 + CSI2_COMPLEXIO_CFG);
+ iss_reg_set(csi2->iss, csi2->regs1, CSI2_COMPLEXIO_CFG,
+ CSI2_COMPLEXIO_CFG_RESET_CTRL);
i = 100;
do {
- reg = readl(csi2->phy->phy_regs + REGISTER1)
+ reg = iss_reg_read(csi2->iss, csi2->phy->phy_regs, REGISTER1)
& REGISTER1_RESET_DONE_CTRLCLK;
if (reg == REGISTER1_RESET_DONE_CTRLCLK)
break;
@@ -541,11 +534,10 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
return -EBUSY;
}
- writel((readl(csi2->regs1 + CSI2_SYSCONFIG) &
- ~(CSI2_SYSCONFIG_MSTANDBY_MODE_MASK |
- CSI2_SYSCONFIG_AUTO_IDLE)) |
- CSI2_SYSCONFIG_MSTANDBY_MODE_NO,
- csi2->regs1 + CSI2_SYSCONFIG);
+ iss_reg_update(csi2->iss, csi2->regs1, CSI2_SYSCONFIG,
+ CSI2_SYSCONFIG_MSTANDBY_MODE_MASK |
+ CSI2_SYSCONFIG_AUTO_IDLE,
+ CSI2_SYSCONFIG_MSTANDBY_MODE_NO);
return 0;
}
@@ -627,7 +619,7 @@ static int csi2_configure(struct iss_csi2_device *csi2)
*/
#define CSI2_PRINT_REGISTER(iss, regs, name)\
dev_dbg(iss->dev, "###CSI2 " #name "=0x%08x\n", \
- readl(regs + CSI2_##name))
+ iss_reg_read(iss, regs, CSI2_##name))
static void csi2_print_status(struct iss_csi2_device *csi2)
{
@@ -695,8 +687,8 @@ static void csi2_isr_ctx(struct iss_csi2_device *csi2,
unsigned int n = ctx->ctxnum;
u32 status;
- status = readl(csi2->regs1 + CSI2_CTX_IRQSTATUS(n));
- writel(status, csi2->regs1 + CSI2_CTX_IRQSTATUS(n));
+ status = iss_reg_read(csi2->iss, csi2->regs1, CSI2_CTX_IRQSTATUS(n));
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_CTX_IRQSTATUS(n), status);
/* Propagate frame number */
if (status & CSI2_CTX_IRQ_FS) {
@@ -745,15 +737,15 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2)
if (!csi2->available)
return;
- csi2_irqstatus = readl(csi2->regs1 + CSI2_IRQSTATUS);
- writel(csi2_irqstatus, csi2->regs1 + CSI2_IRQSTATUS);
+ csi2_irqstatus = iss_reg_read(csi2->iss, csi2->regs1, CSI2_IRQSTATUS);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_IRQSTATUS, csi2_irqstatus);
/* Failure Cases */
if (csi2_irqstatus & CSI2_IRQ_COMPLEXIO_ERR) {
- cpxio1_irqstatus = readl(csi2->regs1 +
- CSI2_COMPLEXIO_IRQSTATUS);
- writel(cpxio1_irqstatus,
- csi2->regs1 + CSI2_COMPLEXIO_IRQSTATUS);
+ cpxio1_irqstatus = iss_reg_read(csi2->iss, csi2->regs1,
+ CSI2_COMPLEXIO_IRQSTATUS);
+ iss_reg_write(csi2->iss, csi2->regs1, CSI2_COMPLEXIO_IRQSTATUS,
+ cpxio1_irqstatus);
dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ %x\n",
cpxio1_irqstatus);
pipe->error = true;
@@ -1319,7 +1311,7 @@ int omap4iss_csi2_init(struct iss_device *iss)
csi2a->iss = iss;
csi2a->available = 1;
- csi2a->regs1 = iss->regs[OMAP4_ISS_MEM_CSI2_A_REGS1];
+ csi2a->regs1 = OMAP4_ISS_MEM_CSI2_A_REGS1;
csi2a->phy = &iss->csiphy1;
csi2a->state = ISS_PIPELINE_STREAM_STOPPED;
init_waitqueue_head(&csi2a->wait);
@@ -1330,7 +1322,7 @@ int omap4iss_csi2_init(struct iss_device *iss)
csi2b->iss = iss;
csi2b->available = 1;
- csi2b->regs1 = iss->regs[OMAP4_ISS_MEM_CSI2_B_REGS1];
+ csi2b->regs1 = OMAP4_ISS_MEM_CSI2_B_REGS1;
csi2b->phy = &iss->csiphy2;
csi2b->state = ISS_PIPELINE_STREAM_STOPPED;
init_waitqueue_head(&csi2b->wait);
diff --git a/drivers/staging/media/omap4iss/iss_csi2.h b/drivers/staging/media/omap4iss/iss_csi2.h
index d1d077b..69a6263 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.h
+++ b/drivers/staging/media/omap4iss/iss_csi2.h
@@ -128,9 +128,9 @@ struct iss_csi2_device {
u8 available; /* Is the IP present on the silicon? */
- /* Pointer to register remaps into kernel space */
- void __iomem *regs1;
- void __iomem *regs2;
+ /* memory resources, as defined in enum iss_mem_resources */
+ unsigned int regs1;
+ unsigned int regs2;
u32 output; /* output to IPIPEIF, memory or both? */
bool dpcm_decompress;
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index d5c7cec..902391a 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -31,7 +31,7 @@ static void csiphy_lanes_config(struct iss_csiphy *phy)
unsigned int i;
u32 reg;
- reg = readl(phy->cfg_regs + CSI2_COMPLEXIO_CFG);
+ reg = iss_reg_read(phy->iss, phy->cfg_regs, CSI2_COMPLEXIO_CFG);
for (i = 0; i < phy->max_data_lanes; i++) {
reg &= ~(CSI2_COMPLEXIO_CFG_DATA_POL(i + 1) |
@@ -47,7 +47,7 @@ static void csiphy_lanes_config(struct iss_csiphy *phy)
reg |= phy->lanes.clk.pol ? CSI2_COMPLEXIO_CFG_CLOCK_POL : 0;
reg |= phy->lanes.clk.pos << CSI2_COMPLEXIO_CFG_CLOCK_POSITION_SHIFT;
- writel(reg, phy->cfg_regs + CSI2_COMPLEXIO_CFG);
+ iss_reg_write(phy->iss, phy->cfg_regs, CSI2_COMPLEXIO_CFG, reg);
}
/*
@@ -61,16 +61,15 @@ static int csiphy_set_power(struct iss_csiphy *phy, u32 power)
u32 reg;
u8 retry_count;
- writel((readl(phy->cfg_regs + CSI2_COMPLEXIO_CFG) &
- ~CSI2_COMPLEXIO_CFG_PWD_CMD_MASK) |
- power | CSI2_COMPLEXIO_CFG_PWR_AUTO,
- phy->cfg_regs + CSI2_COMPLEXIO_CFG);
+ iss_reg_update(phy->iss, phy->cfg_regs, CSI2_COMPLEXIO_CFG,
+ CSI2_COMPLEXIO_CFG_PWD_CMD_MASK,
+ power | CSI2_COMPLEXIO_CFG_PWR_AUTO);
retry_count = 0;
do {
udelay(1);
- reg = readl(phy->cfg_regs + CSI2_COMPLEXIO_CFG) &
- CSI2_COMPLEXIO_CFG_PWD_STATUS_MASK;
+ reg = iss_reg_read(phy->iss, phy->cfg_regs, CSI2_COMPLEXIO_CFG)
+ & CSI2_COMPLEXIO_CFG_PWD_STATUS_MASK;
if (reg != power >> 2)
retry_count++;
@@ -98,7 +97,7 @@ static void csiphy_dphy_config(struct iss_csiphy *phy)
reg = phy->dphy.ths_term << REGISTER0_THS_TERM_SHIFT;
reg |= phy->dphy.ths_settle << REGISTER0_THS_SETTLE_SHIFT;
- writel(reg, phy->phy_regs + REGISTER0);
+ iss_reg_write(phy->iss, phy->phy_regs, REGISTER0, reg);
/* Set up REGISTER1 */
reg = phy->dphy.tclk_term << REGISTER1_TCLK_TERM_SHIFT;
@@ -106,7 +105,7 @@ static void csiphy_dphy_config(struct iss_csiphy *phy)
reg |= phy->dphy.tclk_settle << REGISTER1_TCLK_SETTLE_SHIFT;
reg |= 0xB8 << REGISTER1_DPHY_HS_SYNC_PATTERN_SHIFT;
- writel(reg, phy->phy_regs + REGISTER1);
+ iss_reg_write(phy->iss, phy->phy_regs, REGISTER1, reg);
}
/*
@@ -264,16 +263,16 @@ int omap4iss_csiphy_init(struct iss_device *iss)
phy1->csi2 = &iss->csi2a;
phy1->max_data_lanes = ISS_CSIPHY1_NUM_DATA_LANES;
phy1->used_data_lanes = 0;
- phy1->cfg_regs = iss->regs[OMAP4_ISS_MEM_CSI2_A_REGS1];
- phy1->phy_regs = iss->regs[OMAP4_ISS_MEM_CAMERARX_CORE1];
+ phy1->cfg_regs = OMAP4_ISS_MEM_CSI2_A_REGS1;
+ phy1->phy_regs = OMAP4_ISS_MEM_CAMERARX_CORE1;
mutex_init(&phy1->mutex);
phy2->iss = iss;
phy2->csi2 = &iss->csi2b;
phy2->max_data_lanes = ISS_CSIPHY2_NUM_DATA_LANES;
phy2->used_data_lanes = 0;
- phy2->cfg_regs = iss->regs[OMAP4_ISS_MEM_CSI2_B_REGS1];
- phy2->phy_regs = iss->regs[OMAP4_ISS_MEM_CAMERARX_CORE2];
+ phy2->cfg_regs = OMAP4_ISS_MEM_CSI2_B_REGS1;
+ phy2->phy_regs = OMAP4_ISS_MEM_CAMERARX_CORE2;
mutex_init(&phy2->mutex);
return 0;
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.h b/drivers/staging/media/omap4iss/iss_csiphy.h
index df63eda..e9ca439 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.h
+++ b/drivers/staging/media/omap4iss/iss_csiphy.h
@@ -32,9 +32,9 @@ struct iss_csiphy {
u8 phy_in_use;
struct iss_csi2_device *csi2;
- /* Pointer to register remaps into kernel space */
- void __iomem *cfg_regs;
- void __iomem *phy_regs;
+ /* memory resources, as defined in enum iss_mem_resources */
+ unsigned int cfg_regs;
+ unsigned int phy_regs;
u8 max_data_lanes; /* number of CSI2 Data Lanes supported */
u8 used_data_lanes; /* number of CSI2 Data Lanes used */
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 15/25] v4l: omap4iss: resizer: Stop the whole resizer to avoid FIFO overflows
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (13 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 14/25] v4l: omap4iss: csi: " Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 16/25] v4l: omap4iss: Convert hexadecimal constants to lower case Laurent Pinchart
` (9 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
When stopping the resizer due to a buffer underrun, disabling RZA only
produces input FIFO overflows, most probably when the next frame is
received. Disable the whole resizer to work around the problem.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_resizer.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 793325c..5bf5080 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -266,10 +266,12 @@ static void resizer_configure(struct iss_resizer_device *resizer)
static void resizer_isr_buffer(struct iss_resizer_device *resizer)
{
- struct iss_device *iss = to_iss_device(resizer);
struct iss_buffer *buffer;
- iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_EN, RSZ_EN_EN);
+ /* The whole resizer needs to be stopped. Disabling RZA only produces
+ * input FIFO overflows, most probably when the next frame is received.
+ */
+ resizer_enable(resizer, 0);
buffer = omap4iss_video_buffer_next(&resizer->video_out);
if (buffer == NULL)
@@ -277,7 +279,7 @@ static void resizer_isr_buffer(struct iss_resizer_device *resizer)
resizer_set_outaddr(resizer, buffer->iss_addr);
- iss_reg_set(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_EN, RSZ_EN_EN);
+ resizer_enable(resizer, 1);
}
/*
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 16/25] v4l: omap4iss: Convert hexadecimal constants to lower case
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (14 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 15/25] v4l: omap4iss: resizer: Stop the whole resizer to avoid FIFO overflows Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 17/25] v4l: omap4iss: Add description field to iss_format_info structure Laurent Pinchart
` (8 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
The Linux kernel recommends lower case for hexadecimal constants.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_csi2.c | 4 +-
drivers/staging/media/omap4iss/iss_csiphy.c | 4 +-
drivers/staging/media/omap4iss/iss_regs.h | 458 ++++++++++++++--------------
3 files changed, 233 insertions(+), 233 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index f8d6472..077545f 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -273,7 +273,7 @@ static void csi2_set_outaddr(struct iss_csi2_device *csi2, u32 addr)
*/
static inline int is_usr_def_mapping(u32 format_id)
{
- return (format_id & 0xF0) == 0x40 ? 1 : 0;
+ return (format_id & 0xf0) == 0x40 ? 1 : 0;
}
/*
@@ -572,7 +572,7 @@ static int csi2_configure(struct iss_csi2_device *csi2)
timing->force_rx_mode = 1;
timing->stop_state_16x = 1;
timing->stop_state_4x = 1;
- timing->stop_state_counter = 0x1FF;
+ timing->stop_state_counter = 0x1ff;
/*
* The CSI2 receiver can't do any format conversion except DPCM
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index 902391a..7c3d55d 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -103,7 +103,7 @@ static void csiphy_dphy_config(struct iss_csiphy *phy)
reg = phy->dphy.tclk_term << REGISTER1_TCLK_TERM_SHIFT;
reg |= phy->dphy.tclk_miss << REGISTER1_CTRLCLK_DIV_FACTOR_SHIFT;
reg |= phy->dphy.tclk_settle << REGISTER1_TCLK_SETTLE_SHIFT;
- reg |= 0xB8 << REGISTER1_DPHY_HS_SYNC_PATTERN_SHIFT;
+ reg |= 0xb8 << REGISTER1_DPHY_HS_SYNC_PATTERN_SHIFT;
iss_reg_write(phy->iss, phy->phy_regs, REGISTER1, reg);
}
@@ -150,7 +150,7 @@ int omap4iss_csiphy_config(struct iss_device *iss,
/* NOTE: Leave CSIPHY1 config to 0x0: D-PHY mode */
/* Enable all lanes for now */
cam_rx_ctrl |=
- 0x1F << OMAP4_CAMERARX_CSI21_LANEENABLE_SHIFT;
+ 0x1f << OMAP4_CAMERARX_CSI21_LANEENABLE_SHIFT;
/* Enable CTRLCLK */
cam_rx_ctrl |= OMAP4_CAMERARX_CSI21_CTRLCLKEN_MASK;
}
diff --git a/drivers/staging/media/omap4iss/iss_regs.h b/drivers/staging/media/omap4iss/iss_regs.h
index 5995e62..efd0291 100644
--- a/drivers/staging/media/omap4iss/iss_regs.h
+++ b/drivers/staging/media/omap4iss/iss_regs.h
@@ -65,7 +65,7 @@
#define ISS_CLKSTAT_ISP (1 << 1)
#define ISS_CLKSTAT_SIMCOP (1 << 0)
-#define ISS_PM_STATUS 0x8C
+#define ISS_PM_STATUS 0x8c
#define ISS_PM_STATUS_CBUFF_PM_MASK (3 << 12)
#define ISS_PM_STATUS_BTE_PM_MASK (3 << 10)
#define ISS_PM_STATUS_SIMCOP_PM_MASK (3 << 8)
@@ -76,20 +76,20 @@
#define REGISTER0 0x0
#define REGISTER0_HSCLOCKCONFIG (1 << 24)
-#define REGISTER0_THS_TERM_MASK (0xFF << 8)
+#define REGISTER0_THS_TERM_MASK (0xff << 8)
#define REGISTER0_THS_TERM_SHIFT 8
-#define REGISTER0_THS_SETTLE_MASK (0xFF << 0)
+#define REGISTER0_THS_SETTLE_MASK (0xff << 0)
#define REGISTER0_THS_SETTLE_SHIFT 0
#define REGISTER1 0x4
#define REGISTER1_RESET_DONE_CTRLCLK (1 << 29)
#define REGISTER1_CLOCK_MISS_DETECTOR_STATUS (1 << 25)
-#define REGISTER1_TCLK_TERM_MASK (0x3F << 18)
+#define REGISTER1_TCLK_TERM_MASK (0x3f << 18)
#define REGISTER1_TCLK_TERM_SHIFT 18
#define REGISTER1_DPHY_HS_SYNC_PATTERN_SHIFT 10
#define REGISTER1_CTRLCLK_DIV_FACTOR_MASK (0x3 << 8)
#define REGISTER1_CTRLCLK_DIV_FACTOR_SHIFT 8
-#define REGISTER1_TCLK_SETTLE_MASK (0xFF << 0)
+#define REGISTER1_TCLK_SETTLE_MASK (0xff << 0)
#define REGISTER1_TCLK_SETTLE_SHIFT 0
#define REGISTER2 0x8
@@ -106,7 +106,7 @@
#define CSI2_SYSSTATUS_RESET_DONE (1 << 0)
#define CSI2_IRQSTATUS 0x18
-#define CSI2_IRQENABLE 0x1C
+#define CSI2_IRQENABLE 0x1c
/* Shared bits across CSI2_IRQENABLE and IRQSTATUS */
@@ -159,7 +159,7 @@
#define CSI2_COMPLEXIO_IRQSTATUS 0x54
-#define CSI2_SHORT_PACKET 0x5C
+#define CSI2_SHORT_PACKET 0x5c
#define CSI2_COMPLEXIO_IRQENABLE 0x60
@@ -194,18 +194,18 @@
#define CSI2_DBG_P 0x68
-#define CSI2_TIMING 0x6C
+#define CSI2_TIMING 0x6c
#define CSI2_TIMING_FORCE_RX_MODE_IO1 (1 << 15)
#define CSI2_TIMING_STOP_STATE_X16_IO1 (1 << 14)
#define CSI2_TIMING_STOP_STATE_X4_IO1 (1 << 13)
-#define CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK (0x1FFF << 0)
+#define CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK (0x1fff << 0)
#define CSI2_TIMING_STOP_STATE_COUNTER_IO1_SHIFT 0
#define CSI2_CTX_CTRL1(i) (0x70 + (0x20 * i))
#define CSI2_CTX_CTRL1_GENERIC (1 << 30)
-#define CSI2_CTX_CTRL1_TRANSCODE (0xF << 24)
-#define CSI2_CTX_CTRL1_FEC_NUMBER_MASK (0xFF << 16)
-#define CSI2_CTX_CTRL1_COUNT_MASK (0xFF << 8)
+#define CSI2_CTX_CTRL1_TRANSCODE (0xf << 24)
+#define CSI2_CTX_CTRL1_FEC_NUMBER_MASK (0xff << 16)
+#define CSI2_CTX_CTRL1_COUNT_MASK (0xff << 8)
#define CSI2_CTX_CTRL1_COUNT_SHIFT 8
#define CSI2_CTX_CTRL1_EOF_EN (1 << 7)
#define CSI2_CTX_CTRL1_EOL_EN (1 << 6)
@@ -221,14 +221,14 @@
#define CSI2_CTX_CTRL2_VIRTUAL_ID_MASK (3 << 11)
#define CSI2_CTX_CTRL2_VIRTUAL_ID_SHIFT 11
#define CSI2_CTX_CTRL2_DPCM_PRED (1 << 10)
-#define CSI2_CTX_CTRL2_FORMAT_MASK (0x3FF << 0)
+#define CSI2_CTX_CTRL2_FORMAT_MASK (0x3ff << 0)
#define CSI2_CTX_CTRL2_FORMAT_SHIFT 0
#define CSI2_CTX_DAT_OFST(i) (0x78 + (0x20 * i))
-#define CSI2_CTX_DAT_OFST_MASK (0xFFF << 5)
+#define CSI2_CTX_DAT_OFST_MASK (0xfff << 5)
-#define CSI2_CTX_PING_ADDR(i) (0x7C + (0x20 * i))
-#define CSI2_CTX_PING_ADDR_MASK 0xFFFFFFE0
+#define CSI2_CTX_PING_ADDR(i) (0x7c + (0x20 * i))
+#define CSI2_CTX_PING_ADDR_MASK 0xffffffe0
#define CSI2_CTX_PONG_ADDR(i) (0x80 + (0x20 * i))
#define CSI2_CTX_PONG_ADDR_MASK CSI2_CTX_PING_ADDR_MASK
@@ -236,7 +236,7 @@
#define CSI2_CTX_IRQENABLE(i) (0x84 + (0x20 * i))
#define CSI2_CTX_IRQSTATUS(i) (0x88 + (0x20 * i))
-#define CSI2_CTX_CTRL3(i) (0x8C + (0x20 * i))
+#define CSI2_CTX_CTRL3(i) (0x8c + (0x20 * i))
#define CSI2_CTX_CTRL3_ALPHA_SHIFT 5
#define CSI2_CTX_CTRL3_ALPHA_MASK \
(0x3fff << CSI2_CTX_CTRL3_ALPHA_SHIFT)
@@ -253,7 +253,7 @@
/* ISS BTE */
#define BTE_CTRL (0x0030)
-#define BTE_CTRL_BW_LIMITER_MASK (0x3FF << 22)
+#define BTE_CTRL_BW_LIMITER_MASK (0x3ff << 22)
#define BTE_CTRL_BW_LIMITER_SHIFT 22
/* ISS ISP_SYS1 */
@@ -266,7 +266,7 @@
#define ISP5_SYSCONFIG_SOFTRESET (1 << 1)
#define ISP5_IRQSTATUS(i) (0x0028 + (0x10 * (i)))
-#define ISP5_IRQENABLE_SET(i) (0x002C + (0x10 * (i)))
+#define ISP5_IRQENABLE_SET(i) (0x002c + (0x10 * (i)))
#define ISP5_IRQENABLE_CLR(i) (0x0030 + (0x10 * (i)))
/* Bits shared for ISP5_IRQ* registers */
@@ -296,7 +296,7 @@
#define ISP5_IRQ_IPIPE_INT_REG (1 << 4)
#define ISP5_IRQ_ISIF_INT(i) (1 << (i))
-#define ISP5_CTRL (0x006C)
+#define ISP5_CTRL (0x006c)
#define ISP5_CTRL_MSTANDBY (1 << 24)
#define ISP5_CTRL_VD_PULSE_EXT (1 << 23)
#define ISP5_CTRL_MSTANDBY_WAIT (1 << 20)
@@ -327,25 +327,25 @@
#define ISIF_MODESET_VDPOL (1 << 2)
#define ISIF_SPH (0x0018)
-#define ISIF_SPH_MASK (0x7FFF)
+#define ISIF_SPH_MASK (0x7fff)
-#define ISIF_LNH (0x001C)
-#define ISIF_LNH_MASK (0x7FFF)
+#define ISIF_LNH (0x001c)
+#define ISIF_LNH_MASK (0x7fff)
#define ISIF_LNV (0x0028)
-#define ISIF_LNV_MASK (0x7FFF)
+#define ISIF_LNV_MASK (0x7fff)
#define ISIF_HSIZE (0x0034)
#define ISIF_HSIZE_ADCR (1 << 12)
-#define ISIF_HSIZE_HSIZE_MASK (0xFFF)
+#define ISIF_HSIZE_HSIZE_MASK (0xfff)
-#define ISIF_CADU (0x003C)
-#define ISIF_CADU_MASK (0x7FF)
+#define ISIF_CADU (0x003c)
+#define ISIF_CADU_MASK (0x7ff)
#define ISIF_CADL (0x0040)
-#define ISIF_CADL_MASK (0xFFFF)
+#define ISIF_CADL_MASK (0xffff)
-#define ISIF_CCOLP (0x004C)
+#define ISIF_CCOLP (0x004c)
#define ISIF_CCOLP_CP0_F0_R (0 << 6)
#define ISIF_CCOLP_CP0_F0_GR (1 << 6)
#define ISIF_CCOLP_CP0_F0_B (3 << 6)
@@ -367,7 +367,7 @@
#define ISIF_VDINT_MASK (0x7fff)
#define ISIF_CGAMMAWD (0x0080)
-#define ISIF_CGAMMAWD_GWDI_MASK (0xF << 1)
+#define ISIF_CGAMMAWD_GWDI_MASK (0xf << 1)
#define ISIF_CGAMMAWD_GWDI(bpp) ((16 - (bpp)) << 1)
#define ISIF_CCDCFG (0x0088)
@@ -412,7 +412,7 @@
#define IPIPE_SRC_FMT_RAW2STATS (2 << 0)
#define IPIPE_SRC_FMT_YUV2YUV (3 << 0)
-#define IPIPE_SRC_COL (0x000C)
+#define IPIPE_SRC_COL (0x000c)
#define IPIPE_SRC_COL_OO_R (0 << 6)
#define IPIPE_SRC_COL_OO_GR (1 << 6)
#define IPIPE_SRC_COL_OO_B (3 << 6)
@@ -431,16 +431,16 @@
#define IPIPE_SRC_COL_EE_GB (2 << 0)
#define IPIPE_SRC_VPS (0x0010)
-#define IPIPE_SRC_VPS_MASK (0xFFFF)
+#define IPIPE_SRC_VPS_MASK (0xffff)
#define IPIPE_SRC_VSZ (0x0014)
-#define IPIPE_SRC_VSZ_MASK (0x1FFF)
+#define IPIPE_SRC_VSZ_MASK (0x1fff)
#define IPIPE_SRC_HPS (0x0018)
-#define IPIPE_SRC_HPS_MASK (0xFFFF)
+#define IPIPE_SRC_HPS_MASK (0xffff)
-#define IPIPE_SRC_HSZ (0x001C)
-#define IPIPE_SRC_HSZ_MASK (0x1FFE)
+#define IPIPE_SRC_HSZ (0x001c)
+#define IPIPE_SRC_HSZ_MASK (0x1ffe)
#define IPIPE_SEL_SBU (0x0020)
@@ -449,7 +449,7 @@
#define IPIPE_GCK_MMR (0x0028)
#define IPIPE_GCK_MMR_REG (1 << 0)
-#define IPIPE_GCK_PIX (0x002C)
+#define IPIPE_GCK_PIX (0x002c)
#define IPIPE_GCK_PIX_G3 (1 << 3)
#define IPIPE_GCK_PIX_G2 (1 << 2)
#define IPIPE_GCK_PIX_G1 (1 << 1)
@@ -457,277 +457,277 @@
#define IPIPE_DPC_LUT_EN (0x0034)
#define IPIPE_DPC_LUT_SEL (0x0038)
-#define IPIPE_DPC_LUT_ADR (0x003C)
+#define IPIPE_DPC_LUT_ADR (0x003c)
#define IPIPE_DPC_LUT_SIZ (0x0040)
#define IPIPE_DPC_OTF_EN (0x0044)
#define IPIPE_DPC_OTF_TYP (0x0048)
-#define IPIPE_DPC_OTF_2_D_THR_R (0x004C)
+#define IPIPE_DPC_OTF_2_D_THR_R (0x004c)
#define IPIPE_DPC_OTF_2_D_THR_GR (0x0050)
#define IPIPE_DPC_OTF_2_D_THR_GB (0x0054)
#define IPIPE_DPC_OTF_2_D_THR_B (0x0058)
-#define IPIPE_DPC_OTF_2_C_THR_R (0x005C)
+#define IPIPE_DPC_OTF_2_C_THR_R (0x005c)
#define IPIPE_DPC_OTF_2_C_THR_GR (0x0060)
#define IPIPE_DPC_OTF_2_C_THR_GB (0x0064)
#define IPIPE_DPC_OTF_2_C_THR_B (0x0068)
-#define IPIPE_DPC_OTF_3_SHF (0x006C)
+#define IPIPE_DPC_OTF_3_SHF (0x006c)
#define IPIPE_DPC_OTF_3_D_THR (0x0070)
#define IPIPE_DPC_OTF_3_D_SPL (0x0074)
#define IPIPE_DPC_OTF_3_D_MIN (0x0078)
-#define IPIPE_DPC_OTF_3_D_MAX (0x007C)
+#define IPIPE_DPC_OTF_3_D_MAX (0x007c)
#define IPIPE_DPC_OTF_3_C_THR (0x0080)
#define IPIPE_DPC_OTF_3_C_SLP (0x0084)
#define IPIPE_DPC_OTF_3_C_MIN (0x0088)
-#define IPIPE_DPC_OTF_3_C_MAX (0x008C)
+#define IPIPE_DPC_OTF_3_C_MAX (0x008c)
#define IPIPE_LSC_VOFT (0x0090)
#define IPIPE_LSC_VA2 (0x0094)
#define IPIPE_LSC_VA1 (0x0098)
-#define IPIPE_LSC_VS (0x009C)
-#define IPIPE_LSC_HOFT (0x00A0)
-#define IPIPE_LSC_HA2 (0x00A4)
-#define IPIPE_LSC_HA1 (0x00A8)
-#define IPIPE_LSC_HS (0x00AC)
-#define IPIPE_LSC_GAN_R (0x00B0)
-#define IPIPE_LSC_GAN_GR (0x00B4)
-#define IPIPE_LSC_GAN_GB (0x00B8)
-#define IPIPE_LSC_GAN_B (0x00BC)
-#define IPIPE_LSC_OFT_R (0x00C0)
-#define IPIPE_LSC_OFT_GR (0x00C4)
-#define IPIPE_LSC_OFT_GB (0x00C8)
-#define IPIPE_LSC_OFT_B (0x00CC)
-#define IPIPE_LSC_SHF (0x00D0)
-#define IPIPE_LSC_MAX (0x00D4)
-
-#define IPIPE_D2F_1ST_EN (0x00D8)
-#define IPIPE_D2F_1ST_TYP (0x00DC)
-#define IPIPE_D2F_1ST_THR_00 (0x00E0)
-#define IPIPE_D2F_1ST_THR_01 (0x00E4)
-#define IPIPE_D2F_1ST_THR_02 (0x00E8)
-#define IPIPE_D2F_1ST_THR_03 (0x00EC)
-#define IPIPE_D2F_1ST_THR_04 (0x00F0)
-#define IPIPE_D2F_1ST_THR_05 (0x00F4)
-#define IPIPE_D2F_1ST_THR_06 (0x00F8)
-#define IPIPE_D2F_1ST_THR_07 (0x00FC)
+#define IPIPE_LSC_VS (0x009c)
+#define IPIPE_LSC_HOFT (0x00a0)
+#define IPIPE_LSC_HA2 (0x00a4)
+#define IPIPE_LSC_HA1 (0x00a8)
+#define IPIPE_LSC_HS (0x00ac)
+#define IPIPE_LSC_GAN_R (0x00b0)
+#define IPIPE_LSC_GAN_GR (0x00b4)
+#define IPIPE_LSC_GAN_GB (0x00b8)
+#define IPIPE_LSC_GAN_B (0x00bc)
+#define IPIPE_LSC_OFT_R (0x00c0)
+#define IPIPE_LSC_OFT_GR (0x00c4)
+#define IPIPE_LSC_OFT_GB (0x00c8)
+#define IPIPE_LSC_OFT_B (0x00cc)
+#define IPIPE_LSC_SHF (0x00d0)
+#define IPIPE_LSC_MAX (0x00d4)
+
+#define IPIPE_D2F_1ST_EN (0x00d8)
+#define IPIPE_D2F_1ST_TYP (0x00dc)
+#define IPIPE_D2F_1ST_THR_00 (0x00e0)
+#define IPIPE_D2F_1ST_THR_01 (0x00e4)
+#define IPIPE_D2F_1ST_THR_02 (0x00e8)
+#define IPIPE_D2F_1ST_THR_03 (0x00ec)
+#define IPIPE_D2F_1ST_THR_04 (0x00f0)
+#define IPIPE_D2F_1ST_THR_05 (0x00f4)
+#define IPIPE_D2F_1ST_THR_06 (0x00f8)
+#define IPIPE_D2F_1ST_THR_07 (0x00fc)
#define IPIPE_D2F_1ST_STR_00 (0x0100)
#define IPIPE_D2F_1ST_STR_01 (0x0104)
#define IPIPE_D2F_1ST_STR_02 (0x0108)
-#define IPIPE_D2F_1ST_STR_03 (0x010C)
+#define IPIPE_D2F_1ST_STR_03 (0x010c)
#define IPIPE_D2F_1ST_STR_04 (0x0110)
#define IPIPE_D2F_1ST_STR_05 (0x0114)
#define IPIPE_D2F_1ST_STR_06 (0x0118)
-#define IPIPE_D2F_1ST_STR_07 (0x011C)
+#define IPIPE_D2F_1ST_STR_07 (0x011c)
#define IPIPE_D2F_1ST_SPR_00 (0x0120)
#define IPIPE_D2F_1ST_SPR_01 (0x0124)
#define IPIPE_D2F_1ST_SPR_02 (0x0128)
-#define IPIPE_D2F_1ST_SPR_03 (0x012C)
+#define IPIPE_D2F_1ST_SPR_03 (0x012c)
#define IPIPE_D2F_1ST_SPR_04 (0x0130)
#define IPIPE_D2F_1ST_SPR_05 (0x0134)
#define IPIPE_D2F_1ST_SPR_06 (0x0138)
-#define IPIPE_D2F_1ST_SPR_07 (0x013C)
+#define IPIPE_D2F_1ST_SPR_07 (0x013c)
#define IPIPE_D2F_1ST_EDG_MIN (0x0140)
#define IPIPE_D2F_1ST_EDG_MAX (0x0144)
#define IPIPE_D2F_2ND_EN (0x0148)
-#define IPIPE_D2F_2ND_TYP (0x014C)
+#define IPIPE_D2F_2ND_TYP (0x014c)
#define IPIPE_D2F_2ND_THR00 (0x0150)
#define IPIPE_D2F_2ND_THR01 (0x0154)
#define IPIPE_D2F_2ND_THR02 (0x0158)
-#define IPIPE_D2F_2ND_THR03 (0x015C)
+#define IPIPE_D2F_2ND_THR03 (0x015c)
#define IPIPE_D2F_2ND_THR04 (0x0160)
#define IPIPE_D2F_2ND_THR05 (0x0164)
#define IPIPE_D2F_2ND_THR06 (0x0168)
-#define IPIPE_D2F_2ND_THR07 (0x016C)
+#define IPIPE_D2F_2ND_THR07 (0x016c)
#define IPIPE_D2F_2ND_STR_00 (0x0170)
#define IPIPE_D2F_2ND_STR_01 (0x0174)
#define IPIPE_D2F_2ND_STR_02 (0x0178)
-#define IPIPE_D2F_2ND_STR_03 (0x017C)
+#define IPIPE_D2F_2ND_STR_03 (0x017c)
#define IPIPE_D2F_2ND_STR_04 (0x0180)
#define IPIPE_D2F_2ND_STR_05 (0x0184)
#define IPIPE_D2F_2ND_STR_06 (0x0188)
-#define IPIPE_D2F_2ND_STR_07 (0x018C)
+#define IPIPE_D2F_2ND_STR_07 (0x018c)
#define IPIPE_D2F_2ND_SPR_00 (0x0190)
#define IPIPE_D2F_2ND_SPR_01 (0x0194)
#define IPIPE_D2F_2ND_SPR_02 (0x0198)
-#define IPIPE_D2F_2ND_SPR_03 (0x019C)
-#define IPIPE_D2F_2ND_SPR_04 (0x01A0)
-#define IPIPE_D2F_2ND_SPR_05 (0x01A4)
-#define IPIPE_D2F_2ND_SPR_06 (0x01A8)
-#define IPIPE_D2F_2ND_SPR_07 (0x01AC)
-#define IPIPE_D2F_2ND_EDG_MIN (0x01B0)
-#define IPIPE_D2F_2ND_EDG_MAX (0x01B4)
-
-#define IPIPE_GIC_EN (0x01B8)
-#define IPIPE_GIC_TYP (0x01BC)
-#define IPIPE_GIC_GAN (0x01C0)
-#define IPIPE_GIC_NFGAIN (0x01C4)
-#define IPIPE_GIC_THR (0x01C8)
-#define IPIPE_GIC_SLP (0x01CC)
-
-#define IPIPE_WB2_OFT_R (0x01D0)
-#define IPIPE_WB2_OFT_GR (0x01D4)
-#define IPIPE_WB2_OFT_GB (0x01D8)
-#define IPIPE_WB2_OFT_B (0x01DC)
-
-#define IPIPE_WB2_WGN_R (0x01E0)
-#define IPIPE_WB2_WGN_GR (0x01E4)
-#define IPIPE_WB2_WGN_GB (0x01E8)
-#define IPIPE_WB2_WGN_B (0x01EC)
-
-#define IPIPE_CFA_MODE (0x01F0)
-#define IPIPE_CFA_2DIR_HPF_THR (0x01F4)
-#define IPIPE_CFA_2DIR_HPF_SLP (0x01F8)
-#define IPIPE_CFA_2DIR_MIX_THR (0x01FC)
+#define IPIPE_D2F_2ND_SPR_03 (0x019c)
+#define IPIPE_D2F_2ND_SPR_04 (0x01a0)
+#define IPIPE_D2F_2ND_SPR_05 (0x01a4)
+#define IPIPE_D2F_2ND_SPR_06 (0x01a8)
+#define IPIPE_D2F_2ND_SPR_07 (0x01ac)
+#define IPIPE_D2F_2ND_EDG_MIN (0x01b0)
+#define IPIPE_D2F_2ND_EDG_MAX (0x01b4)
+
+#define IPIPE_GIC_EN (0x01b8)
+#define IPIPE_GIC_TYP (0x01bc)
+#define IPIPE_GIC_GAN (0x01c0)
+#define IPIPE_GIC_NFGAIN (0x01c4)
+#define IPIPE_GIC_THR (0x01c8)
+#define IPIPE_GIC_SLP (0x01cc)
+
+#define IPIPE_WB2_OFT_R (0x01d0)
+#define IPIPE_WB2_OFT_GR (0x01d4)
+#define IPIPE_WB2_OFT_GB (0x01d8)
+#define IPIPE_WB2_OFT_B (0x01dc)
+
+#define IPIPE_WB2_WGN_R (0x01e0)
+#define IPIPE_WB2_WGN_GR (0x01e4)
+#define IPIPE_WB2_WGN_GB (0x01e8)
+#define IPIPE_WB2_WGN_B (0x01ec)
+
+#define IPIPE_CFA_MODE (0x01f0)
+#define IPIPE_CFA_2DIR_HPF_THR (0x01f4)
+#define IPIPE_CFA_2DIR_HPF_SLP (0x01f8)
+#define IPIPE_CFA_2DIR_MIX_THR (0x01fc)
#define IPIPE_CFA_2DIR_MIX_SLP (0x0200)
#define IPIPE_CFA_2DIR_DIR_TRH (0x0204)
#define IPIPE_CFA_2DIR_DIR_SLP (0x0208)
-#define IPIPE_CFA_2DIR_NDWT (0x020C)
+#define IPIPE_CFA_2DIR_NDWT (0x020c)
#define IPIPE_CFA_MONO_HUE_FRA (0x0210)
#define IPIPE_CFA_MONO_EDG_THR (0x0214)
#define IPIPE_CFA_MONO_THR_MIN (0x0218)
-#define IPIPE_CFA_MONO_THR_SLP (0x021C)
+#define IPIPE_CFA_MONO_THR_SLP (0x021c)
#define IPIPE_CFA_MONO_SLP_MIN (0x0220)
#define IPIPE_CFA_MONO_SLP_SLP (0x0224)
#define IPIPE_CFA_MONO_LPWT (0x0228)
-#define IPIPE_RGB1_MUL_RR (0x022C)
+#define IPIPE_RGB1_MUL_RR (0x022c)
#define IPIPE_RGB1_MUL_GR (0x0230)
#define IPIPE_RGB1_MUL_BR (0x0234)
#define IPIPE_RGB1_MUL_RG (0x0238)
-#define IPIPE_RGB1_MUL_GG (0x023C)
+#define IPIPE_RGB1_MUL_GG (0x023c)
#define IPIPE_RGB1_MUL_BG (0x0240)
#define IPIPE_RGB1_MUL_RB (0x0244)
#define IPIPE_RGB1_MUL_GB (0x0248)
-#define IPIPE_RGB1_MUL_BB (0x024C)
+#define IPIPE_RGB1_MUL_BB (0x024c)
#define IPIPE_RGB1_OFT_OR (0x0250)
#define IPIPE_RGB1_OFT_OG (0x0254)
#define IPIPE_RGB1_OFT_OB (0x0258)
-#define IPIPE_GMM_CFG (0x025C)
+#define IPIPE_GMM_CFG (0x025c)
#define IPIPE_RGB2_MUL_RR (0x0260)
#define IPIPE_RGB2_MUL_GR (0x0264)
#define IPIPE_RGB2_MUL_BR (0x0268)
-#define IPIPE_RGB2_MUL_RG (0x026C)
+#define IPIPE_RGB2_MUL_RG (0x026c)
#define IPIPE_RGB2_MUL_GG (0x0270)
#define IPIPE_RGB2_MUL_BG (0x0274)
#define IPIPE_RGB2_MUL_RB (0x0278)
-#define IPIPE_RGB2_MUL_GB (0x027C)
+#define IPIPE_RGB2_MUL_GB (0x027c)
#define IPIPE_RGB2_MUL_BB (0x0280)
#define IPIPE_RGB2_OFT_OR (0x0284)
#define IPIPE_RGB2_OFT_OG (0x0288)
-#define IPIPE_RGB2_OFT_OB (0x028C)
+#define IPIPE_RGB2_OFT_OB (0x028c)
#define IPIPE_YUV_ADJ (0x0294)
#define IPIPE_YUV_MUL_RY (0x0298)
-#define IPIPE_YUV_MUL_GY (0x029C)
-#define IPIPE_YUV_MUL_BY (0x02A0)
-#define IPIPE_YUV_MUL_RCB (0x02A4)
-#define IPIPE_YUV_MUL_GCB (0x02A8)
-#define IPIPE_YUV_MUL_BCB (0x02AC)
-#define IPIPE_YUV_MUL_RCR (0x02B0)
-#define IPIPE_YUV_MUL_GCR (0x02B4)
-#define IPIPE_YUV_MUL_BCR (0x02B8)
-#define IPIPE_YUV_OFT_Y (0x02BC)
-#define IPIPE_YUV_OFT_CB (0x02C0)
-#define IPIPE_YUV_OFT_CR (0x02C4)
-
-#define IPIPE_YUV_PHS (0x02C8)
+#define IPIPE_YUV_MUL_GY (0x029c)
+#define IPIPE_YUV_MUL_BY (0x02a0)
+#define IPIPE_YUV_MUL_RCB (0x02a4)
+#define IPIPE_YUV_MUL_GCB (0x02a8)
+#define IPIPE_YUV_MUL_BCB (0x02ac)
+#define IPIPE_YUV_MUL_RCR (0x02b0)
+#define IPIPE_YUV_MUL_GCR (0x02b4)
+#define IPIPE_YUV_MUL_BCR (0x02b8)
+#define IPIPE_YUV_OFT_Y (0x02bc)
+#define IPIPE_YUV_OFT_CB (0x02c0)
+#define IPIPE_YUV_OFT_CR (0x02c4)
+
+#define IPIPE_YUV_PHS (0x02c8)
#define IPIPE_YUV_PHS_LPF (1 << 1)
#define IPIPE_YUV_PHS_POS (1 << 0)
-#define IPIPE_YEE_EN (0x02D4)
-#define IPIPE_YEE_TYP (0x02D8)
-#define IPIPE_YEE_SHF (0x02DC)
-#define IPIPE_YEE_MUL_00 (0x02E0)
-#define IPIPE_YEE_MUL_01 (0x02E4)
-#define IPIPE_YEE_MUL_02 (0x02E8)
-#define IPIPE_YEE_MUL_10 (0x02EC)
-#define IPIPE_YEE_MUL_11 (0x02F0)
-#define IPIPE_YEE_MUL_12 (0x02F4)
-#define IPIPE_YEE_MUL_20 (0x02F8)
-#define IPIPE_YEE_MUL_21 (0x02FC)
+#define IPIPE_YEE_EN (0x02d4)
+#define IPIPE_YEE_TYP (0x02d8)
+#define IPIPE_YEE_SHF (0x02dc)
+#define IPIPE_YEE_MUL_00 (0x02e0)
+#define IPIPE_YEE_MUL_01 (0x02e4)
+#define IPIPE_YEE_MUL_02 (0x02e8)
+#define IPIPE_YEE_MUL_10 (0x02ec)
+#define IPIPE_YEE_MUL_11 (0x02f0)
+#define IPIPE_YEE_MUL_12 (0x02f4)
+#define IPIPE_YEE_MUL_20 (0x02f8)
+#define IPIPE_YEE_MUL_21 (0x02fc)
#define IPIPE_YEE_MUL_22 (0x0300)
#define IPIPE_YEE_THR (0x0304)
#define IPIPE_YEE_E_GAN (0x0308)
-#define IPIPE_YEE_E_THR_1 (0x030C)
+#define IPIPE_YEE_E_THR_1 (0x030c)
#define IPIPE_YEE_E_THR_2 (0x0310)
#define IPIPE_YEE_G_GAN (0x0314)
#define IPIPE_YEE_G_OFT (0x0318)
-#define IPIPE_CAR_EN (0x031C)
+#define IPIPE_CAR_EN (0x031c)
#define IPIPE_CAR_TYP (0x0320)
#define IPIPE_CAR_SW (0x0324)
#define IPIPE_CAR_HPF_TYP (0x0328)
-#define IPIPE_CAR_HPF_SHF (0x032C)
+#define IPIPE_CAR_HPF_SHF (0x032c)
#define IPIPE_CAR_HPF_THR (0x0330)
#define IPIPE_CAR_GN1_GAN (0x0334)
#define IPIPE_CAR_GN1_SHF (0x0338)
-#define IPIPE_CAR_GN1_MIN (0x033C)
+#define IPIPE_CAR_GN1_MIN (0x033c)
#define IPIPE_CAR_GN2_GAN (0x0340)
#define IPIPE_CAR_GN2_SHF (0x0344)
#define IPIPE_CAR_GN2_MIN (0x0348)
-#define IPIPE_CGS_EN (0x034C)
+#define IPIPE_CGS_EN (0x034c)
#define IPIPE_CGS_GN1_L_THR (0x0350)
#define IPIPE_CGS_GN1_L_GAIN (0x0354)
#define IPIPE_CGS_GN1_L_SHF (0x0358)
-#define IPIPE_CGS_GN1_L_MIN (0x035C)
+#define IPIPE_CGS_GN1_L_MIN (0x035c)
#define IPIPE_CGS_GN1_H_THR (0x0360)
#define IPIPE_CGS_GN1_H_GAIN (0x0364)
#define IPIPE_CGS_GN1_H_SHF (0x0368)
-#define IPIPE_CGS_GN1_H_MIN (0x036C)
+#define IPIPE_CGS_GN1_H_MIN (0x036c)
#define IPIPE_CGS_GN2_L_THR (0x0370)
#define IPIPE_CGS_GN2_L_GAIN (0x0374)
#define IPIPE_CGS_GN2_L_SHF (0x0378)
-#define IPIPE_CGS_GN2_L_MIN (0x037C)
+#define IPIPE_CGS_GN2_L_MIN (0x037c)
#define IPIPE_BOX_EN (0x0380)
#define IPIPE_BOX_MODE (0x0384)
#define IPIPE_BOX_TYP (0x0388)
-#define IPIPE_BOX_SHF (0x038C)
+#define IPIPE_BOX_SHF (0x038c)
#define IPIPE_BOX_SDR_SAD_H (0x0390)
#define IPIPE_BOX_SDR_SAD_L (0x0394)
-#define IPIPE_HST_EN (0x039C)
-#define IPIPE_HST_MODE (0x03A0)
-#define IPIPE_HST_SEL (0x03A4)
-#define IPIPE_HST_PARA (0x03A8)
-#define IPIPE_HST_0_VPS (0x03AC)
-#define IPIPE_HST_0_VSZ (0x03B0)
-#define IPIPE_HST_0_HPS (0x03B4)
-#define IPIPE_HST_0_HSZ (0x03B8)
-#define IPIPE_HST_1_VPS (0x03BC)
-#define IPIPE_HST_1_VSZ (0x03C0)
-#define IPIPE_HST_1_HPS (0x03C4)
-#define IPIPE_HST_1_HSZ (0x03C8)
-#define IPIPE_HST_2_VPS (0x03CC)
-#define IPIPE_HST_2_VSZ (0x03D0)
-#define IPIPE_HST_2_HPS (0x03D4)
-#define IPIPE_HST_2_HSZ (0x03D8)
-#define IPIPE_HST_3_VPS (0x03DC)
-#define IPIPE_HST_3_VSZ (0x03E0)
-#define IPIPE_HST_3_HPS (0x03E4)
-#define IPIPE_HST_3_HSZ (0x03E8)
-#define IPIPE_HST_TBL (0x03EC)
-#define IPIPE_HST_MUL_R (0x03F0)
-#define IPIPE_HST_MUL_GR (0x03F4)
-#define IPIPE_HST_MUL_GB (0x03F8)
-#define IPIPE_HST_MUL_B (0x03FC)
+#define IPIPE_HST_EN (0x039c)
+#define IPIPE_HST_MODE (0x03a0)
+#define IPIPE_HST_SEL (0x03a4)
+#define IPIPE_HST_PARA (0x03a8)
+#define IPIPE_HST_0_VPS (0x03ac)
+#define IPIPE_HST_0_VSZ (0x03b0)
+#define IPIPE_HST_0_HPS (0x03b4)
+#define IPIPE_HST_0_HSZ (0x03b8)
+#define IPIPE_HST_1_VPS (0x03bc)
+#define IPIPE_HST_1_VSZ (0x03c0)
+#define IPIPE_HST_1_HPS (0x03c4)
+#define IPIPE_HST_1_HSZ (0x03c8)
+#define IPIPE_HST_2_VPS (0x03cc)
+#define IPIPE_HST_2_VSZ (0x03d0)
+#define IPIPE_HST_2_HPS (0x03d4)
+#define IPIPE_HST_2_HSZ (0x03d8)
+#define IPIPE_HST_3_VPS (0x03dc)
+#define IPIPE_HST_3_VSZ (0x03e0)
+#define IPIPE_HST_3_HPS (0x03e4)
+#define IPIPE_HST_3_HSZ (0x03e8)
+#define IPIPE_HST_TBL (0x03ec)
+#define IPIPE_HST_MUL_R (0x03f0)
+#define IPIPE_HST_MUL_GR (0x03f4)
+#define IPIPE_HST_MUL_GB (0x03f8)
+#define IPIPE_HST_MUL_B (0x03fc)
#define IPIPE_BSC_EN (0x0400)
#define IPIPE_BSC_MODE (0x0404)
#define IPIPE_BSC_TYP (0x0408)
-#define IPIPE_BSC_ROW_VCT (0x040C)
+#define IPIPE_BSC_ROW_VCT (0x040c)
#define IPIPE_BSC_ROW_SHF (0x0410)
#define IPIPE_BSC_ROW_VPO (0x0414)
#define IPIPE_BSC_ROW_VNU (0x0418)
-#define IPIPE_BSC_ROW_VSKIP (0x041C)
+#define IPIPE_BSC_ROW_VSKIP (0x041c)
#define IPIPE_BSC_ROW_HPO (0x0420)
#define IPIPE_BSC_ROW_HNU (0x0424)
#define IPIPE_BSC_ROW_HSKIP (0x0428)
-#define IPIPE_BSC_COL_VCT (0x042C)
+#define IPIPE_BSC_COL_VCT (0x042c)
#define IPIPE_BSC_COL_SHF (0x0430)
#define IPIPE_BSC_COL_VPO (0x0434)
#define IPIPE_BSC_COL_VNU (0x0438)
-#define IPIPE_BSC_COL_VSKIP (0x043C)
+#define IPIPE_BSC_COL_VSKIP (0x043c)
#define IPIPE_BSC_COL_HPO (0x0440)
#define IPIPE_BSC_COL_HNU (0x0444)
#define IPIPE_BSC_COL_HSKIP (0x0448)
@@ -740,14 +740,14 @@
#define RSZ_SYSCONFIG_RSZB_CLK_EN (1 << 9)
#define RSZ_SYSCONFIG_RSZA_CLK_EN (1 << 8)
-#define RSZ_IN_FIFO_CTRL (0x000C)
-#define RSZ_IN_FIFO_CTRL_THRLD_LOW_MASK (0x1FF << 16)
+#define RSZ_IN_FIFO_CTRL (0x000c)
+#define RSZ_IN_FIFO_CTRL_THRLD_LOW_MASK (0x1ff << 16)
#define RSZ_IN_FIFO_CTRL_THRLD_LOW_SHIFT 16
-#define RSZ_IN_FIFO_CTRL_THRLD_HIGH_MASK (0x1FF << 0)
+#define RSZ_IN_FIFO_CTRL_THRLD_HIGH_MASK (0x1ff << 0)
#define RSZ_IN_FIFO_CTRL_THRLD_HIGH_SHIFT 0
#define RSZ_FRACDIV (0x0008)
-#define RSZ_FRACDIV_MASK (0xFFFF)
+#define RSZ_FRACDIV_MASK (0xffff)
#define RSZ_SRC_EN (0x0020)
#define RSZ_SRC_EN_SRC_EN (1 << 0)
@@ -760,80 +760,80 @@
#define RSZ_SRC_FMT0_BYPASS (1 << 1)
#define RSZ_SRC_FMT0_SEL (1 << 0)
-#define RSZ_SRC_FMT1 (0x002C)
+#define RSZ_SRC_FMT1 (0x002c)
#define RSZ_SRC_FMT1_IN420 (1 << 1)
#define RSZ_SRC_VPS (0x0030)
#define RSZ_SRC_VSZ (0x0034)
#define RSZ_SRC_HPS (0x0038)
-#define RSZ_SRC_HSZ (0x003C)
+#define RSZ_SRC_HSZ (0x003c)
#define RSZ_DMA_RZA (0x0040)
#define RSZ_DMA_RZB (0x0044)
#define RSZ_DMA_STA (0x0048)
-#define RSZ_GCK_MMR (0x004C)
+#define RSZ_GCK_MMR (0x004c)
#define RSZ_GCK_MMR_MMR (1 << 0)
#define RSZ_GCK_SDR (0x0054)
#define RSZ_GCK_SDR_CORE (1 << 0)
#define RSZ_IRQ_RZA (0x0058)
-#define RSZ_IRQ_RZA_MASK (0x1FFF)
+#define RSZ_IRQ_RZA_MASK (0x1fff)
-#define RSZ_IRQ_RZB (0x005C)
-#define RSZ_IRQ_RZB_MASK (0x1FFF)
+#define RSZ_IRQ_RZB (0x005c)
+#define RSZ_IRQ_RZB_MASK (0x1fff)
#define RSZ_YUV_Y_MIN (0x0060)
#define RSZ_YUV_Y_MAX (0x0064)
#define RSZ_YUV_C_MIN (0x0068)
-#define RSZ_YUV_C_MAX (0x006C)
+#define RSZ_YUV_C_MAX (0x006c)
#define RSZ_SEQ (0x0074)
#define RSZ_SEQ_HRVB (1 << 2)
#define RSZ_SEQ_HRVA (1 << 0)
#define RZA_EN (0x0078)
-#define RZA_MODE (0x007C)
+#define RZA_MODE (0x007c)
#define RZA_MODE_ONE_SHOT (1 << 0)
#define RZA_420 (0x0080)
#define RZA_I_VPS (0x0084)
#define RZA_I_HPS (0x0088)
-#define RZA_O_VSZ (0x008C)
+#define RZA_O_VSZ (0x008c)
#define RZA_O_HSZ (0x0090)
#define RZA_V_PHS_Y (0x0094)
#define RZA_V_PHS_C (0x0098)
-#define RZA_V_DIF (0x009C)
-#define RZA_V_TYP (0x00A0)
-#define RZA_V_LPF (0x00A4)
-#define RZA_H_PHS (0x00A8)
-#define RZA_H_DIF (0x00B0)
-#define RZA_H_TYP (0x00B4)
-#define RZA_H_LPF (0x00B8)
-#define RZA_DWN_EN (0x00BC)
-#define RZA_SDR_Y_BAD_H (0x00D0)
-#define RZA_SDR_Y_BAD_L (0x00D4)
-#define RZA_SDR_Y_SAD_H (0x00D8)
-#define RZA_SDR_Y_SAD_L (0x00DC)
-#define RZA_SDR_Y_OFT (0x00E0)
-#define RZA_SDR_Y_PTR_S (0x00E4)
-#define RZA_SDR_Y_PTR_E (0x00E8)
-#define RZA_SDR_C_BAD_H (0x00EC)
-#define RZA_SDR_C_BAD_L (0x00F0)
-#define RZA_SDR_C_SAD_H (0x00F4)
-#define RZA_SDR_C_SAD_L (0x00F8)
-#define RZA_SDR_C_OFT (0x00FC)
+#define RZA_V_DIF (0x009c)
+#define RZA_V_TYP (0x00a0)
+#define RZA_V_LPF (0x00a4)
+#define RZA_H_PHS (0x00a8)
+#define RZA_H_DIF (0x00b0)
+#define RZA_H_TYP (0x00b4)
+#define RZA_H_LPF (0x00b8)
+#define RZA_DWN_EN (0x00bc)
+#define RZA_SDR_Y_BAD_H (0x00d0)
+#define RZA_SDR_Y_BAD_L (0x00d4)
+#define RZA_SDR_Y_SAD_H (0x00d8)
+#define RZA_SDR_Y_SAD_L (0x00dc)
+#define RZA_SDR_Y_OFT (0x00e0)
+#define RZA_SDR_Y_PTR_S (0x00e4)
+#define RZA_SDR_Y_PTR_E (0x00e8)
+#define RZA_SDR_C_BAD_H (0x00ec)
+#define RZA_SDR_C_BAD_L (0x00f0)
+#define RZA_SDR_C_SAD_H (0x00f4)
+#define RZA_SDR_C_SAD_L (0x00f8)
+#define RZA_SDR_C_OFT (0x00fc)
#define RZA_SDR_C_PTR_S (0x0100)
#define RZA_SDR_C_PTR_E (0x0104)
#define RZB_EN (0x0108)
-#define RZB_MODE (0x010C)
+#define RZB_MODE (0x010c)
#define RZB_420 (0x0110)
#define RZB_I_VPS (0x0114)
#define RZB_I_HPS (0x0118)
-#define RZB_O_VSZ (0x011C)
+#define RZB_O_VSZ (0x011c)
#define RZB_O_HSZ (0x0120)
-#define RZB_V_DIF (0x012C)
+#define RZB_V_DIF (0x012c)
#define RZB_V_TYP (0x0130)
#define RZB_V_LPF (0x0134)
@@ -844,11 +844,11 @@
#define RZB_SDR_Y_BAD_H (0x0160)
#define RZB_SDR_Y_BAD_L (0x0164)
#define RZB_SDR_Y_SAD_H (0x0168)
-#define RZB_SDR_Y_SAD_L (0x016C)
+#define RZB_SDR_Y_SAD_L (0x016c)
#define RZB_SDR_Y_OFT (0x0170)
#define RZB_SDR_Y_PTR_S (0x0174)
#define RZB_SDR_Y_PTR_E (0x0178)
-#define RZB_SDR_C_BAD_H (0x017C)
+#define RZB_SDR_C_BAD_H (0x017c)
#define RZB_SDR_C_BAD_L (0x0180)
#define RZB_SDR_C_SAD_H (0x0184)
#define RZB_SDR_C_SAD_L (0x0188)
@@ -862,38 +862,38 @@
#define RSZ_420_CEN (1 << 1)
#define RSZ_420_YEN (1 << 0)
-#define RSZ_I_VPS_MASK (0x1FFF)
+#define RSZ_I_VPS_MASK (0x1fff)
-#define RSZ_I_HPS_MASK (0x1FFF)
+#define RSZ_I_HPS_MASK (0x1fff)
-#define RSZ_O_VSZ_MASK (0x1FFF)
+#define RSZ_O_VSZ_MASK (0x1fff)
-#define RSZ_O_HSZ_MASK (0x1FFE)
+#define RSZ_O_HSZ_MASK (0x1ffe)
-#define RSZ_V_PHS_Y_MASK (0x3FFF)
+#define RSZ_V_PHS_Y_MASK (0x3fff)
-#define RSZ_V_PHS_C_MASK (0x3FFF)
+#define RSZ_V_PHS_C_MASK (0x3fff)
-#define RSZ_V_DIF_MASK (0x3FFF)
+#define RSZ_V_DIF_MASK (0x3fff)
#define RSZ_V_TYP_C (1 << 1)
#define RSZ_V_TYP_Y (1 << 0)
-#define RSZ_V_LPF_C_MASK (0x3F << 6)
+#define RSZ_V_LPF_C_MASK (0x3f << 6)
#define RSZ_V_LPF_C_SHIFT 6
-#define RSZ_V_LPF_Y_MASK (0x3F << 0)
+#define RSZ_V_LPF_Y_MASK (0x3f << 0)
#define RSZ_V_LPF_Y_SHIFT 0
-#define RSZ_H_PHS_MASK (0x3FFF)
+#define RSZ_H_PHS_MASK (0x3fff)
-#define RSZ_H_DIF_MASK (0x3FFF)
+#define RSZ_H_DIF_MASK (0x3fff)
#define RSZ_H_TYP_C (1 << 1)
#define RSZ_H_TYP_Y (1 << 0)
-#define RSZ_H_LPF_C_MASK (0x3F << 6)
+#define RSZ_H_LPF_C_MASK (0x3f << 6)
#define RSZ_H_LPF_C_SHIFT 6
-#define RSZ_H_LPF_Y_MASK (0x3F << 0)
+#define RSZ_H_LPF_Y_MASK (0x3f << 0)
#define RSZ_H_LPF_Y_SHIFT 0
#define RSZ_DWN_EN_DWN_EN (1 << 0)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 17/25] v4l: omap4iss: Add description field to iss_format_info structure
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (15 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 16/25] v4l: omap4iss: Convert hexadecimal constants to lower case Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 18/25] v4l: omap4iss: Make __iss_video_get_format() return a v4l2_mbus_framefmt Laurent Pinchart
` (7 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
The field stores the format description in a human-readable form.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_video.c | 38 +++++++++++++++---------------
drivers/staging/media/omap4iss/iss_video.h | 2 ++
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 7763b8d..b4ffde8 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -33,61 +33,61 @@
static struct iss_format_info formats[] = {
{ V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
- V4L2_PIX_FMT_GREY, 8, },
+ V4L2_PIX_FMT_GREY, 8, "Greyscale 8 bpp", },
{ V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y10_1X10,
V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y8_1X8,
- V4L2_PIX_FMT_Y10, 10, },
+ V4L2_PIX_FMT_Y10, 10, "Greyscale 10 bpp", },
{ V4L2_MBUS_FMT_Y12_1X12, V4L2_MBUS_FMT_Y10_1X10,
V4L2_MBUS_FMT_Y12_1X12, V4L2_MBUS_FMT_Y8_1X8,
- V4L2_PIX_FMT_Y12, 12, },
+ V4L2_PIX_FMT_Y12, 12, "Greyscale 12 bpp", },
{ V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_MBUS_FMT_SBGGR8_1X8,
V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_MBUS_FMT_SBGGR8_1X8,
- V4L2_PIX_FMT_SBGGR8, 8, },
+ V4L2_PIX_FMT_SBGGR8, 8, "BGGR Bayer 8 bpp", },
{ V4L2_MBUS_FMT_SGBRG8_1X8, V4L2_MBUS_FMT_SGBRG8_1X8,
V4L2_MBUS_FMT_SGBRG8_1X8, V4L2_MBUS_FMT_SGBRG8_1X8,
- V4L2_PIX_FMT_SGBRG8, 8, },
+ V4L2_PIX_FMT_SGBRG8, 8, "GBRG Bayer 8 bpp", },
{ V4L2_MBUS_FMT_SGRBG8_1X8, V4L2_MBUS_FMT_SGRBG8_1X8,
V4L2_MBUS_FMT_SGRBG8_1X8, V4L2_MBUS_FMT_SGRBG8_1X8,
- V4L2_PIX_FMT_SGRBG8, 8, },
+ V4L2_PIX_FMT_SGRBG8, 8, "GRBG Bayer 8 bpp", },
{ V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,
V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,
- V4L2_PIX_FMT_SRGGB8, 8, },
+ V4L2_PIX_FMT_SRGGB8, 8, "RGGB Bayer 8 bpp", },
{ V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
V4L2_MBUS_FMT_SGRBG10_1X10, 0,
- V4L2_PIX_FMT_SGRBG10DPCM8, 8, },
+ V4L2_PIX_FMT_SGRBG10DPCM8, 8, "GRBG Bayer 10 bpp DPCM8", },
{ V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR10_1X10,
V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR8_1X8,
- V4L2_PIX_FMT_SBGGR10, 10, },
+ V4L2_PIX_FMT_SBGGR10, 10, "BGGR Bayer 10 bpp", },
{ V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG10_1X10,
V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG8_1X8,
- V4L2_PIX_FMT_SGBRG10, 10, },
+ V4L2_PIX_FMT_SGBRG10, 10, "GBRG Bayer 10 bpp", },
{ V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG10_1X10,
V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG8_1X8,
- V4L2_PIX_FMT_SGRBG10, 10, },
+ V4L2_PIX_FMT_SGRBG10, 10, "GRBG Bayer 10 bpp", },
{ V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB10_1X10,
V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB8_1X8,
- V4L2_PIX_FMT_SRGGB10, 10, },
+ V4L2_PIX_FMT_SRGGB10, 10, "RGGB Bayer 10 bpp", },
{ V4L2_MBUS_FMT_SBGGR12_1X12, V4L2_MBUS_FMT_SBGGR10_1X10,
V4L2_MBUS_FMT_SBGGR12_1X12, V4L2_MBUS_FMT_SBGGR8_1X8,
- V4L2_PIX_FMT_SBGGR12, 12, },
+ V4L2_PIX_FMT_SBGGR12, 12, "BGGR Bayer 12 bpp", },
{ V4L2_MBUS_FMT_SGBRG12_1X12, V4L2_MBUS_FMT_SGBRG10_1X10,
V4L2_MBUS_FMT_SGBRG12_1X12, V4L2_MBUS_FMT_SGBRG8_1X8,
- V4L2_PIX_FMT_SGBRG12, 12, },
+ V4L2_PIX_FMT_SGBRG12, 12, "GBRG Bayer 12 bpp", },
{ V4L2_MBUS_FMT_SGRBG12_1X12, V4L2_MBUS_FMT_SGRBG10_1X10,
V4L2_MBUS_FMT_SGRBG12_1X12, V4L2_MBUS_FMT_SGRBG8_1X8,
- V4L2_PIX_FMT_SGRBG12, 12, },
+ V4L2_PIX_FMT_SGRBG12, 12, "GRBG Bayer 12 bpp", },
{ V4L2_MBUS_FMT_SRGGB12_1X12, V4L2_MBUS_FMT_SRGGB10_1X10,
V4L2_MBUS_FMT_SRGGB12_1X12, V4L2_MBUS_FMT_SRGGB8_1X8,
- V4L2_PIX_FMT_SRGGB12, 12, },
+ V4L2_PIX_FMT_SRGGB12, 12, "RGGB Bayer 12 bpp", },
{ V4L2_MBUS_FMT_UYVY8_1X16, V4L2_MBUS_FMT_UYVY8_1X16,
V4L2_MBUS_FMT_UYVY8_1X16, 0,
- V4L2_PIX_FMT_UYVY, 16, },
+ V4L2_PIX_FMT_UYVY, 16, "YUV 4:2:2 (UYVY)", },
{ V4L2_MBUS_FMT_YUYV8_1X16, V4L2_MBUS_FMT_YUYV8_1X16,
V4L2_MBUS_FMT_YUYV8_1X16, 0,
- V4L2_PIX_FMT_YUYV, 16, },
+ V4L2_PIX_FMT_YUYV, 16, "YUV 4:2:2 (YUYV)", },
{ V4L2_MBUS_FMT_YUYV8_1_5X8, V4L2_MBUS_FMT_YUYV8_1_5X8,
V4L2_MBUS_FMT_YUYV8_1_5X8, 0,
- V4L2_PIX_FMT_NV12, 8, },
+ V4L2_PIX_FMT_NV12, 8, "YUV 4:2:0 (NV12)", },
};
const struct iss_format_info *
diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
index 35f14d8..2c8d256 100644
--- a/drivers/staging/media/omap4iss/iss_video.h
+++ b/drivers/staging/media/omap4iss/iss_video.h
@@ -40,6 +40,7 @@ struct v4l2_pix_format;
* shifted to be 8 bits per pixel. =0 if format is not shiftable.
* @pixelformat: V4L2 pixel format FCC identifier
* @bpp: Bits per pixel
+ * @description: Human-readable format description
*/
struct iss_format_info {
enum v4l2_mbus_pixelcode code;
@@ -48,6 +49,7 @@ struct iss_format_info {
enum v4l2_mbus_pixelcode flavor;
u32 pixelformat;
unsigned int bpp;
+ const char *description;
};
enum iss_pipeline_stream_state {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 18/25] v4l: omap4iss: Make __iss_video_get_format() return a v4l2_mbus_framefmt
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (16 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 17/25] v4l: omap4iss: Add description field to iss_format_info structure Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 19/25] v4l: omap4iss: Add enum_fmt_vid_cap ioctl support Laurent Pinchart
` (6 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
The function will be used by a caller that needs the media bus format
instead of the pixel format currently returned. Move the media bus
format to pixel format conversion to the existing caller.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_video.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index b4ffde8..5dbd774 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -232,7 +232,8 @@ iss_video_far_end(struct iss_video *video)
}
static int
-__iss_video_get_format(struct iss_video *video, struct v4l2_format *format)
+__iss_video_get_format(struct iss_video *video,
+ struct v4l2_mbus_framefmt *format)
{
struct v4l2_subdev_format fmt;
struct v4l2_subdev *subdev;
@@ -243,6 +244,7 @@ __iss_video_get_format(struct iss_video *video, struct v4l2_format *format)
if (subdev == NULL)
return -EINVAL;
+ memset(&fmt, 0, sizeof(fmt));
fmt.pad = pad;
fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
@@ -253,26 +255,29 @@ __iss_video_get_format(struct iss_video *video, struct v4l2_format *format)
if (ret)
return ret;
- format->type = video->type;
- return iss_video_mbus_to_pix(video, &fmt.format, &format->fmt.pix);
+ *format = fmt.format;
+ return 0;
}
static int
iss_video_check_format(struct iss_video *video, struct iss_video_fh *vfh)
{
- struct v4l2_format format;
+ struct v4l2_mbus_framefmt format;
+ struct v4l2_pix_format pixfmt;
int ret;
- memcpy(&format, &vfh->format, sizeof(format));
ret = __iss_video_get_format(video, &format);
if (ret < 0)
return ret;
- if (vfh->format.fmt.pix.pixelformat != format.fmt.pix.pixelformat ||
- vfh->format.fmt.pix.height != format.fmt.pix.height ||
- vfh->format.fmt.pix.width != format.fmt.pix.width ||
- vfh->format.fmt.pix.bytesperline != format.fmt.pix.bytesperline ||
- vfh->format.fmt.pix.sizeimage != format.fmt.pix.sizeimage)
+ pixfmt.bytesperline = 0;
+ ret = iss_video_mbus_to_pix(video, &format, &pixfmt);
+
+ if (vfh->format.fmt.pix.pixelformat != pixfmt.pixelformat ||
+ vfh->format.fmt.pix.height != pixfmt.height ||
+ vfh->format.fmt.pix.width != pixfmt.width ||
+ vfh->format.fmt.pix.bytesperline != pixfmt.bytesperline ||
+ vfh->format.fmt.pix.sizeimage != pixfmt.sizeimage)
return -EINVAL;
return ret;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 19/25] v4l: omap4iss: Add enum_fmt_vid_cap ioctl support
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (17 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 18/25] v4l: omap4iss: Make __iss_video_get_format() return a v4l2_mbus_framefmt Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 20/25] v4l: omap4iss: Propagate stop timeouts from submodules to the driver core Laurent Pinchart
` (5 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
List the pixel formats compatible with the active format currently
configured on the connected pad.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_video.c | 36 ++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 5dbd774..68eab6e 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -496,6 +496,41 @@ iss_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
}
static int
+iss_video_enum_format(struct file *file, void *fh, struct v4l2_fmtdesc *f)
+{
+ struct iss_video *video = video_drvdata(file);
+ struct v4l2_mbus_framefmt format;
+ unsigned int index = f->index;
+ unsigned int i;
+ int ret;
+
+ if (f->type != video->type)
+ return -EINVAL;
+
+ ret = __iss_video_get_format(video, &format);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < ARRAY_SIZE(formats); ++i) {
+ const struct iss_format_info *info = &formats[i];
+
+ if (format.code != info->code)
+ continue;
+
+ if (index == 0) {
+ f->pixelformat = info->pixelformat;
+ strlcpy(f->description, info->description,
+ sizeof(f->description));
+ return 0;
+ }
+
+ index--;
+ }
+
+ return -EINVAL;
+}
+
+static int
iss_video_get_format(struct file *file, void *fh, struct v4l2_format *format)
{
struct iss_video_fh *vfh = to_iss_video_fh(fh);
@@ -918,6 +953,7 @@ iss_video_s_input(struct file *file, void *fh, unsigned int input)
static const struct v4l2_ioctl_ops iss_video_ioctl_ops = {
.vidioc_querycap = iss_video_querycap,
+ .vidioc_enum_fmt_vid_cap = iss_video_enum_format,
.vidioc_g_fmt_vid_cap = iss_video_get_format,
.vidioc_s_fmt_vid_cap = iss_video_set_format,
.vidioc_try_fmt_vid_cap = iss_video_try_format,
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 20/25] v4l: omap4iss: Propagate stop timeouts from submodules to the driver core
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (18 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 19/25] v4l: omap4iss: Add enum_fmt_vid_cap ioctl support Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 21/25] v4l: omap4iss: Enable/disabling the ISP interrupts globally Laurent Pinchart
` (4 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Return an error from the s_stream handlers when stopping the stream
failed instead of just logging the error and ignoring it. While we're
at it, move the logging code from submodules to the driver code.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 11 +++++++++--
drivers/staging/media/omap4iss/iss_csi2.c | 8 +++-----
drivers/staging/media/omap4iss/iss_ipipe.c | 3 +--
drivers/staging/media/omap4iss/iss_ipipeif.c | 3 +--
drivers/staging/media/omap4iss/iss_resizer.c | 3 +--
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index ba8460d..a0bf2f3 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -614,6 +614,8 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe)
struct media_entity *entity;
struct media_pad *pad;
struct v4l2_subdev *subdev;
+ int failure = 0;
+ int ret;
entity = &pipe->output->video.entity;
while (1) {
@@ -629,10 +631,15 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe)
entity = pad->entity;
subdev = media_entity_to_v4l2_subdev(entity);
- v4l2_subdev_call(subdev, video, s_stream, 0);
+ ret = v4l2_subdev_call(subdev, video, s_stream, 0);
+ if (ret < 0) {
+ dev_dbg(iss->dev, "%s: module stop timeout.\n",
+ subdev->name);
+ failure = -ETIMEDOUT;
+ }
}
- return 0;
+ return failure;
}
/*
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index 077545f..7e7e955 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -1056,6 +1056,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable)
struct iss_device *iss = csi2->iss;
struct iss_pipeline *pipe = to_iss_pipeline(&csi2->subdev.entity);
struct iss_video *video_out = &csi2->video_out;
+ int ret = 0;
if (csi2->state == ISS_PIPELINE_STREAM_STOPPED) {
if (enable == ISS_PIPELINE_STREAM_STOPPED)
@@ -1069,8 +1070,6 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable)
switch (enable) {
case ISS_PIPELINE_STREAM_CONTINUOUS: {
- int ret;
-
ret = omap4iss_csiphy_config(iss, sd);
if (ret < 0)
return ret;
@@ -1102,8 +1101,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable)
return 0;
if (omap4iss_module_sync_idle(&sd->entity, &csi2->wait,
&csi2->stopping))
- dev_dbg(iss->dev, "%s: module stop timeout.\n",
- sd->name);
+ ret = -ETIMEDOUT;
csi2_ctx_enable(csi2, 0, 0);
csi2_if_enable(csi2, 0);
csi2_irq_ctx_set(csi2, 0);
@@ -1117,7 +1115,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable)
}
csi2->state = enable;
- return 0;
+ return ret;
}
/* subdev video operations */
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c
index d0b9f8c..c013f83 100644
--- a/drivers/staging/media/omap4iss/iss_ipipe.c
+++ b/drivers/staging/media/omap4iss/iss_ipipe.c
@@ -166,8 +166,7 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable)
return 0;
if (omap4iss_module_sync_idle(&sd->entity, &ipipe->wait,
&ipipe->stopping))
- dev_dbg(iss->dev, "%s: module stop timeout.\n",
- sd->name);
+ ret = -ETIMEDOUT;
ipipe_enable(ipipe, 0);
omap4iss_isp_disable_interrupts(iss);
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 2d11f62..00bc937 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -363,8 +363,7 @@ static int ipipeif_set_stream(struct v4l2_subdev *sd, int enable)
return 0;
if (omap4iss_module_sync_idle(&sd->entity, &ipipeif->wait,
&ipipeif->stopping))
- dev_dbg(iss->dev, "%s: module stop timeout.\n",
- sd->name);
+ ret = -ETIMEDOUT;
if (ipipeif->output & IPIPEIF_OUTPUT_MEMORY)
ipipeif_write_enable(ipipeif, 0);
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 5bf5080..9dbf018 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -416,8 +416,7 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable)
return 0;
if (omap4iss_module_sync_idle(&sd->entity, &resizer->wait,
&resizer->stopping))
- dev_dbg(iss->dev, "%s: module stop timeout.\n",
- sd->name);
+ ret = -ETIMEDOUT;
resizer_enable(resizer, 0);
omap4iss_isp_disable_interrupts(iss);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 21/25] v4l: omap4iss: Enable/disabling the ISP interrupts globally
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (19 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 20/25] v4l: omap4iss: Propagate stop timeouts from submodules to the driver core Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 22/25] v4l: omap4iss: Reset the ISS when the pipeline can't be stopped Laurent Pinchart
` (3 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
ISP interrupts are enabled/disabled when starting/stopping the IPIPEIF
or resizer. This doesn't permit using the two modules in separate
pipelines. Fix it by enabling/disabling the ISP interrupts at the same
time as the ISS interrupts, in the ISS device get/put operations.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 54 +++++++++++++++-------------
drivers/staging/media/omap4iss/iss.h | 3 --
drivers/staging/media/omap4iss/iss_ipipe.c | 3 --
drivers/staging/media/omap4iss/iss_ipipeif.c | 3 --
drivers/staging/media/omap4iss/iss_resizer.c | 3 --
5 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index a0bf2f3..dffa31e 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -67,53 +67,59 @@ void omap4iss_flush(struct iss_device *iss)
}
/*
- * iss_enable_interrupts - Enable ISS interrupts.
+ * iss_isp_enable_interrupts - Enable ISS ISP interrupts.
* @iss: OMAP4 ISS device
*/
-static void iss_enable_interrupts(struct iss_device *iss)
+static void omap4iss_isp_enable_interrupts(struct iss_device *iss)
{
- static const u32 hl_irq = ISS_HL_IRQ_CSIA | ISS_HL_IRQ_CSIB | ISS_HL_IRQ_ISP(0);
-
- /* Enable HL interrupts */
- iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQSTATUS(5), hl_irq);
- iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQENABLE_SET(5), hl_irq);
+ static const u32 isp_irq = ISP5_IRQ_OCP_ERR |
+ ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR |
+ ISP5_IRQ_RSZ_FIFO_OVF |
+ ISP5_IRQ_RSZ_INT_DMA |
+ ISP5_IRQ_ISIF_INT(0);
+ /* Enable ISP interrupts */
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQSTATUS(0), isp_irq);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQENABLE_SET(0),
+ isp_irq);
}
/*
- * iss_disable_interrupts - Disable ISS interrupts.
+ * iss_isp_disable_interrupts - Disable ISS interrupts.
* @iss: OMAP4 ISS device
*/
-static void iss_disable_interrupts(struct iss_device *iss)
+static void omap4iss_isp_disable_interrupts(struct iss_device *iss)
{
- iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQENABLE_CLR(5), -1);
+ iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQENABLE_CLR(0), ~0);
}
/*
- * iss_isp_enable_interrupts - Enable ISS ISP interrupts.
+ * iss_enable_interrupts - Enable ISS interrupts.
* @iss: OMAP4 ISS device
*/
-void omap4iss_isp_enable_interrupts(struct iss_device *iss)
+static void iss_enable_interrupts(struct iss_device *iss)
{
- static const u32 isp_irq = ISP5_IRQ_OCP_ERR |
- ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR |
- ISP5_IRQ_RSZ_FIFO_OVF |
- ISP5_IRQ_RSZ_INT_DMA |
- ISP5_IRQ_ISIF_INT(0);
+ static const u32 hl_irq = ISS_HL_IRQ_CSIA | ISS_HL_IRQ_CSIB
+ | ISS_HL_IRQ_ISP(0);
- /* Enable ISP interrupts */
- iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQSTATUS(0), isp_irq);
- iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQENABLE_SET(0),
- isp_irq);
+ /* Enable HL interrupts */
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQSTATUS(5), hl_irq);
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQENABLE_SET(5), hl_irq);
+
+ if (iss->regs[OMAP4_ISS_MEM_ISP_SYS1])
+ omap4iss_isp_enable_interrupts(iss);
}
/*
- * iss_isp_disable_interrupts - Disable ISS interrupts.
+ * iss_disable_interrupts - Disable ISS interrupts.
* @iss: OMAP4 ISS device
*/
-void omap4iss_isp_disable_interrupts(struct iss_device *iss)
+static void iss_disable_interrupts(struct iss_device *iss)
{
- iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_IRQENABLE_CLR(0), -1);
+ if (iss->regs[OMAP4_ISS_MEM_ISP_SYS1])
+ omap4iss_isp_disable_interrupts(iss);
+
+ iss_reg_write(iss, OMAP4_ISS_MEM_TOP, ISS_HL_IRQENABLE_CLR(5), ~0);
}
int omap4iss_get_external_info(struct iss_pipeline *pipe,
diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index 660809e..f63caaf 100644
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -141,9 +141,6 @@ void omap4iss_isp_subclk_enable(struct iss_device *iss,
void omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res);
-void omap4iss_isp_enable_interrupts(struct iss_device *iss);
-void omap4iss_isp_disable_interrupts(struct iss_device *iss);
-
int omap4iss_pipeline_pm_use(struct media_entity *entity, int use);
int omap4iss_register_entities(struct platform_device *pdev,
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c
index c013f83..6eaafc5 100644
--- a/drivers/staging/media/omap4iss/iss_ipipe.c
+++ b/drivers/staging/media/omap4iss/iss_ipipe.c
@@ -116,8 +116,6 @@ static void ipipe_configure(struct iss_ipipe_device *ipipe)
/* IPIPE_PAD_SOURCE_VP */
format = &ipipe->formats[IPIPE_PAD_SOURCE_VP];
/* Do nothing? */
-
- omap4iss_isp_enable_interrupts(iss);
}
/* -----------------------------------------------------------------------------
@@ -169,7 +167,6 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable)
ret = -ETIMEDOUT;
ipipe_enable(ipipe, 0);
- omap4iss_isp_disable_interrupts(iss);
omap4iss_isp_subclk_disable(iss, OMAP4_ISS_ISP_SUBCLK_IPIPE);
break;
}
diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 00bc937..7bc1457 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -213,8 +213,6 @@ cont_raw:
/* IPIPEIF_PAD_SOURCE_VP */
/* Do nothing? */
-
- omap4iss_isp_enable_interrupts(iss);
}
/* -----------------------------------------------------------------------------
@@ -368,7 +366,6 @@ static int ipipeif_set_stream(struct v4l2_subdev *sd, int enable)
if (ipipeif->output & IPIPEIF_OUTPUT_MEMORY)
ipipeif_write_enable(ipipeif, 0);
ipipeif_enable(ipipeif, 0);
- omap4iss_isp_disable_interrupts(iss);
omap4iss_isp_subclk_disable(iss, IPIPEIF_DRV_SUBCLK_MASK);
iss_video_dmaqueue_flags_clr(video_out);
break;
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 9dbf018..4673c05 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -256,8 +256,6 @@ static void resizer_configure(struct iss_resizer_device *resizer)
} else {
iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_420, 0);
}
-
- omap4iss_isp_enable_interrupts(iss);
}
/* -----------------------------------------------------------------------------
@@ -419,7 +417,6 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable)
ret = -ETIMEDOUT;
resizer_enable(resizer, 0);
- omap4iss_isp_disable_interrupts(iss);
iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SYSCONFIG,
RSZ_SYSCONFIG_RSZA_CLK_EN);
iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_GCK_SDR,
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 22/25] v4l: omap4iss: Reset the ISS when the pipeline can't be stopped
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (20 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 21/25] v4l: omap4iss: Enable/disabling the ISP interrupts globally Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 23/25] v4l: omap4iss: csi2: Replace manual if statement with a subclk field Laurent Pinchart
` (2 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
When a failure to stop a module in the pipeline is detected, the only
way to recover is to reset the ISS. However, as other users can be using
a different pipeline with other modules, the ISS can't be reset
synchronously with the error detection.
Keep track of modules that have failed to stop, and reset the ISS
accordingly when the last user releases the last reference to the ISS.
Refuse to start streaming on a pipeline that contains a crashed module,
as the hardware wouldn't work anyway.
Modify the omap4iss_pipeline_set_stream() function to record the new ISS
pipeline state only when no error occurs, except when stopping the
pipeline in which case the pipeline is still marked as stopped.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 24 ++++++++++++++++++++++++
drivers/staging/media/omap4iss/iss.h | 5 +++++
drivers/staging/media/omap4iss/iss_video.c | 8 ++++++++
drivers/staging/media/omap4iss/iss_video.h | 2 ++
4 files changed, 39 insertions(+)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index dffa31e..5ad604d 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -573,12 +573,22 @@ static int iss_pipeline_link_notify(struct media_link *link, u32 flags,
static int iss_pipeline_enable(struct iss_pipeline *pipe,
enum iss_pipeline_stream_state mode)
{
+ struct iss_device *iss = pipe->output->iss;
struct media_entity *entity;
struct media_pad *pad;
struct v4l2_subdev *subdev;
unsigned long flags;
int ret;
+ /* If one of the entities in the pipeline has crashed it will not work
+ * properly. Refuse to start streaming in that case. This check must be
+ * performed before the loop below to avoid starting entities if the
+ * pipeline won't start anyway (those entities would then likely fail to
+ * stop, making the problem worse).
+ */
+ if (pipe->entities & iss->crashed)
+ return -EIO;
+
spin_lock_irqsave(&pipe->lock, flags);
pipe->state &= ~(ISS_PIPELINE_IDLE_INPUT | ISS_PIPELINE_IDLE_OUTPUT);
spin_unlock_irqrestore(&pipe->lock, flags);
@@ -617,6 +627,7 @@ static int iss_pipeline_enable(struct iss_pipeline *pipe,
*/
static int iss_pipeline_disable(struct iss_pipeline *pipe)
{
+ struct iss_device *iss = pipe->output->iss;
struct media_entity *entity;
struct media_pad *pad;
struct v4l2_subdev *subdev;
@@ -641,6 +652,11 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe)
if (ret < 0) {
dev_dbg(iss->dev, "%s: module stop timeout.\n",
subdev->name);
+ /* If the entity failed to stopped, assume it has
+ * crashed. Mark it as such, the ISS will be reset when
+ * applications will release it.
+ */
+ iss->crashed |= 1U << subdev->entity.id;
failure = -ETIMEDOUT;
}
}
@@ -715,6 +731,7 @@ static int iss_reset(struct iss_device *iss)
usleep_range(10, 10);
}
+ iss->crashed = 0;
return 0;
}
@@ -1058,6 +1075,13 @@ void omap4iss_put(struct iss_device *iss)
BUG_ON(iss->ref_count == 0);
if (--iss->ref_count == 0) {
iss_disable_interrupts(iss);
+ /* Reset the ISS if an entity has failed to stop. This is the
+ * only way to recover from such conditions, although it would
+ * be worth investigating whether resetting the ISP only can't
+ * fix the problem in some cases.
+ */
+ if (iss->crashed)
+ iss_reset(iss);
iss_disable_clocks(iss);
}
mutex_unlock(&iss->iss_mutex);
diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index f63caaf..3c1e920 100644
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -77,6 +77,10 @@ struct iss_reg {
u32 val;
};
+/*
+ * struct iss_device - ISS device structure.
+ * @crashed: Bitmask of crashed entities (indexed by entity ID)
+ */
struct iss_device {
struct v4l2_device v4l2_dev;
struct media_device media_dev;
@@ -93,6 +97,7 @@ struct iss_device {
u64 raw_dmamask;
struct mutex iss_mutex; /* For handling ref_count field */
+ bool crashed;
int has_context;
int ref_count;
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 68eab6e..9106487 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -772,6 +772,8 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
{
struct iss_video_fh *vfh = to_iss_video_fh(fh);
struct iss_video *video = video_drvdata(file);
+ struct media_entity_graph graph;
+ struct media_entity *entity;
enum iss_pipeline_state state;
struct iss_pipeline *pipe;
struct iss_video *far_end;
@@ -791,6 +793,7 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
pipe->external = NULL;
pipe->external_rate = 0;
pipe->external_bpp = 0;
+ pipe->entities = 0;
if (video->iss->pdata->set_constraints)
video->iss->pdata->set_constraints(video->iss, true);
@@ -799,6 +802,11 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
if (ret < 0)
goto err_media_entity_pipeline_start;
+ entity = &video->video.entity;
+ media_entity_graph_walk_start(&graph, entity);
+ while ((entity = media_entity_graph_walk_next(&graph)))
+ pipe->entities |= 1 << entity->id;
+
/* Verify that the currently configured format matches the output of
* the connected subdev.
*/
diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
index 2c8d256..73e1a34 100644
--- a/drivers/staging/media/omap4iss/iss_video.h
+++ b/drivers/staging/media/omap4iss/iss_video.h
@@ -77,6 +77,7 @@ enum iss_pipeline_state {
/*
* struct iss_pipeline - An OMAP4 ISS hardware pipeline
+ * @entities: Bitmask of entities in the pipeline (indexed by entity ID)
* @error: A hardware error occurred during capture
*/
struct iss_pipeline {
@@ -86,6 +87,7 @@ struct iss_pipeline {
enum iss_pipeline_stream_state stream_state;
struct iss_video *input;
struct iss_video *output;
+ unsigned int entities;
atomic_t frame_number;
bool do_propagation; /* of frame number */
bool error;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 23/25] v4l: omap4iss: csi2: Replace manual if statement with a subclk field
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (21 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 22/25] v4l: omap4iss: Reset the ISS when the pipeline can't be stopped Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 24/25] v4l: omap4iss: Cancel streaming when a fatal error occurs Laurent Pinchart
2013-12-04 0:56 ` [PATCH 25/25] v4l: omap4iss: resizer: Fix comment regarding bypass mode Laurent Pinchart
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
Instead of manually checking whether the CSI2 module is CSI2a or CSI2b
in order to select the right subclock to enable/disable, add a subclk
field to the iss_csi2 structure, initialize it with the corresponding
subclock value and use it at runtime.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_csi2.c | 12 ++++--------
drivers/staging/media/omap4iss/iss_csi2.h | 2 ++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index 7e7e955..e4fc4a0 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -1062,10 +1062,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable)
if (enable == ISS_PIPELINE_STREAM_STOPPED)
return 0;
- if (csi2 == &iss->csi2a)
- omap4iss_subclk_enable(iss, OMAP4_ISS_SUBCLK_CSI2_A);
- else if (csi2 == &iss->csi2b)
- omap4iss_subclk_enable(iss, OMAP4_ISS_SUBCLK_CSI2_B);
+ omap4iss_subclk_enable(iss, csi2->subclk);
}
switch (enable) {
@@ -1106,10 +1103,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable)
csi2_if_enable(csi2, 0);
csi2_irq_ctx_set(csi2, 0);
omap4iss_csiphy_release(csi2->phy);
- if (csi2 == &iss->csi2a)
- omap4iss_subclk_disable(iss, OMAP4_ISS_SUBCLK_CSI2_A);
- else if (csi2 == &iss->csi2b)
- omap4iss_subclk_disable(iss, OMAP4_ISS_SUBCLK_CSI2_B);
+ omap4iss_subclk_disable(iss, csi2->subclk);
iss_video_dmaqueue_flags_clr(video_out);
break;
}
@@ -1311,6 +1305,7 @@ int omap4iss_csi2_init(struct iss_device *iss)
csi2a->available = 1;
csi2a->regs1 = OMAP4_ISS_MEM_CSI2_A_REGS1;
csi2a->phy = &iss->csiphy1;
+ csi2a->subclk = OMAP4_ISS_SUBCLK_CSI2_A;
csi2a->state = ISS_PIPELINE_STREAM_STOPPED;
init_waitqueue_head(&csi2a->wait);
@@ -1322,6 +1317,7 @@ int omap4iss_csi2_init(struct iss_device *iss)
csi2b->available = 1;
csi2b->regs1 = OMAP4_ISS_MEM_CSI2_B_REGS1;
csi2b->phy = &iss->csiphy2;
+ csi2b->subclk = OMAP4_ISS_SUBCLK_CSI2_B;
csi2b->state = ISS_PIPELINE_STREAM_STOPPED;
init_waitqueue_head(&csi2b->wait);
diff --git a/drivers/staging/media/omap4iss/iss_csi2.h b/drivers/staging/media/omap4iss/iss_csi2.h
index 69a6263..971aa7b 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.h
+++ b/drivers/staging/media/omap4iss/iss_csi2.h
@@ -131,6 +131,8 @@ struct iss_csi2_device {
/* memory resources, as defined in enum iss_mem_resources */
unsigned int regs1;
unsigned int regs2;
+ /* ISP subclock, as defined in enum iss_isp_subclk_resource */
+ unsigned int subclk;
u32 output; /* output to IPIPEIF, memory or both? */
bool dpcm_decompress;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 24/25] v4l: omap4iss: Cancel streaming when a fatal error occurs
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (22 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 23/25] v4l: omap4iss: csi2: Replace manual if statement with a subclk field Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
2013-12-04 0:56 ` [PATCH 25/25] v4l: omap4iss: resizer: Fix comment regarding bypass mode Laurent Pinchart
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
When a fatal error that prevents any further video streaming occurs in a
pipeline, all queued buffers must be marked as erroneous and new buffers
must be prevented from being queued. Implement this behaviour with a new
omap4iss_pipeline_cancel_stream() function that can be used by
submodules to cancel streaming.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss.c | 17 ++++++++++
drivers/staging/media/omap4iss/iss.h | 1 +
drivers/staging/media/omap4iss/iss_resizer.c | 2 +-
drivers/staging/media/omap4iss/iss_video.c | 47 +++++++++++++++++++++++++++-
drivers/staging/media/omap4iss/iss_video.h | 4 ++-
5 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 5ad604d..61fbfcd 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -693,6 +693,23 @@ int omap4iss_pipeline_set_stream(struct iss_pipeline *pipe,
}
/*
+ * omap4iss_pipeline_cancel_stream - Cancel stream on a pipeline
+ * @pipe: ISS pipeline
+ *
+ * Cancelling a stream mark all buffers on all video nodes in the pipeline as
+ * erroneous and makes sure no new buffer can be queued. This function is called
+ * when a fatal error that prevents any further operation on the pipeline
+ * occurs.
+ */
+void omap4iss_pipeline_cancel_stream(struct iss_pipeline *pipe)
+{
+ if (pipe->input)
+ omap4iss_video_cancel_stream(pipe->input);
+ if (pipe->output)
+ omap4iss_video_cancel_stream(pipe->output);
+}
+
+/*
* iss_pipeline_is_last - Verify if entity has an enabled link to the output
* video node
* @me: ISS module's media entity
diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index 3c1e920..346db92 100644
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -131,6 +131,7 @@ int omap4iss_module_sync_is_stopping(wait_queue_head_t *wait,
int omap4iss_pipeline_set_stream(struct iss_pipeline *pipe,
enum iss_pipeline_stream_state state);
+void omap4iss_pipeline_cancel_stream(struct iss_pipeline *pipe);
void omap4iss_configure_bridge(struct iss_device *iss,
enum ipipeif_input_entity input);
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index 4673c05..c6225d8 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -312,7 +312,7 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n",
events & ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR ? 1 : 0,
events & ISP5_IRQ_RSZ_FIFO_OVF ? 1 : 0);
- pipe->error = true;
+ omap4iss_pipeline_cancel_stream(pipe);
}
if (omap4iss_module_sync_is_stopping(&resizer->wait,
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 9106487..482b72f 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -328,6 +328,15 @@ static int iss_video_buf_prepare(struct vb2_buffer *vb)
if (vb2_plane_size(vb, 0) < size)
return -ENOBUFS;
+ /* Refuse to prepare the buffer is the video node has registered an
+ * error. We don't need to take any lock here as the operation is
+ * inherently racy. The authoritative check will be performed in the
+ * queue handler, which can't return an error, this check is just a best
+ * effort to notify userspace as early as possible.
+ */
+ if (unlikely(video->error))
+ return -EIO;
+
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
if (!IS_ALIGNED(addr, 32)) {
dev_dbg(video->iss->dev,
@@ -346,12 +355,20 @@ static void iss_video_buf_queue(struct vb2_buffer *vb)
struct iss_video *video = vfh->video;
struct iss_buffer *buffer = container_of(vb, struct iss_buffer, vb);
struct iss_pipeline *pipe = to_iss_pipeline(&video->video.entity);
- unsigned int empty;
unsigned long flags;
+ bool empty;
spin_lock_irqsave(&video->qlock, flags);
+
+ if (unlikely(video->error)) {
+ vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
+ spin_unlock_irqrestore(&video->qlock, flags);
+ return;
+ }
+
empty = list_empty(&video->dmaqueue);
list_add_tail(&buffer->list, &video->dmaqueue);
+
spin_unlock_irqrestore(&video->qlock, flags);
if (empty) {
@@ -471,6 +488,33 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
return buf;
}
+/*
+ * omap4iss_video_cancel_stream - Cancel stream on a video node
+ * @video: ISS video object
+ *
+ * Cancelling a stream mark all buffers on the video node as erroneous and makes
+ * sure no new buffer can be queued.
+ */
+void omap4iss_video_cancel_stream(struct iss_video *video)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&video->qlock, flags);
+
+ while (!list_empty(&video->dmaqueue)) {
+ struct iss_buffer *buf;
+
+ buf = list_first_entry(&video->dmaqueue, struct iss_buffer,
+ list);
+ list_del(&buf->list);
+ vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+ }
+
+ video->error = true;
+
+ spin_unlock_irqrestore(&video->qlock, flags);
+}
+
/* -----------------------------------------------------------------------------
* V4L2 ioctls
*/
@@ -852,6 +896,7 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
video->queue = &vfh->queue;
INIT_LIST_HEAD(&video->dmaqueue);
spin_lock_init(&video->qlock);
+ video->error = false;
atomic_set(&pipe->frame_number, -1);
ret = vb2_streamon(&vfh->queue, type);
diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
index 73e1a34..878e4a3 100644
--- a/drivers/staging/media/omap4iss/iss_video.h
+++ b/drivers/staging/media/omap4iss/iss_video.h
@@ -163,10 +163,11 @@ struct iss_video {
/* Pipeline state */
struct iss_pipeline pipe;
struct mutex stream_lock; /* pipeline and stream states */
+ bool error;
/* Video buffers queue */
struct vb2_queue *queue;
- spinlock_t qlock; /* Spinlock for dmaqueue */
+ spinlock_t qlock; /* protects dmaqueue and error */
struct list_head dmaqueue;
enum iss_video_dmaqueue_flags dmaqueue_flags;
struct vb2_alloc_ctx *alloc_ctx;
@@ -194,6 +195,7 @@ int omap4iss_video_register(struct iss_video *video,
struct v4l2_device *vdev);
void omap4iss_video_unregister(struct iss_video *video);
struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video);
+void omap4iss_video_cancel_stream(struct iss_video *video);
struct media_pad *omap4iss_video_remote_pad(struct iss_video *video);
const struct iss_format_info *
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 25/25] v4l: omap4iss: resizer: Fix comment regarding bypass mode
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
` (23 preceding siblings ...)
2013-12-04 0:56 ` [PATCH 24/25] v4l: omap4iss: Cancel streaming when a fatal error occurs Laurent Pinchart
@ 2013-12-04 0:56 ` Laurent Pinchart
24 siblings, 0 replies; 26+ messages in thread
From: Laurent Pinchart @ 2013-12-04 0:56 UTC (permalink / raw
To: linux-media
The comment explaining the usage of the bypass bit is wrong, fix it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/staging/media/omap4iss/iss_resizer.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index c6225d8..ae831b8 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -190,7 +190,9 @@ static void resizer_configure(struct iss_resizer_device *resizer)
informat = &resizer->formats[RESIZER_PAD_SINK];
outformat = &resizer->formats[RESIZER_PAD_SOURCE_MEM];
- /* Make sure we don't bypass the resizer */
+ /* Disable pass-through more. Despite its name, the BYPASS bit controls
+ * pass-through mode, not bypass mode.
+ */
iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SRC_FMT0,
RSZ_SRC_FMT0_BYPASS);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 26+ messages in thread
end of thread, other threads:[~2013-12-04 0:56 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-04 0:56 [PATCH 00/25] OMAP4 ISS fixes Laurent Pinchart
2013-12-04 0:56 ` [PATCH 01/25] v4l: omap4iss: Replace printk by dev_err Laurent Pinchart
2013-12-04 0:56 ` [PATCH 02/25] v4l: omap4iss: Don't split log strings on multiple lines Laurent Pinchart
2013-12-04 0:56 ` [PATCH 03/25] v4l: omap4iss: Restrict line lengths to 80 characters where possible Laurent Pinchart
2013-12-04 0:56 ` [PATCH 04/25] v4l: omap4iss: Remove double semicolon at end of line Laurent Pinchart
2013-12-04 0:56 ` [PATCH 05/25] v4l: omap4iss: Define more ISS and ISP IRQ register bits Laurent Pinchart
2013-12-04 0:56 ` [PATCH 06/25] v4l: omap4iss: isif: Define more VDINT registers Laurent Pinchart
2013-12-04 0:56 ` [PATCH 07/25] v4l: omap4iss: Enhance IRQ debugging Laurent Pinchart
2013-12-04 0:56 ` [PATCH 08/25] v4l: omap4iss: Don't make IRQ debugging functions inline Laurent Pinchart
2013-12-04 0:56 ` [PATCH 09/25] v4l: omap4iss: Fix operators precedence in ternary operators Laurent Pinchart
2013-12-04 0:56 ` [PATCH 10/25] v4l: omap4iss: isif: Ignore VD0 interrupts when no buffer is available Laurent Pinchart
2013-12-04 0:56 ` [PATCH 11/25] v4l: omap4iss: ipipeif: Shift input data according to the input format Laurent Pinchart
2013-12-04 0:56 ` [PATCH 12/25] v4l: omap4iss: csi2: Enable automatic ULP mode transition Laurent Pinchart
2013-12-04 0:56 ` [PATCH 13/25] v4l: omap4iss: Create and use register access functions Laurent Pinchart
2013-12-04 0:56 ` [PATCH 14/25] v4l: omap4iss: csi: " Laurent Pinchart
2013-12-04 0:56 ` [PATCH 15/25] v4l: omap4iss: resizer: Stop the whole resizer to avoid FIFO overflows Laurent Pinchart
2013-12-04 0:56 ` [PATCH 16/25] v4l: omap4iss: Convert hexadecimal constants to lower case Laurent Pinchart
2013-12-04 0:56 ` [PATCH 17/25] v4l: omap4iss: Add description field to iss_format_info structure Laurent Pinchart
2013-12-04 0:56 ` [PATCH 18/25] v4l: omap4iss: Make __iss_video_get_format() return a v4l2_mbus_framefmt Laurent Pinchart
2013-12-04 0:56 ` [PATCH 19/25] v4l: omap4iss: Add enum_fmt_vid_cap ioctl support Laurent Pinchart
2013-12-04 0:56 ` [PATCH 20/25] v4l: omap4iss: Propagate stop timeouts from submodules to the driver core Laurent Pinchart
2013-12-04 0:56 ` [PATCH 21/25] v4l: omap4iss: Enable/disabling the ISP interrupts globally Laurent Pinchart
2013-12-04 0:56 ` [PATCH 22/25] v4l: omap4iss: Reset the ISS when the pipeline can't be stopped Laurent Pinchart
2013-12-04 0:56 ` [PATCH 23/25] v4l: omap4iss: csi2: Replace manual if statement with a subclk field Laurent Pinchart
2013-12-04 0:56 ` [PATCH 24/25] v4l: omap4iss: Cancel streaming when a fatal error occurs Laurent Pinchart
2013-12-04 0:56 ` [PATCH 25/25] v4l: omap4iss: resizer: Fix comment regarding bypass mode Laurent Pinchart
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.