2018-05-04 10:08:10 -04:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
/*
|
|
|
|
* Driver for Cadence MIPI-CSI2 TX Controller
|
|
|
|
*
|
2019-07-22 04:22:21 -04:00
|
|
|
* Copyright (C) 2017-2019 Cadence Design Systems Inc.
|
2018-05-04 10:08:10 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/clk.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/io.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/of.h>
|
|
|
|
#include <linux/of_graph.h>
|
|
|
|
#include <linux/platform_device.h>
|
2018-05-25 11:25:09 -04:00
|
|
|
#include <linux/slab.h>
|
2018-05-04 10:08:10 -04:00
|
|
|
|
|
|
|
#include <media/v4l2-ctrls.h>
|
|
|
|
#include <media/v4l2-device.h>
|
|
|
|
#include <media/v4l2-fwnode.h>
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
|
|
|
|
#define CSI2TX_DEVICE_CONFIG_REG 0x00
|
|
|
|
#define CSI2TX_DEVICE_CONFIG_STREAMS_MASK GENMASK(6, 4)
|
|
|
|
#define CSI2TX_DEVICE_CONFIG_HAS_DPHY BIT(3)
|
|
|
|
#define CSI2TX_DEVICE_CONFIG_LANES_MASK GENMASK(2, 0)
|
|
|
|
|
|
|
|
#define CSI2TX_CONFIG_REG 0x20
|
|
|
|
#define CSI2TX_CONFIG_CFG_REQ BIT(2)
|
|
|
|
#define CSI2TX_CONFIG_SRST_REQ BIT(1)
|
|
|
|
|
|
|
|
#define CSI2TX_DPHY_CFG_REG 0x28
|
|
|
|
#define CSI2TX_DPHY_CFG_CLK_RESET BIT(16)
|
|
|
|
#define CSI2TX_DPHY_CFG_LANE_RESET(n) BIT((n) + 12)
|
|
|
|
#define CSI2TX_DPHY_CFG_MODE_MASK GENMASK(9, 8)
|
|
|
|
#define CSI2TX_DPHY_CFG_MODE_LPDT (2 << 8)
|
|
|
|
#define CSI2TX_DPHY_CFG_MODE_HS (1 << 8)
|
|
|
|
#define CSI2TX_DPHY_CFG_MODE_ULPS (0 << 8)
|
|
|
|
#define CSI2TX_DPHY_CFG_CLK_ENABLE BIT(4)
|
|
|
|
#define CSI2TX_DPHY_CFG_LANE_ENABLE(n) BIT(n)
|
|
|
|
|
|
|
|
#define CSI2TX_DPHY_CLK_WAKEUP_REG 0x2c
|
|
|
|
#define CSI2TX_DPHY_CLK_WAKEUP_ULPS_CYCLES(n) ((n) & 0xffff)
|
|
|
|
|
|
|
|
#define CSI2TX_DT_CFG_REG(n) (0x80 + (n) * 8)
|
|
|
|
#define CSI2TX_DT_CFG_DT(n) (((n) & 0x3f) << 2)
|
|
|
|
|
|
|
|
#define CSI2TX_DT_FORMAT_REG(n) (0x84 + (n) * 8)
|
|
|
|
#define CSI2TX_DT_FORMAT_BYTES_PER_LINE(n) (((n) & 0xffff) << 16)
|
|
|
|
#define CSI2TX_DT_FORMAT_MAX_LINE_NUM(n) ((n) & 0xffff)
|
|
|
|
|
|
|
|
#define CSI2TX_STREAM_IF_CFG_REG(n) (0x100 + (n) * 4)
|
|
|
|
#define CSI2TX_STREAM_IF_CFG_FILL_LEVEL(n) ((n) & 0x1f)
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
/* CSI2TX V2 Registers */
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_REG 0x28
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_RESET BIT(16)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_CLOCK_MODE BIT(10)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_MODE_MASK GENMASK(9, 8)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_MODE_LPDT (2 << 8)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_MODE_HS (1 << 8)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_MODE_ULPS (0 << 8)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_CLK_ENABLE BIT(4)
|
|
|
|
#define CSI2TX_V2_DPHY_CFG_LANE_ENABLE(n) BIT(n)
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
#define CSI2TX_LANES_MAX 4
|
|
|
|
#define CSI2TX_STREAMS_MAX 4
|
|
|
|
|
|
|
|
enum csi2tx_pads {
|
|
|
|
CSI2TX_PAD_SOURCE,
|
|
|
|
CSI2TX_PAD_SINK_STREAM0,
|
|
|
|
CSI2TX_PAD_SINK_STREAM1,
|
|
|
|
CSI2TX_PAD_SINK_STREAM2,
|
|
|
|
CSI2TX_PAD_SINK_STREAM3,
|
|
|
|
CSI2TX_PAD_MAX,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct csi2tx_fmt {
|
|
|
|
u32 mbus;
|
|
|
|
u32 dt;
|
|
|
|
u32 bpp;
|
|
|
|
};
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
struct csi2tx_priv;
|
|
|
|
|
|
|
|
/* CSI2TX Variant Operations */
|
|
|
|
struct csi2tx_vops {
|
|
|
|
void (*dphy_setup)(struct csi2tx_priv *csi2tx);
|
|
|
|
};
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
struct csi2tx_priv {
|
|
|
|
struct device *dev;
|
|
|
|
unsigned int count;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Used to prevent race conditions between multiple,
|
|
|
|
* concurrent calls to start and stop.
|
|
|
|
*/
|
|
|
|
struct mutex lock;
|
|
|
|
|
|
|
|
void __iomem *base;
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
struct csi2tx_vops *vops;
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
struct clk *esc_clk;
|
|
|
|
struct clk *p_clk;
|
|
|
|
struct clk *pixel_clk[CSI2TX_STREAMS_MAX];
|
|
|
|
|
|
|
|
struct v4l2_subdev subdev;
|
|
|
|
struct media_pad pads[CSI2TX_PAD_MAX];
|
|
|
|
struct v4l2_mbus_framefmt pad_fmts[CSI2TX_PAD_MAX];
|
|
|
|
|
|
|
|
bool has_internal_dphy;
|
|
|
|
u8 lanes[CSI2TX_LANES_MAX];
|
|
|
|
unsigned int num_lanes;
|
|
|
|
unsigned int max_lanes;
|
|
|
|
unsigned int max_streams;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct csi2tx_fmt csi2tx_formats[] = {
|
|
|
|
{
|
|
|
|
.mbus = MEDIA_BUS_FMT_UYVY8_1X16,
|
|
|
|
.bpp = 2,
|
|
|
|
.dt = 0x1e,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.mbus = MEDIA_BUS_FMT_RGB888_1X24,
|
|
|
|
.bpp = 3,
|
|
|
|
.dt = 0x24,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_mbus_framefmt fmt_default = {
|
|
|
|
.width = 1280,
|
|
|
|
.height = 720,
|
|
|
|
.code = MEDIA_BUS_FMT_RGB888_1X24,
|
|
|
|
.field = V4L2_FIELD_NONE,
|
|
|
|
.colorspace = V4L2_COLORSPACE_DEFAULT,
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline
|
|
|
|
struct csi2tx_priv *v4l2_subdev_to_csi2tx(struct v4l2_subdev *subdev)
|
|
|
|
{
|
|
|
|
return container_of(subdev, struct csi2tx_priv, subdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct csi2tx_fmt *csi2tx_get_fmt_from_mbus(u32 mbus)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(csi2tx_formats); i++)
|
|
|
|
if (csi2tx_formats[i].mbus == mbus)
|
|
|
|
return &csi2tx_formats[i];
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int csi2tx_enum_mbus_code(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2018-05-04 10:08:10 -04:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
|
|
{
|
|
|
|
if (code->pad || code->index >= ARRAY_SIZE(csi2tx_formats))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
code->code = csi2tx_formats[code->index].mbus;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct v4l2_mbus_framefmt *
|
|
|
|
__csi2tx_get_pad_format(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2018-05-04 10:08:10 -04:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
{
|
|
|
|
struct csi2tx_priv *csi2tx = v4l2_subdev_to_csi2tx(subdev);
|
|
|
|
|
|
|
|
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
return v4l2_subdev_get_try_format(subdev, sd_state,
|
2018-05-04 10:08:10 -04:00
|
|
|
fmt->pad);
|
|
|
|
|
|
|
|
return &csi2tx->pad_fmts[fmt->pad];
|
|
|
|
}
|
|
|
|
|
|
|
|
static int csi2tx_get_pad_format(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2018-05-04 10:08:10 -04:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
{
|
|
|
|
const struct v4l2_mbus_framefmt *format;
|
|
|
|
|
|
|
|
/* Multiplexed pad? */
|
|
|
|
if (fmt->pad == CSI2TX_PAD_SOURCE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
format = __csi2tx_get_pad_format(subdev, sd_state, fmt);
|
2018-05-04 10:08:10 -04:00
|
|
|
if (!format)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
fmt->format = *format;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int csi2tx_set_pad_format(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2018-05-04 10:08:10 -04:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
{
|
|
|
|
const struct v4l2_mbus_framefmt *src_format = &fmt->format;
|
|
|
|
struct v4l2_mbus_framefmt *dst_format;
|
|
|
|
|
|
|
|
/* Multiplexed pad? */
|
|
|
|
if (fmt->pad == CSI2TX_PAD_SOURCE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!csi2tx_get_fmt_from_mbus(fmt->format.code))
|
|
|
|
src_format = &fmt_default;
|
|
|
|
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
dst_format = __csi2tx_get_pad_format(subdev, sd_state, fmt);
|
2018-05-04 10:08:10 -04:00
|
|
|
if (!dst_format)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
*dst_format = *src_format;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_pad_ops csi2tx_pad_ops = {
|
|
|
|
.enum_mbus_code = csi2tx_enum_mbus_code,
|
|
|
|
.get_fmt = csi2tx_get_pad_format,
|
|
|
|
.set_fmt = csi2tx_set_pad_format,
|
|
|
|
};
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
/* Set Wake Up value in the D-PHY */
|
|
|
|
static void csi2tx_dphy_set_wakeup(struct csi2tx_priv *csi2tx)
|
2018-05-04 10:08:10 -04:00
|
|
|
{
|
2019-07-22 04:22:23 -04:00
|
|
|
writel(CSI2TX_DPHY_CLK_WAKEUP_ULPS_CYCLES(32),
|
|
|
|
csi2tx->base + CSI2TX_DPHY_CLK_WAKEUP_REG);
|
2018-05-04 10:08:10 -04:00
|
|
|
}
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
/*
|
|
|
|
* Finishes the D-PHY initialization
|
|
|
|
* reg dphy cfg value to be used
|
|
|
|
*/
|
|
|
|
static void csi2tx_dphy_init_finish(struct csi2tx_priv *csi2tx, u32 reg)
|
2018-05-04 10:08:10 -04:00
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
udelay(10);
|
2018-05-04 10:08:10 -04:00
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
/* Enable our (clock and data) lanes */
|
|
|
|
reg |= CSI2TX_DPHY_CFG_CLK_ENABLE;
|
|
|
|
for (i = 0; i < csi2tx->num_lanes; i++)
|
|
|
|
reg |= CSI2TX_DPHY_CFG_LANE_ENABLE(csi2tx->lanes[i] - 1);
|
|
|
|
writel(reg, csi2tx->base + CSI2TX_DPHY_CFG_REG);
|
2018-05-04 10:08:10 -04:00
|
|
|
|
|
|
|
udelay(10);
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
/* Switch to HS mode */
|
|
|
|
reg &= ~CSI2TX_DPHY_CFG_MODE_MASK;
|
|
|
|
writel(reg | CSI2TX_DPHY_CFG_MODE_HS,
|
|
|
|
csi2tx->base + CSI2TX_DPHY_CFG_REG);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Configures D-PHY in CSIv1.3 */
|
|
|
|
static void csi2tx_dphy_setup(struct csi2tx_priv *csi2tx)
|
|
|
|
{
|
|
|
|
u32 reg;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
csi2tx_dphy_set_wakeup(csi2tx);
|
2018-05-04 10:08:10 -04:00
|
|
|
|
|
|
|
/* Put our lanes (clock and data) out of reset */
|
|
|
|
reg = CSI2TX_DPHY_CFG_CLK_RESET | CSI2TX_DPHY_CFG_MODE_LPDT;
|
|
|
|
for (i = 0; i < csi2tx->num_lanes; i++)
|
2019-07-22 04:22:22 -04:00
|
|
|
reg |= CSI2TX_DPHY_CFG_LANE_RESET(csi2tx->lanes[i] - 1);
|
2018-05-04 10:08:10 -04:00
|
|
|
writel(reg, csi2tx->base + CSI2TX_DPHY_CFG_REG);
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
csi2tx_dphy_init_finish(csi2tx, reg);
|
|
|
|
}
|
2018-05-04 10:08:10 -04:00
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
/* Configures D-PHY in CSIv2 */
|
|
|
|
static void csi2tx_v2_dphy_setup(struct csi2tx_priv *csi2tx)
|
|
|
|
{
|
|
|
|
u32 reg;
|
|
|
|
|
|
|
|
csi2tx_dphy_set_wakeup(csi2tx);
|
|
|
|
|
|
|
|
/* Put our lanes (clock and data) out of reset */
|
|
|
|
reg = CSI2TX_V2_DPHY_CFG_RESET | CSI2TX_V2_DPHY_CFG_MODE_LPDT;
|
|
|
|
writel(reg, csi2tx->base + CSI2TX_V2_DPHY_CFG_REG);
|
|
|
|
|
|
|
|
csi2tx_dphy_init_finish(csi2tx, reg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void csi2tx_reset(struct csi2tx_priv *csi2tx)
|
|
|
|
{
|
|
|
|
writel(CSI2TX_CONFIG_SRST_REQ, csi2tx->base + CSI2TX_CONFIG_REG);
|
2018-05-04 10:08:10 -04:00
|
|
|
|
|
|
|
udelay(10);
|
2019-07-22 04:22:23 -04:00
|
|
|
}
|
2018-05-04 10:08:10 -04:00
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
static int csi2tx_start(struct csi2tx_priv *csi2tx)
|
|
|
|
{
|
|
|
|
struct media_entity *entity = &csi2tx->subdev.entity;
|
|
|
|
struct media_link *link;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
csi2tx_reset(csi2tx);
|
|
|
|
|
|
|
|
writel(CSI2TX_CONFIG_CFG_REQ, csi2tx->base + CSI2TX_CONFIG_REG);
|
2018-05-04 10:08:10 -04:00
|
|
|
|
|
|
|
udelay(10);
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
if (csi2tx->vops && csi2tx->vops->dphy_setup) {
|
|
|
|
csi2tx->vops->dphy_setup(csi2tx);
|
|
|
|
udelay(10);
|
|
|
|
}
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
/*
|
|
|
|
* Create a static mapping between the CSI virtual channels
|
|
|
|
* and the input streams.
|
|
|
|
*
|
|
|
|
* This should be enhanced, but v4l2 lacks the support for
|
|
|
|
* changing that mapping dynamically at the moment.
|
|
|
|
*
|
|
|
|
* We're protected from the userspace setting up links at the
|
|
|
|
* same time by the upper layer having called
|
|
|
|
* media_pipeline_start().
|
|
|
|
*/
|
|
|
|
list_for_each_entry(link, &entity->links, list) {
|
|
|
|
struct v4l2_mbus_framefmt *mfmt;
|
|
|
|
const struct csi2tx_fmt *fmt;
|
|
|
|
unsigned int stream;
|
|
|
|
int pad_idx = -1;
|
|
|
|
|
|
|
|
/* Only consider our enabled input pads */
|
|
|
|
for (i = CSI2TX_PAD_SINK_STREAM0; i < CSI2TX_PAD_MAX; i++) {
|
|
|
|
struct media_pad *pad = &csi2tx->pads[i];
|
|
|
|
|
|
|
|
if ((pad == link->sink) &&
|
|
|
|
(link->flags & MEDIA_LNK_FL_ENABLED)) {
|
|
|
|
pad_idx = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pad_idx < 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
mfmt = &csi2tx->pad_fmts[pad_idx];
|
|
|
|
fmt = csi2tx_get_fmt_from_mbus(mfmt->code);
|
|
|
|
if (!fmt)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
stream = pad_idx - CSI2TX_PAD_SINK_STREAM0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We use the stream ID there, but it's wrong.
|
|
|
|
*
|
|
|
|
* A stream could very well send a data type that is
|
|
|
|
* not equal to its stream ID. We need to find a
|
|
|
|
* proper way to address it.
|
|
|
|
*/
|
|
|
|
writel(CSI2TX_DT_CFG_DT(fmt->dt),
|
|
|
|
csi2tx->base + CSI2TX_DT_CFG_REG(stream));
|
|
|
|
|
|
|
|
writel(CSI2TX_DT_FORMAT_BYTES_PER_LINE(mfmt->width * fmt->bpp) |
|
|
|
|
CSI2TX_DT_FORMAT_MAX_LINE_NUM(mfmt->height + 1),
|
|
|
|
csi2tx->base + CSI2TX_DT_FORMAT_REG(stream));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: This needs to be calculated based on the
|
|
|
|
* output CSI2 clock rate.
|
|
|
|
*/
|
|
|
|
writel(CSI2TX_STREAM_IF_CFG_FILL_LEVEL(4),
|
|
|
|
csi2tx->base + CSI2TX_STREAM_IF_CFG_REG(stream));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Disable the configuration mode */
|
|
|
|
writel(0, csi2tx->base + CSI2TX_CONFIG_REG);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void csi2tx_stop(struct csi2tx_priv *csi2tx)
|
|
|
|
{
|
|
|
|
writel(CSI2TX_CONFIG_CFG_REQ | CSI2TX_CONFIG_SRST_REQ,
|
|
|
|
csi2tx->base + CSI2TX_CONFIG_REG);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int csi2tx_s_stream(struct v4l2_subdev *subdev, int enable)
|
|
|
|
{
|
|
|
|
struct csi2tx_priv *csi2tx = v4l2_subdev_to_csi2tx(subdev);
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
mutex_lock(&csi2tx->lock);
|
|
|
|
|
|
|
|
if (enable) {
|
|
|
|
/*
|
|
|
|
* If we're not the first users, there's no need to
|
|
|
|
* enable the whole controller.
|
|
|
|
*/
|
|
|
|
if (!csi2tx->count) {
|
|
|
|
ret = csi2tx_start(csi2tx);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
csi2tx->count++;
|
|
|
|
} else {
|
|
|
|
csi2tx->count--;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Let the last user turn off the lights.
|
|
|
|
*/
|
|
|
|
if (!csi2tx->count)
|
|
|
|
csi2tx_stop(csi2tx);
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
mutex_unlock(&csi2tx->lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_video_ops csi2tx_video_ops = {
|
|
|
|
.s_stream = csi2tx_s_stream,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_ops csi2tx_subdev_ops = {
|
|
|
|
.pad = &csi2tx_pad_ops,
|
|
|
|
.video = &csi2tx_video_ops,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int csi2tx_get_resources(struct csi2tx_priv *csi2tx,
|
|
|
|
struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
u32 dev_cfg;
|
2021-05-17 14:49:18 +02:00
|
|
|
int ret;
|
2018-05-04 10:08:10 -04:00
|
|
|
|
2021-09-01 07:14:20 +02:00
|
|
|
csi2tx->base = devm_platform_ioremap_resource(pdev, 0);
|
2018-05-04 10:08:10 -04:00
|
|
|
if (IS_ERR(csi2tx->base))
|
|
|
|
return PTR_ERR(csi2tx->base);
|
|
|
|
|
|
|
|
csi2tx->p_clk = devm_clk_get(&pdev->dev, "p_clk");
|
|
|
|
if (IS_ERR(csi2tx->p_clk)) {
|
|
|
|
dev_err(&pdev->dev, "Couldn't get p_clk\n");
|
|
|
|
return PTR_ERR(csi2tx->p_clk);
|
|
|
|
}
|
|
|
|
|
|
|
|
csi2tx->esc_clk = devm_clk_get(&pdev->dev, "esc_clk");
|
|
|
|
if (IS_ERR(csi2tx->esc_clk)) {
|
|
|
|
dev_err(&pdev->dev, "Couldn't get the esc_clk\n");
|
|
|
|
return PTR_ERR(csi2tx->esc_clk);
|
|
|
|
}
|
|
|
|
|
2021-05-17 14:49:18 +02:00
|
|
|
ret = clk_prepare_enable(csi2tx->p_clk);
|
|
|
|
if (ret) {
|
|
|
|
dev_err(&pdev->dev, "Couldn't prepare and enable p_clk\n");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
dev_cfg = readl(csi2tx->base + CSI2TX_DEVICE_CONFIG_REG);
|
|
|
|
clk_disable_unprepare(csi2tx->p_clk);
|
|
|
|
|
|
|
|
csi2tx->max_lanes = dev_cfg & CSI2TX_DEVICE_CONFIG_LANES_MASK;
|
|
|
|
if (csi2tx->max_lanes > CSI2TX_LANES_MAX) {
|
|
|
|
dev_err(&pdev->dev, "Invalid number of lanes: %u\n",
|
|
|
|
csi2tx->max_lanes);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
csi2tx->max_streams = (dev_cfg & CSI2TX_DEVICE_CONFIG_STREAMS_MASK) >> 4;
|
|
|
|
if (csi2tx->max_streams > CSI2TX_STREAMS_MAX) {
|
|
|
|
dev_err(&pdev->dev, "Invalid number of streams: %u\n",
|
|
|
|
csi2tx->max_streams);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
csi2tx->has_internal_dphy = !!(dev_cfg & CSI2TX_DEVICE_CONFIG_HAS_DPHY);
|
|
|
|
|
|
|
|
for (i = 0; i < csi2tx->max_streams; i++) {
|
|
|
|
char clk_name[16];
|
|
|
|
|
|
|
|
snprintf(clk_name, sizeof(clk_name), "pixel_if%u_clk", i);
|
|
|
|
csi2tx->pixel_clk[i] = devm_clk_get(&pdev->dev, clk_name);
|
|
|
|
if (IS_ERR(csi2tx->pixel_clk[i])) {
|
|
|
|
dev_err(&pdev->dev, "Couldn't get clock %s\n",
|
|
|
|
clk_name);
|
|
|
|
return PTR_ERR(csi2tx->pixel_clk[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int csi2tx_check_lanes(struct csi2tx_priv *csi2tx)
|
|
|
|
{
|
2018-07-31 05:15:50 -04:00
|
|
|
struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 };
|
2018-05-04 10:08:10 -04:00
|
|
|
struct device_node *ep;
|
2019-07-22 04:22:21 -04:00
|
|
|
int ret, i;
|
2018-05-04 10:08:10 -04:00
|
|
|
|
|
|
|
ep = of_graph_get_endpoint_by_regs(csi2tx->dev->of_node, 0, 0);
|
|
|
|
if (!ep)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
|
|
|
|
if (ret) {
|
|
|
|
dev_err(csi2tx->dev, "Could not parse v4l2 endpoint\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2018-07-03 17:19:27 -04:00
|
|
|
if (v4l2_ep.bus_type != V4L2_MBUS_CSI2_DPHY) {
|
2018-05-04 10:08:10 -04:00
|
|
|
dev_err(csi2tx->dev, "Unsupported media bus type: 0x%x\n",
|
|
|
|
v4l2_ep.bus_type);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
csi2tx->num_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes;
|
|
|
|
if (csi2tx->num_lanes > csi2tx->max_lanes) {
|
|
|
|
dev_err(csi2tx->dev,
|
|
|
|
"Current configuration uses more lanes than supported\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2019-07-22 04:22:21 -04:00
|
|
|
for (i = 0; i < csi2tx->num_lanes; i++) {
|
|
|
|
if (v4l2_ep.bus.mipi_csi2.data_lanes[i] < 1) {
|
|
|
|
dev_err(csi2tx->dev, "Invalid lane[%d] number: %u\n",
|
|
|
|
i, v4l2_ep.bus.mipi_csi2.data_lanes[i]);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
memcpy(csi2tx->lanes, v4l2_ep.bus.mipi_csi2.data_lanes,
|
|
|
|
sizeof(csi2tx->lanes));
|
|
|
|
|
|
|
|
out:
|
|
|
|
of_node_put(ep);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
static const struct csi2tx_vops csi2tx_vops = {
|
|
|
|
.dphy_setup = csi2tx_dphy_setup,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct csi2tx_vops csi2tx_v2_vops = {
|
|
|
|
.dphy_setup = csi2tx_v2_dphy_setup,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct of_device_id csi2tx_of_table[] = {
|
|
|
|
{
|
|
|
|
.compatible = "cdns,csi2tx",
|
|
|
|
.data = &csi2tx_vops
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.compatible = "cdns,csi2tx-1.3",
|
|
|
|
.data = &csi2tx_vops
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.compatible = "cdns,csi2tx-2.1",
|
|
|
|
.data = &csi2tx_v2_vops
|
|
|
|
},
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, csi2tx_of_table);
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
static int csi2tx_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct csi2tx_priv *csi2tx;
|
2019-07-22 04:22:23 -04:00
|
|
|
const struct of_device_id *of_id;
|
2018-05-04 10:08:10 -04:00
|
|
|
unsigned int i;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
csi2tx = kzalloc(sizeof(*csi2tx), GFP_KERNEL);
|
|
|
|
if (!csi2tx)
|
|
|
|
return -ENOMEM;
|
|
|
|
platform_set_drvdata(pdev, csi2tx);
|
|
|
|
mutex_init(&csi2tx->lock);
|
|
|
|
csi2tx->dev = &pdev->dev;
|
|
|
|
|
|
|
|
ret = csi2tx_get_resources(csi2tx, pdev);
|
|
|
|
if (ret)
|
|
|
|
goto err_free_priv;
|
|
|
|
|
2019-07-22 04:22:23 -04:00
|
|
|
of_id = of_match_node(csi2tx_of_table, pdev->dev.of_node);
|
|
|
|
csi2tx->vops = (struct csi2tx_vops *)of_id->data;
|
|
|
|
|
2018-05-04 10:08:10 -04:00
|
|
|
v4l2_subdev_init(&csi2tx->subdev, &csi2tx_subdev_ops);
|
|
|
|
csi2tx->subdev.owner = THIS_MODULE;
|
|
|
|
csi2tx->subdev.dev = &pdev->dev;
|
|
|
|
csi2tx->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
|
|
|
|
snprintf(csi2tx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s",
|
|
|
|
KBUILD_MODNAME, dev_name(&pdev->dev));
|
|
|
|
|
|
|
|
ret = csi2tx_check_lanes(csi2tx);
|
|
|
|
if (ret)
|
|
|
|
goto err_free_priv;
|
|
|
|
|
|
|
|
/* Create our media pads */
|
|
|
|
csi2tx->subdev.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
|
|
|
|
csi2tx->pads[CSI2TX_PAD_SOURCE].flags = MEDIA_PAD_FL_SOURCE;
|
|
|
|
for (i = CSI2TX_PAD_SINK_STREAM0; i < CSI2TX_PAD_MAX; i++)
|
|
|
|
csi2tx->pads[i].flags = MEDIA_PAD_FL_SINK;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Only the input pads are considered to have a format at the
|
|
|
|
* moment. The CSI link can multiplex various streams with
|
|
|
|
* different formats, and we can't expose this in v4l2 right
|
|
|
|
* now.
|
|
|
|
*/
|
|
|
|
for (i = CSI2TX_PAD_SINK_STREAM0; i < CSI2TX_PAD_MAX; i++)
|
|
|
|
csi2tx->pad_fmts[i] = fmt_default;
|
|
|
|
|
|
|
|
ret = media_entity_pads_init(&csi2tx->subdev.entity, CSI2TX_PAD_MAX,
|
|
|
|
csi2tx->pads);
|
|
|
|
if (ret)
|
|
|
|
goto err_free_priv;
|
|
|
|
|
|
|
|
ret = v4l2_async_register_subdev(&csi2tx->subdev);
|
|
|
|
if (ret < 0)
|
|
|
|
goto err_free_priv;
|
|
|
|
|
|
|
|
dev_info(&pdev->dev,
|
|
|
|
"Probed CSI2TX with %u/%u lanes, %u streams, %s D-PHY\n",
|
|
|
|
csi2tx->num_lanes, csi2tx->max_lanes, csi2tx->max_streams,
|
|
|
|
csi2tx->has_internal_dphy ? "internal" : "no");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_free_priv:
|
|
|
|
kfree(csi2tx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int csi2tx_remove(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct csi2tx_priv *csi2tx = platform_get_drvdata(pdev);
|
|
|
|
|
|
|
|
v4l2_async_unregister_subdev(&csi2tx->subdev);
|
|
|
|
kfree(csi2tx);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct platform_driver csi2tx_driver = {
|
|
|
|
.probe = csi2tx_probe,
|
|
|
|
.remove = csi2tx_remove,
|
|
|
|
|
|
|
|
.driver = {
|
|
|
|
.name = "cdns-csi2tx",
|
|
|
|
.of_match_table = csi2tx_of_table,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
module_platform_driver(csi2tx_driver);
|
|
|
|
MODULE_AUTHOR("Maxime Ripard <maxime.ripard@bootlin.com>");
|
|
|
|
MODULE_DESCRIPTION("Cadence CSI2-TX controller");
|
|
|
|
MODULE_LICENSE("GPL");
|