2019-09-07 14:21:36 +00:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2013-05-15 14:36:19 +00:00
|
|
|
/*
|
|
|
|
* Xilinx Video IP Core
|
|
|
|
*
|
|
|
|
* Copyright (C) 2013-2015 Ideas on Board
|
|
|
|
* Copyright (C) 2013-2015 Xilinx, Inc.
|
|
|
|
*
|
|
|
|
* Contacts: Hyun Kwon <hyun.kwon@xilinx.com>
|
|
|
|
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __XILINX_VIP_H__
|
|
|
|
#define __XILINX_VIP_H__
|
|
|
|
|
2019-08-22 14:06:32 +00:00
|
|
|
#include <linux/bitops.h>
|
2013-05-15 14:36:19 +00:00
|
|
|
#include <linux/io.h>
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
|
|
|
|
struct clk;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Minimum and maximum width and height common to most video IP cores. IP
|
|
|
|
* cores with different requirements must define their own values.
|
|
|
|
*/
|
|
|
|
#define XVIP_MIN_WIDTH 32
|
|
|
|
#define XVIP_MAX_WIDTH 7680
|
|
|
|
#define XVIP_MIN_HEIGHT 32
|
|
|
|
#define XVIP_MAX_HEIGHT 7680
|
|
|
|
|
|
|
|
/*
|
2022-06-23 12:29:48 +00:00
|
|
|
* Pad IDs. IP cores with multiple inputs or outputs should define their own
|
|
|
|
* values.
|
2013-05-15 14:36:19 +00:00
|
|
|
*/
|
|
|
|
#define XVIP_PAD_SINK 0
|
|
|
|
#define XVIP_PAD_SOURCE 1
|
|
|
|
|
|
|
|
/* Xilinx Video IP Control Registers */
|
|
|
|
#define XVIP_CTRL_CONTROL 0x0000
|
2019-08-22 14:06:32 +00:00
|
|
|
#define XVIP_CTRL_CONTROL_SW_ENABLE BIT(0)
|
|
|
|
#define XVIP_CTRL_CONTROL_REG_UPDATE BIT(1)
|
|
|
|
#define XVIP_CTRL_CONTROL_BYPASS BIT(4)
|
|
|
|
#define XVIP_CTRL_CONTROL_TEST_PATTERN BIT(5)
|
|
|
|
#define XVIP_CTRL_CONTROL_FRAME_SYNC_RESET BIT(30)
|
|
|
|
#define XVIP_CTRL_CONTROL_SW_RESET BIT(31)
|
2013-05-15 14:36:19 +00:00
|
|
|
#define XVIP_CTRL_STATUS 0x0004
|
2019-08-22 14:06:32 +00:00
|
|
|
#define XVIP_CTRL_STATUS_PROC_STARTED BIT(0)
|
|
|
|
#define XVIP_CTRL_STATUS_EOF BIT(1)
|
2013-05-15 14:36:19 +00:00
|
|
|
#define XVIP_CTRL_ERROR 0x0008
|
2019-08-22 14:06:32 +00:00
|
|
|
#define XVIP_CTRL_ERROR_SLAVE_EOL_EARLY BIT(0)
|
|
|
|
#define XVIP_CTRL_ERROR_SLAVE_EOL_LATE BIT(1)
|
|
|
|
#define XVIP_CTRL_ERROR_SLAVE_SOF_EARLY BIT(2)
|
|
|
|
#define XVIP_CTRL_ERROR_SLAVE_SOF_LATE BIT(3)
|
2013-05-15 14:36:19 +00:00
|
|
|
#define XVIP_CTRL_IRQ_ENABLE 0x000c
|
2019-08-22 14:06:32 +00:00
|
|
|
#define XVIP_CTRL_IRQ_ENABLE_PROC_STARTED BIT(0)
|
|
|
|
#define XVIP_CTRL_IRQ_EOF BIT(1)
|
2013-05-15 14:36:19 +00:00
|
|
|
#define XVIP_CTRL_VERSION 0x0010
|
|
|
|
#define XVIP_CTRL_VERSION_MAJOR_MASK (0xff << 24)
|
|
|
|
#define XVIP_CTRL_VERSION_MAJOR_SHIFT 24
|
|
|
|
#define XVIP_CTRL_VERSION_MINOR_MASK (0xff << 16)
|
|
|
|
#define XVIP_CTRL_VERSION_MINOR_SHIFT 16
|
|
|
|
#define XVIP_CTRL_VERSION_REVISION_MASK (0xf << 12)
|
|
|
|
#define XVIP_CTRL_VERSION_REVISION_SHIFT 12
|
|
|
|
#define XVIP_CTRL_VERSION_PATCH_MASK (0xf << 8)
|
|
|
|
#define XVIP_CTRL_VERSION_PATCH_SHIFT 8
|
|
|
|
#define XVIP_CTRL_VERSION_INTERNAL_MASK (0xff << 0)
|
|
|
|
#define XVIP_CTRL_VERSION_INTERNAL_SHIFT 0
|
|
|
|
|
|
|
|
/* Xilinx Video IP Timing Registers */
|
|
|
|
#define XVIP_ACTIVE_SIZE 0x0020
|
|
|
|
#define XVIP_ACTIVE_VSIZE_MASK (0x7ff << 16)
|
|
|
|
#define XVIP_ACTIVE_VSIZE_SHIFT 16
|
|
|
|
#define XVIP_ACTIVE_HSIZE_MASK (0x7ff << 0)
|
|
|
|
#define XVIP_ACTIVE_HSIZE_SHIFT 0
|
|
|
|
#define XVIP_ENCODING 0x0028
|
|
|
|
#define XVIP_ENCODING_NBITS_8 (0 << 4)
|
|
|
|
#define XVIP_ENCODING_NBITS_10 (1 << 4)
|
|
|
|
#define XVIP_ENCODING_NBITS_12 (2 << 4)
|
|
|
|
#define XVIP_ENCODING_NBITS_16 (3 << 4)
|
|
|
|
#define XVIP_ENCODING_NBITS_MASK (3 << 4)
|
|
|
|
#define XVIP_ENCODING_NBITS_SHIFT 4
|
|
|
|
#define XVIP_ENCODING_VIDEO_FORMAT_YUV422 (0 << 0)
|
|
|
|
#define XVIP_ENCODING_VIDEO_FORMAT_YUV444 (1 << 0)
|
|
|
|
#define XVIP_ENCODING_VIDEO_FORMAT_RGB (2 << 0)
|
|
|
|
#define XVIP_ENCODING_VIDEO_FORMAT_YUV420 (3 << 0)
|
|
|
|
#define XVIP_ENCODING_VIDEO_FORMAT_MASK (3 << 0)
|
|
|
|
#define XVIP_ENCODING_VIDEO_FORMAT_SHIFT 0
|
|
|
|
|
|
|
|
/**
|
|
|
|
* struct xvip_device - Xilinx Video IP device structure
|
|
|
|
* @subdev: V4L2 subdevice
|
|
|
|
* @dev: (OF) device
|
|
|
|
* @iomem: device I/O register space remapped to kernel virtual memory
|
|
|
|
* @clk: video core clock
|
|
|
|
* @saved_ctrl: saved control register for resume / suspend
|
|
|
|
*/
|
|
|
|
struct xvip_device {
|
|
|
|
struct v4l2_subdev subdev;
|
|
|
|
struct device *dev;
|
|
|
|
void __iomem *iomem;
|
|
|
|
struct clk *clk;
|
|
|
|
u32 saved_ctrl;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* struct xvip_video_format - Xilinx Video IP video format description
|
|
|
|
* @vf_code: AXI4 video format code
|
|
|
|
* @width: AXI4 format width in bits per component
|
|
|
|
* @pattern: CFA pattern for Mono/Sensor formats
|
|
|
|
* @code: media bus format code
|
|
|
|
* @bpp: bytes per pixel (when stored in memory)
|
|
|
|
* @fourcc: V4L2 pixel format FCC identifier
|
|
|
|
*/
|
|
|
|
struct xvip_video_format {
|
|
|
|
unsigned int vf_code;
|
|
|
|
unsigned int width;
|
|
|
|
const char *pattern;
|
|
|
|
unsigned int code;
|
|
|
|
unsigned int bpp;
|
|
|
|
u32 fourcc;
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct xvip_video_format *xvip_get_format_by_code(unsigned int code);
|
|
|
|
const struct xvip_video_format *xvip_get_format_by_fourcc(u32 fourcc);
|
|
|
|
const struct xvip_video_format *xvip_of_get_format(struct device_node *node);
|
|
|
|
void xvip_set_format_size(struct v4l2_mbus_framefmt *format,
|
|
|
|
const struct v4l2_subdev_format *fmt);
|
|
|
|
int xvip_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 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2013-05-15 14:36:19 +00:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code);
|
|
|
|
int xvip_enum_frame_size(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 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2013-05-15 14:36:19 +00:00
|
|
|
struct v4l2_subdev_frame_size_enum *fse);
|
|
|
|
|
|
|
|
static inline u32 xvip_read(struct xvip_device *xvip, u32 addr)
|
|
|
|
{
|
|
|
|
return ioread32(xvip->iomem + addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_write(struct xvip_device *xvip, u32 addr, u32 value)
|
|
|
|
{
|
|
|
|
iowrite32(value, xvip->iomem + addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_clr(struct xvip_device *xvip, u32 addr, u32 clr)
|
|
|
|
{
|
|
|
|
xvip_write(xvip, addr, xvip_read(xvip, addr) & ~clr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_set(struct xvip_device *xvip, u32 addr, u32 set)
|
|
|
|
{
|
|
|
|
xvip_write(xvip, addr, xvip_read(xvip, addr) | set);
|
|
|
|
}
|
|
|
|
|
|
|
|
void xvip_clr_or_set(struct xvip_device *xvip, u32 addr, u32 mask, bool set);
|
|
|
|
void xvip_clr_and_set(struct xvip_device *xvip, u32 addr, u32 clr, u32 set);
|
|
|
|
|
|
|
|
int xvip_init_resources(struct xvip_device *xvip);
|
|
|
|
void xvip_cleanup_resources(struct xvip_device *xvip);
|
|
|
|
|
|
|
|
static inline void xvip_reset(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip_write(xvip, XVIP_CTRL_CONTROL, XVIP_CTRL_CONTROL_SW_RESET);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_start(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip_set(xvip, XVIP_CTRL_CONTROL,
|
|
|
|
XVIP_CTRL_CONTROL_SW_ENABLE | XVIP_CTRL_CONTROL_REG_UPDATE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_stop(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip_clr(xvip, XVIP_CTRL_CONTROL, XVIP_CTRL_CONTROL_SW_ENABLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_resume(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip_write(xvip, XVIP_CTRL_CONTROL,
|
|
|
|
xvip->saved_ctrl | XVIP_CTRL_CONTROL_SW_ENABLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_suspend(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip->saved_ctrl = xvip_read(xvip, XVIP_CTRL_CONTROL);
|
|
|
|
xvip_write(xvip, XVIP_CTRL_CONTROL,
|
|
|
|
xvip->saved_ctrl & ~XVIP_CTRL_CONTROL_SW_ENABLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_set_frame_size(struct xvip_device *xvip,
|
|
|
|
const struct v4l2_mbus_framefmt *format)
|
|
|
|
{
|
|
|
|
xvip_write(xvip, XVIP_ACTIVE_SIZE,
|
|
|
|
(format->height << XVIP_ACTIVE_VSIZE_SHIFT) |
|
|
|
|
(format->width << XVIP_ACTIVE_HSIZE_SHIFT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_get_frame_size(struct xvip_device *xvip,
|
|
|
|
struct v4l2_mbus_framefmt *format)
|
|
|
|
{
|
|
|
|
u32 reg;
|
|
|
|
|
|
|
|
reg = xvip_read(xvip, XVIP_ACTIVE_SIZE);
|
|
|
|
format->width = (reg & XVIP_ACTIVE_HSIZE_MASK) >>
|
|
|
|
XVIP_ACTIVE_HSIZE_SHIFT;
|
|
|
|
format->height = (reg & XVIP_ACTIVE_VSIZE_MASK) >>
|
|
|
|
XVIP_ACTIVE_VSIZE_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_enable_reg_update(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip_set(xvip, XVIP_CTRL_CONTROL, XVIP_CTRL_CONTROL_REG_UPDATE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_disable_reg_update(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
xvip_clr(xvip, XVIP_CTRL_CONTROL, XVIP_CTRL_CONTROL_REG_UPDATE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void xvip_print_version(struct xvip_device *xvip)
|
|
|
|
{
|
|
|
|
u32 version;
|
|
|
|
|
|
|
|
version = xvip_read(xvip, XVIP_CTRL_VERSION);
|
|
|
|
|
|
|
|
dev_info(xvip->dev, "device found, version %u.%02x%x\n",
|
|
|
|
((version & XVIP_CTRL_VERSION_MAJOR_MASK) >>
|
|
|
|
XVIP_CTRL_VERSION_MAJOR_SHIFT),
|
|
|
|
((version & XVIP_CTRL_VERSION_MINOR_MASK) >>
|
|
|
|
XVIP_CTRL_VERSION_MINOR_SHIFT),
|
|
|
|
((version & XVIP_CTRL_VERSION_REVISION_MASK) >>
|
|
|
|
XVIP_CTRL_VERSION_REVISION_SHIFT));
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* __XILINX_VIP_H__ */
|