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>
320 lines
9.3 KiB
C
320 lines
9.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* 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>
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/export.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <dt-bindings/media/xilinx-vip.h>
|
|
|
|
#include "xilinx-vip.h"
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Helper functions
|
|
*/
|
|
|
|
static const struct xvip_video_format xvip_video_formats[] = {
|
|
{ XVIP_VF_YUV_422, 8, NULL, MEDIA_BUS_FMT_UYVY8_1X16,
|
|
2, V4L2_PIX_FMT_YUYV },
|
|
{ XVIP_VF_YUV_444, 8, NULL, MEDIA_BUS_FMT_VUY8_1X24,
|
|
3, V4L2_PIX_FMT_YUV444 },
|
|
{ XVIP_VF_RBG, 8, NULL, MEDIA_BUS_FMT_RBG888_1X24,
|
|
3, 0 },
|
|
{ XVIP_VF_MONO_SENSOR, 8, "mono", MEDIA_BUS_FMT_Y8_1X8,
|
|
1, V4L2_PIX_FMT_GREY },
|
|
{ XVIP_VF_MONO_SENSOR, 8, "rggb", MEDIA_BUS_FMT_SRGGB8_1X8,
|
|
1, V4L2_PIX_FMT_SRGGB8 },
|
|
{ XVIP_VF_MONO_SENSOR, 8, "grbg", MEDIA_BUS_FMT_SGRBG8_1X8,
|
|
1, V4L2_PIX_FMT_SGRBG8 },
|
|
{ XVIP_VF_MONO_SENSOR, 8, "gbrg", MEDIA_BUS_FMT_SGBRG8_1X8,
|
|
1, V4L2_PIX_FMT_SGBRG8 },
|
|
{ XVIP_VF_MONO_SENSOR, 8, "bggr", MEDIA_BUS_FMT_SBGGR8_1X8,
|
|
1, V4L2_PIX_FMT_SBGGR8 },
|
|
};
|
|
|
|
/**
|
|
* xvip_get_format_by_code - Retrieve format information for a media bus code
|
|
* @code: the format media bus code
|
|
*
|
|
* Return: a pointer to the format information structure corresponding to the
|
|
* given V4L2 media bus format @code, or ERR_PTR if no corresponding format can
|
|
* be found.
|
|
*/
|
|
const struct xvip_video_format *xvip_get_format_by_code(unsigned int code)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(xvip_video_formats); ++i) {
|
|
const struct xvip_video_format *format = &xvip_video_formats[i];
|
|
|
|
if (format->code == code)
|
|
return format;
|
|
}
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_get_format_by_code);
|
|
|
|
/**
|
|
* xvip_get_format_by_fourcc - Retrieve format information for a 4CC
|
|
* @fourcc: the format 4CC
|
|
*
|
|
* Return: a pointer to the format information structure corresponding to the
|
|
* given V4L2 format @fourcc. If not found, return a pointer to the first
|
|
* available format (V4L2_PIX_FMT_YUYV).
|
|
*/
|
|
const struct xvip_video_format *xvip_get_format_by_fourcc(u32 fourcc)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(xvip_video_formats); ++i) {
|
|
const struct xvip_video_format *format = &xvip_video_formats[i];
|
|
|
|
if (format->fourcc == fourcc)
|
|
return format;
|
|
}
|
|
|
|
return &xvip_video_formats[0];
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_get_format_by_fourcc);
|
|
|
|
/**
|
|
* xvip_of_get_format - Parse a device tree node and return format information
|
|
* @node: the device tree node
|
|
*
|
|
* Read the xlnx,video-format, xlnx,video-width and xlnx,cfa-pattern properties
|
|
* from the device tree @node passed as an argument and return the corresponding
|
|
* format information.
|
|
*
|
|
* Return: a pointer to the format information structure corresponding to the
|
|
* format name and width, or ERR_PTR if no corresponding format can be found.
|
|
*/
|
|
const struct xvip_video_format *xvip_of_get_format(struct device_node *node)
|
|
{
|
|
const char *pattern = "mono";
|
|
unsigned int vf_code;
|
|
unsigned int i;
|
|
u32 width;
|
|
int ret;
|
|
|
|
ret = of_property_read_u32(node, "xlnx,video-format", &vf_code);
|
|
if (ret < 0)
|
|
return ERR_PTR(ret);
|
|
|
|
ret = of_property_read_u32(node, "xlnx,video-width", &width);
|
|
if (ret < 0)
|
|
return ERR_PTR(ret);
|
|
|
|
if (vf_code == XVIP_VF_MONO_SENSOR)
|
|
of_property_read_string(node, "xlnx,cfa-pattern", &pattern);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(xvip_video_formats); ++i) {
|
|
const struct xvip_video_format *format = &xvip_video_formats[i];
|
|
|
|
if (format->vf_code != vf_code || format->width != width)
|
|
continue;
|
|
|
|
if (vf_code == XVIP_VF_MONO_SENSOR &&
|
|
strcmp(pattern, format->pattern))
|
|
continue;
|
|
|
|
return format;
|
|
}
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_of_get_format);
|
|
|
|
/**
|
|
* xvip_set_format_size - Set the media bus frame format size
|
|
* @format: V4L2 frame format on media bus
|
|
* @fmt: media bus format
|
|
*
|
|
* Set the media bus frame format size. The width / height from the subdevice
|
|
* format are set to the given media bus format. The new format size is stored
|
|
* in @format. The width and height are clamped using default min / max values.
|
|
*/
|
|
void xvip_set_format_size(struct v4l2_mbus_framefmt *format,
|
|
const struct v4l2_subdev_format *fmt)
|
|
{
|
|
format->width = clamp_t(unsigned int, fmt->format.width,
|
|
XVIP_MIN_WIDTH, XVIP_MAX_WIDTH);
|
|
format->height = clamp_t(unsigned int, fmt->format.height,
|
|
XVIP_MIN_HEIGHT, XVIP_MAX_HEIGHT);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_set_format_size);
|
|
|
|
/**
|
|
* xvip_clr_or_set - Clear or set the register with a bitmask
|
|
* @xvip: Xilinx Video IP device
|
|
* @addr: address of register
|
|
* @mask: bitmask to be set or cleared
|
|
* @set: boolean flag indicating whether to set or clear
|
|
*
|
|
* Clear or set the register at address @addr with a bitmask @mask depending on
|
|
* the boolean flag @set. When the flag @set is true, the bitmask is set in
|
|
* the register, otherwise the bitmask is cleared from the register
|
|
* when the flag @set is false.
|
|
*
|
|
* Fox example, this function can be used to set a control with a boolean value
|
|
* requested by users. If the caller knows whether to set or clear in the first
|
|
* place, the caller should call xvip_clr() or xvip_set() directly instead of
|
|
* using this function.
|
|
*/
|
|
void xvip_clr_or_set(struct xvip_device *xvip, u32 addr, u32 mask, bool set)
|
|
{
|
|
u32 reg;
|
|
|
|
reg = xvip_read(xvip, addr);
|
|
reg = set ? reg | mask : reg & ~mask;
|
|
xvip_write(xvip, addr, reg);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_clr_or_set);
|
|
|
|
/**
|
|
* xvip_clr_and_set - Clear and set the register with a bitmask
|
|
* @xvip: Xilinx Video IP device
|
|
* @addr: address of register
|
|
* @clr: bitmask to be cleared
|
|
* @set: bitmask to be set
|
|
*
|
|
* Clear a bit(s) of mask @clr in the register at address @addr, then set
|
|
* a bit(s) of mask @set in the register after.
|
|
*/
|
|
void xvip_clr_and_set(struct xvip_device *xvip, u32 addr, u32 clr, u32 set)
|
|
{
|
|
u32 reg;
|
|
|
|
reg = xvip_read(xvip, addr);
|
|
reg &= ~clr;
|
|
reg |= set;
|
|
xvip_write(xvip, addr, reg);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_clr_and_set);
|
|
|
|
int xvip_init_resources(struct xvip_device *xvip)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(xvip->dev);
|
|
struct resource *res;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
xvip->iomem = devm_ioremap_resource(xvip->dev, res);
|
|
if (IS_ERR(xvip->iomem))
|
|
return PTR_ERR(xvip->iomem);
|
|
|
|
xvip->clk = devm_clk_get(xvip->dev, NULL);
|
|
if (IS_ERR(xvip->clk))
|
|
return PTR_ERR(xvip->clk);
|
|
|
|
clk_prepare_enable(xvip->clk);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_init_resources);
|
|
|
|
void xvip_cleanup_resources(struct xvip_device *xvip)
|
|
{
|
|
clk_disable_unprepare(xvip->clk);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_cleanup_resources);
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Subdev operations handlers
|
|
*/
|
|
|
|
/**
|
|
* xvip_enum_mbus_code - Enumerate the media format code
|
|
* @subdev: V4L2 subdevice
|
|
* @sd_state: V4L2 subdev state
|
|
* @code: returning media bus code
|
|
*
|
|
* Enumerate the media bus code of the subdevice. Return the corresponding
|
|
* pad format code. This function only works for subdevices with fixed format
|
|
* on all pads. Subdevices with multiple format should have their own
|
|
* function to enumerate mbus codes.
|
|
*
|
|
* Return: 0 if the media bus code is found, or -EINVAL if the format index
|
|
* is not valid.
|
|
*/
|
|
int xvip_enum_mbus_code(struct v4l2_subdev *subdev,
|
|
struct v4l2_subdev_state *sd_state,
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
{
|
|
struct v4l2_mbus_framefmt *format;
|
|
|
|
/* Enumerating frame sizes based on the active configuration isn't
|
|
* supported yet.
|
|
*/
|
|
if (code->which == V4L2_SUBDEV_FORMAT_ACTIVE)
|
|
return -EINVAL;
|
|
|
|
if (code->index)
|
|
return -EINVAL;
|
|
|
|
format = v4l2_subdev_get_try_format(subdev, sd_state, code->pad);
|
|
|
|
code->code = format->code;
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_enum_mbus_code);
|
|
|
|
/**
|
|
* xvip_enum_frame_size - Enumerate the media bus frame size
|
|
* @subdev: V4L2 subdevice
|
|
* @sd_state: V4L2 subdev state
|
|
* @fse: returning media bus frame size
|
|
*
|
|
* This function is a drop-in implementation of the subdev enum_frame_size pad
|
|
* operation. It assumes that the subdevice has one sink pad and one source
|
|
* pad, and that the format on the source pad is always identical to the
|
|
* format on the sink pad. Entities with different requirements need to
|
|
* implement their own enum_frame_size handlers.
|
|
*
|
|
* Return: 0 if the media bus frame size is found, or -EINVAL
|
|
* if the index or the code is not valid.
|
|
*/
|
|
int xvip_enum_frame_size(struct v4l2_subdev *subdev,
|
|
struct v4l2_subdev_state *sd_state,
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
{
|
|
struct v4l2_mbus_framefmt *format;
|
|
|
|
/* Enumerating frame sizes based on the active configuration isn't
|
|
* supported yet.
|
|
*/
|
|
if (fse->which == V4L2_SUBDEV_FORMAT_ACTIVE)
|
|
return -EINVAL;
|
|
|
|
format = v4l2_subdev_get_try_format(subdev, sd_state, fse->pad);
|
|
|
|
if (fse->index || fse->code != format->code)
|
|
return -EINVAL;
|
|
|
|
if (fse->pad == XVIP_PAD_SINK) {
|
|
fse->min_width = XVIP_MIN_WIDTH;
|
|
fse->max_width = XVIP_MAX_WIDTH;
|
|
fse->min_height = XVIP_MIN_HEIGHT;
|
|
fse->max_height = XVIP_MAX_HEIGHT;
|
|
} else {
|
|
/* The size on the source pad is fixed and always identical to
|
|
* the size on the sink pad.
|
|
*/
|
|
fse->min_width = format->width;
|
|
fse->max_width = format->width;
|
|
fse->min_height = format->height;
|
|
fse->max_height = format->height;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(xvip_enum_frame_size);
|