2019-05-27 14:55:06 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2017-04-11 19:28:46 +08:00
|
|
|
/*
|
|
|
|
|
* Driver for the OV5645 camera sensor.
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
|
|
|
|
|
* Copyright (C) 2015 By Tech Design S.L. All Rights Reserved.
|
|
|
|
|
* Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Based on:
|
|
|
|
|
* - the OV5645 driver from QC msm-3.10 kernel on codeaurora.org:
|
|
|
|
|
* https://us.codeaurora.org/cgit/quic/la/kernel/msm-3.10/tree/drivers/
|
|
|
|
|
* media/platform/msm/camera_v2/sensor/ov5645.c?h=LA.BR.1.2.4_rb1.41
|
|
|
|
|
* - the OV5640 driver posted on linux-media:
|
|
|
|
|
* https://www.mail-archive.com/linux-media%40vger.kernel.org/msg92671.html
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/bitops.h>
|
|
|
|
|
#include <linux/clk.h>
|
|
|
|
|
#include <linux/delay.h>
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
|
#include <linux/gpio/consumer.h>
|
|
|
|
|
#include <linux/i2c.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/of.h>
|
|
|
|
|
#include <linux/of_graph.h>
|
|
|
|
|
#include <linux/regulator/consumer.h>
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
|
#include <media/v4l2-ctrls.h>
|
2016-08-27 07:17:25 +08:00
|
|
|
#include <media/v4l2-fwnode.h>
|
2017-04-11 19:28:46 +08:00
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
|
|
|
|
|
|
#define OV5645_SYSTEM_CTRL0 0x3008
|
|
|
|
|
#define OV5645_SYSTEM_CTRL0_START 0x02
|
|
|
|
|
#define OV5645_SYSTEM_CTRL0_STOP 0x42
|
|
|
|
|
#define OV5645_CHIP_ID_HIGH 0x300a
|
|
|
|
|
#define OV5645_CHIP_ID_HIGH_BYTE 0x56
|
|
|
|
|
#define OV5645_CHIP_ID_LOW 0x300b
|
|
|
|
|
#define OV5645_CHIP_ID_LOW_BYTE 0x45
|
2019-08-08 19:05:40 +08:00
|
|
|
#define OV5645_IO_MIPI_CTRL00 0x300e
|
|
|
|
|
#define OV5645_PAD_OUTPUT00 0x3019
|
2017-04-11 19:28:46 +08:00
|
|
|
#define OV5645_AWB_MANUAL_CONTROL 0x3406
|
|
|
|
|
#define OV5645_AWB_MANUAL_ENABLE BIT(0)
|
|
|
|
|
#define OV5645_AEC_PK_MANUAL 0x3503
|
|
|
|
|
#define OV5645_AEC_MANUAL_ENABLE BIT(0)
|
|
|
|
|
#define OV5645_AGC_MANUAL_ENABLE BIT(1)
|
|
|
|
|
#define OV5645_TIMING_TC_REG20 0x3820
|
|
|
|
|
#define OV5645_SENSOR_VFLIP BIT(1)
|
|
|
|
|
#define OV5645_ISP_VFLIP BIT(2)
|
|
|
|
|
#define OV5645_TIMING_TC_REG21 0x3821
|
|
|
|
|
#define OV5645_SENSOR_MIRROR BIT(1)
|
2019-08-08 19:05:40 +08:00
|
|
|
#define OV5645_MIPI_CTRL00 0x4800
|
2017-04-11 19:28:46 +08:00
|
|
|
#define OV5645_PRE_ISP_TEST_SETTING_1 0x503d
|
|
|
|
|
#define OV5645_TEST_PATTERN_MASK 0x3
|
|
|
|
|
#define OV5645_SET_TEST_PATTERN(x) ((x) & OV5645_TEST_PATTERN_MASK)
|
|
|
|
|
#define OV5645_TEST_PATTERN_ENABLE BIT(7)
|
|
|
|
|
#define OV5645_SDE_SAT_U 0x5583
|
|
|
|
|
#define OV5645_SDE_SAT_V 0x5584
|
|
|
|
|
|
2019-06-28 02:22:31 +08:00
|
|
|
/* regulator supplies */
|
|
|
|
|
static const char * const ov5645_supply_name[] = {
|
|
|
|
|
"vdddo", /* Digital I/O (1.8V) supply */
|
|
|
|
|
"vdda", /* Analog (2.8V) supply */
|
|
|
|
|
"vddd", /* Digital Core (1.5V) supply */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define OV5645_NUM_SUPPLIES ARRAY_SIZE(ov5645_supply_name)
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
struct reg_value {
|
|
|
|
|
u16 reg;
|
|
|
|
|
u8 val;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ov5645_mode_info {
|
|
|
|
|
u32 width;
|
|
|
|
|
u32 height;
|
|
|
|
|
const struct reg_value *data;
|
|
|
|
|
u32 data_size;
|
2017-07-05 16:44:48 +08:00
|
|
|
u32 pixel_clock;
|
2017-07-05 16:44:49 +08:00
|
|
|
u32 link_freq;
|
2017-04-11 19:28:46 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ov5645 {
|
|
|
|
|
struct i2c_client *i2c_client;
|
|
|
|
|
struct device *dev;
|
|
|
|
|
struct v4l2_subdev sd;
|
|
|
|
|
struct media_pad pad;
|
2016-08-27 07:17:25 +08:00
|
|
|
struct v4l2_fwnode_endpoint ep;
|
2017-04-11 19:28:46 +08:00
|
|
|
struct v4l2_mbus_framefmt fmt;
|
|
|
|
|
struct v4l2_rect crop;
|
|
|
|
|
struct clk *xclk;
|
|
|
|
|
|
2019-06-28 02:22:31 +08:00
|
|
|
struct regulator_bulk_data supplies[OV5645_NUM_SUPPLIES];
|
2017-04-11 19:28:46 +08:00
|
|
|
|
|
|
|
|
const struct ov5645_mode_info *current_mode;
|
|
|
|
|
|
|
|
|
|
struct v4l2_ctrl_handler ctrls;
|
2017-07-05 16:44:48 +08:00
|
|
|
struct v4l2_ctrl *pixel_clock;
|
2017-07-05 16:44:49 +08:00
|
|
|
struct v4l2_ctrl *link_freq;
|
2017-04-11 19:28:46 +08:00
|
|
|
|
|
|
|
|
/* Cached register values */
|
|
|
|
|
u8 aec_pk_manual;
|
|
|
|
|
u8 timing_tc_reg20;
|
|
|
|
|
u8 timing_tc_reg21;
|
|
|
|
|
|
|
|
|
|
struct mutex power_lock; /* lock to protect power state */
|
|
|
|
|
int power_count;
|
|
|
|
|
|
|
|
|
|
struct gpio_desc *enable_gpio;
|
|
|
|
|
struct gpio_desc *rst_gpio;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static inline struct ov5645 *to_ov5645(struct v4l2_subdev *sd)
|
|
|
|
|
{
|
|
|
|
|
return container_of(sd, struct ov5645, sd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct reg_value ov5645_global_init_setting[] = {
|
|
|
|
|
{ 0x3103, 0x11 },
|
|
|
|
|
{ 0x3008, 0x82 },
|
|
|
|
|
{ 0x3008, 0x42 },
|
|
|
|
|
{ 0x3103, 0x03 },
|
|
|
|
|
{ 0x3503, 0x07 },
|
|
|
|
|
{ 0x3002, 0x1c },
|
|
|
|
|
{ 0x3006, 0xc3 },
|
|
|
|
|
{ 0x3017, 0x00 },
|
|
|
|
|
{ 0x3018, 0x00 },
|
|
|
|
|
{ 0x302e, 0x0b },
|
|
|
|
|
{ 0x3037, 0x13 },
|
|
|
|
|
{ 0x3108, 0x01 },
|
|
|
|
|
{ 0x3611, 0x06 },
|
|
|
|
|
{ 0x3500, 0x00 },
|
|
|
|
|
{ 0x3501, 0x01 },
|
|
|
|
|
{ 0x3502, 0x00 },
|
|
|
|
|
{ 0x350a, 0x00 },
|
|
|
|
|
{ 0x350b, 0x3f },
|
|
|
|
|
{ 0x3620, 0x33 },
|
|
|
|
|
{ 0x3621, 0xe0 },
|
|
|
|
|
{ 0x3622, 0x01 },
|
|
|
|
|
{ 0x3630, 0x2e },
|
|
|
|
|
{ 0x3631, 0x00 },
|
|
|
|
|
{ 0x3632, 0x32 },
|
|
|
|
|
{ 0x3633, 0x52 },
|
|
|
|
|
{ 0x3634, 0x70 },
|
|
|
|
|
{ 0x3635, 0x13 },
|
|
|
|
|
{ 0x3636, 0x03 },
|
|
|
|
|
{ 0x3703, 0x5a },
|
|
|
|
|
{ 0x3704, 0xa0 },
|
|
|
|
|
{ 0x3705, 0x1a },
|
|
|
|
|
{ 0x3709, 0x12 },
|
|
|
|
|
{ 0x370b, 0x61 },
|
|
|
|
|
{ 0x370f, 0x10 },
|
|
|
|
|
{ 0x3715, 0x78 },
|
|
|
|
|
{ 0x3717, 0x01 },
|
|
|
|
|
{ 0x371b, 0x20 },
|
|
|
|
|
{ 0x3731, 0x12 },
|
|
|
|
|
{ 0x3901, 0x0a },
|
|
|
|
|
{ 0x3905, 0x02 },
|
|
|
|
|
{ 0x3906, 0x10 },
|
|
|
|
|
{ 0x3719, 0x86 },
|
|
|
|
|
{ 0x3810, 0x00 },
|
|
|
|
|
{ 0x3811, 0x10 },
|
|
|
|
|
{ 0x3812, 0x00 },
|
|
|
|
|
{ 0x3821, 0x01 },
|
|
|
|
|
{ 0x3824, 0x01 },
|
|
|
|
|
{ 0x3826, 0x03 },
|
|
|
|
|
{ 0x3828, 0x08 },
|
|
|
|
|
{ 0x3a19, 0xf8 },
|
|
|
|
|
{ 0x3c01, 0x34 },
|
|
|
|
|
{ 0x3c04, 0x28 },
|
|
|
|
|
{ 0x3c05, 0x98 },
|
|
|
|
|
{ 0x3c07, 0x07 },
|
|
|
|
|
{ 0x3c09, 0xc2 },
|
|
|
|
|
{ 0x3c0a, 0x9c },
|
|
|
|
|
{ 0x3c0b, 0x40 },
|
|
|
|
|
{ 0x3c01, 0x34 },
|
|
|
|
|
{ 0x4001, 0x02 },
|
|
|
|
|
{ 0x4514, 0x00 },
|
|
|
|
|
{ 0x4520, 0xb0 },
|
|
|
|
|
{ 0x460b, 0x37 },
|
|
|
|
|
{ 0x460c, 0x20 },
|
|
|
|
|
{ 0x4818, 0x01 },
|
|
|
|
|
{ 0x481d, 0xf0 },
|
|
|
|
|
{ 0x481f, 0x50 },
|
|
|
|
|
{ 0x4823, 0x70 },
|
|
|
|
|
{ 0x4831, 0x14 },
|
|
|
|
|
{ 0x5000, 0xa7 },
|
|
|
|
|
{ 0x5001, 0x83 },
|
|
|
|
|
{ 0x501d, 0x00 },
|
|
|
|
|
{ 0x501f, 0x00 },
|
|
|
|
|
{ 0x503d, 0x00 },
|
|
|
|
|
{ 0x505c, 0x30 },
|
|
|
|
|
{ 0x5181, 0x59 },
|
|
|
|
|
{ 0x5183, 0x00 },
|
|
|
|
|
{ 0x5191, 0xf0 },
|
|
|
|
|
{ 0x5192, 0x03 },
|
|
|
|
|
{ 0x5684, 0x10 },
|
|
|
|
|
{ 0x5685, 0xa0 },
|
|
|
|
|
{ 0x5686, 0x0c },
|
|
|
|
|
{ 0x5687, 0x78 },
|
|
|
|
|
{ 0x5a00, 0x08 },
|
|
|
|
|
{ 0x5a21, 0x00 },
|
|
|
|
|
{ 0x5a24, 0x00 },
|
|
|
|
|
{ 0x3008, 0x02 },
|
|
|
|
|
{ 0x3503, 0x00 },
|
|
|
|
|
{ 0x5180, 0xff },
|
|
|
|
|
{ 0x5181, 0xf2 },
|
|
|
|
|
{ 0x5182, 0x00 },
|
|
|
|
|
{ 0x5183, 0x14 },
|
|
|
|
|
{ 0x5184, 0x25 },
|
|
|
|
|
{ 0x5185, 0x24 },
|
|
|
|
|
{ 0x5186, 0x09 },
|
|
|
|
|
{ 0x5187, 0x09 },
|
|
|
|
|
{ 0x5188, 0x0a },
|
|
|
|
|
{ 0x5189, 0x75 },
|
|
|
|
|
{ 0x518a, 0x52 },
|
|
|
|
|
{ 0x518b, 0xea },
|
|
|
|
|
{ 0x518c, 0xa8 },
|
|
|
|
|
{ 0x518d, 0x42 },
|
|
|
|
|
{ 0x518e, 0x38 },
|
|
|
|
|
{ 0x518f, 0x56 },
|
|
|
|
|
{ 0x5190, 0x42 },
|
|
|
|
|
{ 0x5191, 0xf8 },
|
|
|
|
|
{ 0x5192, 0x04 },
|
|
|
|
|
{ 0x5193, 0x70 },
|
|
|
|
|
{ 0x5194, 0xf0 },
|
|
|
|
|
{ 0x5195, 0xf0 },
|
|
|
|
|
{ 0x5196, 0x03 },
|
|
|
|
|
{ 0x5197, 0x01 },
|
|
|
|
|
{ 0x5198, 0x04 },
|
|
|
|
|
{ 0x5199, 0x12 },
|
|
|
|
|
{ 0x519a, 0x04 },
|
|
|
|
|
{ 0x519b, 0x00 },
|
|
|
|
|
{ 0x519c, 0x06 },
|
|
|
|
|
{ 0x519d, 0x82 },
|
|
|
|
|
{ 0x519e, 0x38 },
|
|
|
|
|
{ 0x5381, 0x1e },
|
|
|
|
|
{ 0x5382, 0x5b },
|
|
|
|
|
{ 0x5383, 0x08 },
|
|
|
|
|
{ 0x5384, 0x0a },
|
|
|
|
|
{ 0x5385, 0x7e },
|
|
|
|
|
{ 0x5386, 0x88 },
|
|
|
|
|
{ 0x5387, 0x7c },
|
|
|
|
|
{ 0x5388, 0x6c },
|
|
|
|
|
{ 0x5389, 0x10 },
|
|
|
|
|
{ 0x538a, 0x01 },
|
|
|
|
|
{ 0x538b, 0x98 },
|
|
|
|
|
{ 0x5300, 0x08 },
|
|
|
|
|
{ 0x5301, 0x30 },
|
|
|
|
|
{ 0x5302, 0x10 },
|
|
|
|
|
{ 0x5303, 0x00 },
|
|
|
|
|
{ 0x5304, 0x08 },
|
|
|
|
|
{ 0x5305, 0x30 },
|
|
|
|
|
{ 0x5306, 0x08 },
|
|
|
|
|
{ 0x5307, 0x16 },
|
|
|
|
|
{ 0x5309, 0x08 },
|
|
|
|
|
{ 0x530a, 0x30 },
|
|
|
|
|
{ 0x530b, 0x04 },
|
|
|
|
|
{ 0x530c, 0x06 },
|
|
|
|
|
{ 0x5480, 0x01 },
|
|
|
|
|
{ 0x5481, 0x08 },
|
|
|
|
|
{ 0x5482, 0x14 },
|
|
|
|
|
{ 0x5483, 0x28 },
|
|
|
|
|
{ 0x5484, 0x51 },
|
|
|
|
|
{ 0x5485, 0x65 },
|
|
|
|
|
{ 0x5486, 0x71 },
|
|
|
|
|
{ 0x5487, 0x7d },
|
|
|
|
|
{ 0x5488, 0x87 },
|
|
|
|
|
{ 0x5489, 0x91 },
|
|
|
|
|
{ 0x548a, 0x9a },
|
|
|
|
|
{ 0x548b, 0xaa },
|
|
|
|
|
{ 0x548c, 0xb8 },
|
|
|
|
|
{ 0x548d, 0xcd },
|
|
|
|
|
{ 0x548e, 0xdd },
|
|
|
|
|
{ 0x548f, 0xea },
|
|
|
|
|
{ 0x5490, 0x1d },
|
|
|
|
|
{ 0x5580, 0x02 },
|
|
|
|
|
{ 0x5583, 0x40 },
|
|
|
|
|
{ 0x5584, 0x10 },
|
|
|
|
|
{ 0x5589, 0x10 },
|
|
|
|
|
{ 0x558a, 0x00 },
|
|
|
|
|
{ 0x558b, 0xf8 },
|
|
|
|
|
{ 0x5800, 0x3f },
|
|
|
|
|
{ 0x5801, 0x16 },
|
|
|
|
|
{ 0x5802, 0x0e },
|
|
|
|
|
{ 0x5803, 0x0d },
|
|
|
|
|
{ 0x5804, 0x17 },
|
|
|
|
|
{ 0x5805, 0x3f },
|
|
|
|
|
{ 0x5806, 0x0b },
|
|
|
|
|
{ 0x5807, 0x06 },
|
|
|
|
|
{ 0x5808, 0x04 },
|
|
|
|
|
{ 0x5809, 0x04 },
|
|
|
|
|
{ 0x580a, 0x06 },
|
|
|
|
|
{ 0x580b, 0x0b },
|
|
|
|
|
{ 0x580c, 0x09 },
|
|
|
|
|
{ 0x580d, 0x03 },
|
|
|
|
|
{ 0x580e, 0x00 },
|
|
|
|
|
{ 0x580f, 0x00 },
|
|
|
|
|
{ 0x5810, 0x03 },
|
|
|
|
|
{ 0x5811, 0x08 },
|
|
|
|
|
{ 0x5812, 0x0a },
|
|
|
|
|
{ 0x5813, 0x03 },
|
|
|
|
|
{ 0x5814, 0x00 },
|
|
|
|
|
{ 0x5815, 0x00 },
|
|
|
|
|
{ 0x5816, 0x04 },
|
|
|
|
|
{ 0x5817, 0x09 },
|
|
|
|
|
{ 0x5818, 0x0f },
|
|
|
|
|
{ 0x5819, 0x08 },
|
|
|
|
|
{ 0x581a, 0x06 },
|
|
|
|
|
{ 0x581b, 0x06 },
|
|
|
|
|
{ 0x581c, 0x08 },
|
|
|
|
|
{ 0x581d, 0x0c },
|
|
|
|
|
{ 0x581e, 0x3f },
|
|
|
|
|
{ 0x581f, 0x1e },
|
|
|
|
|
{ 0x5820, 0x12 },
|
|
|
|
|
{ 0x5821, 0x13 },
|
|
|
|
|
{ 0x5822, 0x21 },
|
|
|
|
|
{ 0x5823, 0x3f },
|
|
|
|
|
{ 0x5824, 0x68 },
|
|
|
|
|
{ 0x5825, 0x28 },
|
|
|
|
|
{ 0x5826, 0x2c },
|
|
|
|
|
{ 0x5827, 0x28 },
|
|
|
|
|
{ 0x5828, 0x08 },
|
|
|
|
|
{ 0x5829, 0x48 },
|
|
|
|
|
{ 0x582a, 0x64 },
|
|
|
|
|
{ 0x582b, 0x62 },
|
|
|
|
|
{ 0x582c, 0x64 },
|
|
|
|
|
{ 0x582d, 0x28 },
|
|
|
|
|
{ 0x582e, 0x46 },
|
|
|
|
|
{ 0x582f, 0x62 },
|
|
|
|
|
{ 0x5830, 0x60 },
|
|
|
|
|
{ 0x5831, 0x62 },
|
|
|
|
|
{ 0x5832, 0x26 },
|
|
|
|
|
{ 0x5833, 0x48 },
|
|
|
|
|
{ 0x5834, 0x66 },
|
|
|
|
|
{ 0x5835, 0x44 },
|
|
|
|
|
{ 0x5836, 0x64 },
|
|
|
|
|
{ 0x5837, 0x28 },
|
|
|
|
|
{ 0x5838, 0x66 },
|
|
|
|
|
{ 0x5839, 0x48 },
|
|
|
|
|
{ 0x583a, 0x2c },
|
|
|
|
|
{ 0x583b, 0x28 },
|
|
|
|
|
{ 0x583c, 0x26 },
|
|
|
|
|
{ 0x583d, 0xae },
|
|
|
|
|
{ 0x5025, 0x00 },
|
|
|
|
|
{ 0x3a0f, 0x30 },
|
|
|
|
|
{ 0x3a10, 0x28 },
|
|
|
|
|
{ 0x3a1b, 0x30 },
|
|
|
|
|
{ 0x3a1e, 0x26 },
|
|
|
|
|
{ 0x3a11, 0x60 },
|
|
|
|
|
{ 0x3a1f, 0x14 },
|
|
|
|
|
{ 0x0601, 0x02 },
|
|
|
|
|
{ 0x3008, 0x42 },
|
2019-08-08 19:05:40 +08:00
|
|
|
{ 0x3008, 0x02 },
|
|
|
|
|
{ OV5645_IO_MIPI_CTRL00, 0x40 },
|
|
|
|
|
{ OV5645_MIPI_CTRL00, 0x24 },
|
|
|
|
|
{ OV5645_PAD_OUTPUT00, 0x70 }
|
2017-04-11 19:28:46 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct reg_value ov5645_setting_sxga[] = {
|
|
|
|
|
{ 0x3612, 0xa9 },
|
|
|
|
|
{ 0x3614, 0x50 },
|
|
|
|
|
{ 0x3618, 0x00 },
|
|
|
|
|
{ 0x3034, 0x18 },
|
|
|
|
|
{ 0x3035, 0x21 },
|
|
|
|
|
{ 0x3036, 0x70 },
|
|
|
|
|
{ 0x3600, 0x09 },
|
|
|
|
|
{ 0x3601, 0x43 },
|
|
|
|
|
{ 0x3708, 0x66 },
|
|
|
|
|
{ 0x370c, 0xc3 },
|
|
|
|
|
{ 0x3800, 0x00 },
|
|
|
|
|
{ 0x3801, 0x00 },
|
|
|
|
|
{ 0x3802, 0x00 },
|
|
|
|
|
{ 0x3803, 0x06 },
|
|
|
|
|
{ 0x3804, 0x0a },
|
|
|
|
|
{ 0x3805, 0x3f },
|
|
|
|
|
{ 0x3806, 0x07 },
|
|
|
|
|
{ 0x3807, 0x9d },
|
|
|
|
|
{ 0x3808, 0x05 },
|
|
|
|
|
{ 0x3809, 0x00 },
|
|
|
|
|
{ 0x380a, 0x03 },
|
|
|
|
|
{ 0x380b, 0xc0 },
|
|
|
|
|
{ 0x380c, 0x07 },
|
|
|
|
|
{ 0x380d, 0x68 },
|
|
|
|
|
{ 0x380e, 0x03 },
|
|
|
|
|
{ 0x380f, 0xd8 },
|
|
|
|
|
{ 0x3813, 0x06 },
|
|
|
|
|
{ 0x3814, 0x31 },
|
|
|
|
|
{ 0x3815, 0x31 },
|
|
|
|
|
{ 0x3820, 0x47 },
|
|
|
|
|
{ 0x3a02, 0x03 },
|
|
|
|
|
{ 0x3a03, 0xd8 },
|
|
|
|
|
{ 0x3a08, 0x01 },
|
|
|
|
|
{ 0x3a09, 0xf8 },
|
|
|
|
|
{ 0x3a0a, 0x01 },
|
|
|
|
|
{ 0x3a0b, 0xa4 },
|
|
|
|
|
{ 0x3a0e, 0x02 },
|
|
|
|
|
{ 0x3a0d, 0x02 },
|
|
|
|
|
{ 0x3a14, 0x03 },
|
|
|
|
|
{ 0x3a15, 0xd8 },
|
|
|
|
|
{ 0x3a18, 0x00 },
|
|
|
|
|
{ 0x4004, 0x02 },
|
|
|
|
|
{ 0x4005, 0x18 },
|
|
|
|
|
{ 0x4300, 0x32 },
|
|
|
|
|
{ 0x4202, 0x00 }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct reg_value ov5645_setting_1080p[] = {
|
|
|
|
|
{ 0x3612, 0xab },
|
|
|
|
|
{ 0x3614, 0x50 },
|
|
|
|
|
{ 0x3618, 0x04 },
|
|
|
|
|
{ 0x3034, 0x18 },
|
|
|
|
|
{ 0x3035, 0x11 },
|
|
|
|
|
{ 0x3036, 0x54 },
|
|
|
|
|
{ 0x3600, 0x08 },
|
|
|
|
|
{ 0x3601, 0x33 },
|
|
|
|
|
{ 0x3708, 0x63 },
|
|
|
|
|
{ 0x370c, 0xc0 },
|
|
|
|
|
{ 0x3800, 0x01 },
|
|
|
|
|
{ 0x3801, 0x50 },
|
|
|
|
|
{ 0x3802, 0x01 },
|
|
|
|
|
{ 0x3803, 0xb2 },
|
|
|
|
|
{ 0x3804, 0x08 },
|
|
|
|
|
{ 0x3805, 0xef },
|
|
|
|
|
{ 0x3806, 0x05 },
|
|
|
|
|
{ 0x3807, 0xf1 },
|
|
|
|
|
{ 0x3808, 0x07 },
|
|
|
|
|
{ 0x3809, 0x80 },
|
|
|
|
|
{ 0x380a, 0x04 },
|
|
|
|
|
{ 0x380b, 0x38 },
|
|
|
|
|
{ 0x380c, 0x09 },
|
|
|
|
|
{ 0x380d, 0xc4 },
|
|
|
|
|
{ 0x380e, 0x04 },
|
|
|
|
|
{ 0x380f, 0x60 },
|
|
|
|
|
{ 0x3813, 0x04 },
|
|
|
|
|
{ 0x3814, 0x11 },
|
|
|
|
|
{ 0x3815, 0x11 },
|
|
|
|
|
{ 0x3820, 0x47 },
|
|
|
|
|
{ 0x4514, 0x88 },
|
|
|
|
|
{ 0x3a02, 0x04 },
|
|
|
|
|
{ 0x3a03, 0x60 },
|
|
|
|
|
{ 0x3a08, 0x01 },
|
|
|
|
|
{ 0x3a09, 0x50 },
|
|
|
|
|
{ 0x3a0a, 0x01 },
|
|
|
|
|
{ 0x3a0b, 0x18 },
|
|
|
|
|
{ 0x3a0e, 0x03 },
|
|
|
|
|
{ 0x3a0d, 0x04 },
|
|
|
|
|
{ 0x3a14, 0x04 },
|
|
|
|
|
{ 0x3a15, 0x60 },
|
|
|
|
|
{ 0x3a18, 0x00 },
|
|
|
|
|
{ 0x4004, 0x06 },
|
|
|
|
|
{ 0x4005, 0x18 },
|
|
|
|
|
{ 0x4300, 0x32 },
|
|
|
|
|
{ 0x4202, 0x00 },
|
|
|
|
|
{ 0x4837, 0x0b }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct reg_value ov5645_setting_full[] = {
|
|
|
|
|
{ 0x3612, 0xab },
|
|
|
|
|
{ 0x3614, 0x50 },
|
|
|
|
|
{ 0x3618, 0x04 },
|
|
|
|
|
{ 0x3034, 0x18 },
|
|
|
|
|
{ 0x3035, 0x11 },
|
|
|
|
|
{ 0x3036, 0x54 },
|
|
|
|
|
{ 0x3600, 0x08 },
|
|
|
|
|
{ 0x3601, 0x33 },
|
|
|
|
|
{ 0x3708, 0x63 },
|
|
|
|
|
{ 0x370c, 0xc0 },
|
|
|
|
|
{ 0x3800, 0x00 },
|
|
|
|
|
{ 0x3801, 0x00 },
|
|
|
|
|
{ 0x3802, 0x00 },
|
|
|
|
|
{ 0x3803, 0x00 },
|
|
|
|
|
{ 0x3804, 0x0a },
|
|
|
|
|
{ 0x3805, 0x3f },
|
|
|
|
|
{ 0x3806, 0x07 },
|
|
|
|
|
{ 0x3807, 0x9f },
|
|
|
|
|
{ 0x3808, 0x0a },
|
|
|
|
|
{ 0x3809, 0x20 },
|
|
|
|
|
{ 0x380a, 0x07 },
|
|
|
|
|
{ 0x380b, 0x98 },
|
|
|
|
|
{ 0x380c, 0x0b },
|
|
|
|
|
{ 0x380d, 0x1c },
|
|
|
|
|
{ 0x380e, 0x07 },
|
|
|
|
|
{ 0x380f, 0xb0 },
|
|
|
|
|
{ 0x3813, 0x06 },
|
|
|
|
|
{ 0x3814, 0x11 },
|
|
|
|
|
{ 0x3815, 0x11 },
|
|
|
|
|
{ 0x3820, 0x47 },
|
|
|
|
|
{ 0x4514, 0x88 },
|
|
|
|
|
{ 0x3a02, 0x07 },
|
|
|
|
|
{ 0x3a03, 0xb0 },
|
|
|
|
|
{ 0x3a08, 0x01 },
|
|
|
|
|
{ 0x3a09, 0x27 },
|
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
|
{ 0x3a0b, 0xf6 },
|
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
|
{ 0x3a14, 0x07 },
|
|
|
|
|
{ 0x3a15, 0xb0 },
|
|
|
|
|
{ 0x3a18, 0x01 },
|
|
|
|
|
{ 0x4004, 0x06 },
|
|
|
|
|
{ 0x4005, 0x18 },
|
|
|
|
|
{ 0x4300, 0x32 },
|
|
|
|
|
{ 0x4837, 0x0b },
|
|
|
|
|
{ 0x4202, 0x00 }
|
|
|
|
|
};
|
|
|
|
|
|
2017-07-05 16:44:49 +08:00
|
|
|
static const s64 link_freq[] = {
|
2018-06-18 16:06:58 +08:00
|
|
|
224000000,
|
|
|
|
|
336000000
|
2017-07-05 16:44:49 +08:00
|
|
|
};
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
static const struct ov5645_mode_info ov5645_mode_info_data[] = {
|
|
|
|
|
{
|
|
|
|
|
.width = 1280,
|
|
|
|
|
.height = 960,
|
|
|
|
|
.data = ov5645_setting_sxga,
|
2017-07-05 16:44:48 +08:00
|
|
|
.data_size = ARRAY_SIZE(ov5645_setting_sxga),
|
2018-06-18 16:06:58 +08:00
|
|
|
.pixel_clock = 112000000,
|
2017-07-05 16:44:49 +08:00
|
|
|
.link_freq = 0 /* an index in link_freq[] */
|
2017-04-11 19:28:46 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.width = 1920,
|
|
|
|
|
.height = 1080,
|
|
|
|
|
.data = ov5645_setting_1080p,
|
2017-07-05 16:44:48 +08:00
|
|
|
.data_size = ARRAY_SIZE(ov5645_setting_1080p),
|
2018-06-18 16:06:58 +08:00
|
|
|
.pixel_clock = 168000000,
|
2017-07-05 16:44:49 +08:00
|
|
|
.link_freq = 1 /* an index in link_freq[] */
|
2017-04-11 19:28:46 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.width = 2592,
|
|
|
|
|
.height = 1944,
|
|
|
|
|
.data = ov5645_setting_full,
|
2017-07-05 16:44:48 +08:00
|
|
|
.data_size = ARRAY_SIZE(ov5645_setting_full),
|
2018-06-18 16:06:58 +08:00
|
|
|
.pixel_clock = 168000000,
|
2017-07-05 16:44:49 +08:00
|
|
|
.link_freq = 1 /* an index in link_freq[] */
|
2017-04-11 19:28:46 +08:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov5645_write_reg(struct ov5645 *ov5645, u16 reg, u8 val)
|
|
|
|
|
{
|
|
|
|
|
u8 regbuf[3];
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
regbuf[0] = reg >> 8;
|
|
|
|
|
regbuf[1] = reg & 0xff;
|
|
|
|
|
regbuf[2] = val;
|
|
|
|
|
|
|
|
|
|
ret = i2c_master_send(ov5645->i2c_client, regbuf, 3);
|
2018-02-08 17:41:59 +08:00
|
|
|
if (ret < 0) {
|
2017-04-11 19:28:46 +08:00
|
|
|
dev_err(ov5645->dev, "%s: write reg error %d: reg=%x, val=%x\n",
|
|
|
|
|
__func__, ret, reg, val);
|
2018-02-08 17:41:59 +08:00
|
|
|
return ret;
|
|
|
|
|
}
|
2017-04-11 19:28:46 +08:00
|
|
|
|
2018-02-08 17:41:59 +08:00
|
|
|
return 0;
|
2017-04-11 19:28:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_read_reg(struct ov5645 *ov5645, u16 reg, u8 *val)
|
|
|
|
|
{
|
|
|
|
|
u8 regbuf[2];
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
regbuf[0] = reg >> 8;
|
|
|
|
|
regbuf[1] = reg & 0xff;
|
|
|
|
|
|
|
|
|
|
ret = i2c_master_send(ov5645->i2c_client, regbuf, 2);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(ov5645->dev, "%s: write reg error %d: reg=%x\n",
|
|
|
|
|
__func__, ret, reg);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = i2c_master_recv(ov5645->i2c_client, val, 1);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(ov5645->dev, "%s: read reg error %d: reg=%x\n",
|
|
|
|
|
__func__, ret, reg);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_aec_mode(struct ov5645 *ov5645, u32 mode)
|
|
|
|
|
{
|
|
|
|
|
u8 val = ov5645->aec_pk_manual;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (mode == V4L2_EXPOSURE_AUTO)
|
|
|
|
|
val &= ~OV5645_AEC_MANUAL_ENABLE;
|
|
|
|
|
else /* V4L2_EXPOSURE_MANUAL */
|
|
|
|
|
val |= OV5645_AEC_MANUAL_ENABLE;
|
|
|
|
|
|
|
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_AEC_PK_MANUAL, val);
|
|
|
|
|
if (!ret)
|
|
|
|
|
ov5645->aec_pk_manual = val;
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_agc_mode(struct ov5645 *ov5645, u32 enable)
|
|
|
|
|
{
|
|
|
|
|
u8 val = ov5645->aec_pk_manual;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (enable)
|
|
|
|
|
val &= ~OV5645_AGC_MANUAL_ENABLE;
|
|
|
|
|
else
|
|
|
|
|
val |= OV5645_AGC_MANUAL_ENABLE;
|
|
|
|
|
|
|
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_AEC_PK_MANUAL, val);
|
|
|
|
|
if (!ret)
|
|
|
|
|
ov5645->aec_pk_manual = val;
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_register_array(struct ov5645 *ov5645,
|
|
|
|
|
const struct reg_value *settings,
|
|
|
|
|
unsigned int num_settings)
|
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < num_settings; ++i, ++settings) {
|
|
|
|
|
ret = ov5645_write_reg(ov5645, settings->reg, settings->val);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_power_on(struct ov5645 *ov5645)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2019-06-28 02:22:31 +08:00
|
|
|
ret = regulator_bulk_enable(OV5645_NUM_SUPPLIES, ov5645->supplies);
|
|
|
|
|
if (ret < 0)
|
2017-04-11 19:28:46 +08:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
ret = clk_prepare_enable(ov5645->xclk);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(ov5645->dev, "clk prepare enable failed\n");
|
2019-06-28 02:22:31 +08:00
|
|
|
regulator_bulk_disable(OV5645_NUM_SUPPLIES, ov5645->supplies);
|
2017-04-11 19:28:46 +08:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usleep_range(5000, 15000);
|
|
|
|
|
gpiod_set_value_cansleep(ov5645->enable_gpio, 1);
|
|
|
|
|
|
|
|
|
|
usleep_range(1000, 2000);
|
|
|
|
|
gpiod_set_value_cansleep(ov5645->rst_gpio, 0);
|
|
|
|
|
|
|
|
|
|
msleep(20);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ov5645_set_power_off(struct ov5645 *ov5645)
|
|
|
|
|
{
|
|
|
|
|
gpiod_set_value_cansleep(ov5645->rst_gpio, 1);
|
|
|
|
|
gpiod_set_value_cansleep(ov5645->enable_gpio, 0);
|
|
|
|
|
clk_disable_unprepare(ov5645->xclk);
|
2019-06-28 02:22:31 +08:00
|
|
|
regulator_bulk_disable(OV5645_NUM_SUPPLIES, ov5645->supplies);
|
2017-04-11 19:28:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_s_power(struct v4l2_subdev *sd, int on)
|
|
|
|
|
{
|
|
|
|
|
struct ov5645 *ov5645 = to_ov5645(sd);
|
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&ov5645->power_lock);
|
|
|
|
|
|
|
|
|
|
/* If the power count is modified from 0 to != 0 or from != 0 to 0,
|
|
|
|
|
* update the power state.
|
|
|
|
|
*/
|
|
|
|
|
if (ov5645->power_count == !on) {
|
|
|
|
|
if (on) {
|
|
|
|
|
ret = ov5645_set_power_on(ov5645);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
|
|
ret = ov5645_set_register_array(ov5645,
|
|
|
|
|
ov5645_global_init_setting,
|
|
|
|
|
ARRAY_SIZE(ov5645_global_init_setting));
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(ov5645->dev,
|
|
|
|
|
"could not set init registers\n");
|
|
|
|
|
ov5645_set_power_off(ov5645);
|
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-08 19:05:40 +08:00
|
|
|
usleep_range(500, 1000);
|
2017-04-11 19:28:46 +08:00
|
|
|
} else {
|
2019-08-08 19:05:40 +08:00
|
|
|
ov5645_write_reg(ov5645, OV5645_IO_MIPI_CTRL00, 0x58);
|
2017-04-11 19:28:46 +08:00
|
|
|
ov5645_set_power_off(ov5645);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Update the power count. */
|
|
|
|
|
ov5645->power_count += on ? 1 : -1;
|
|
|
|
|
WARN_ON(ov5645->power_count < 0);
|
|
|
|
|
|
|
|
|
|
exit:
|
|
|
|
|
mutex_unlock(&ov5645->power_lock);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_saturation(struct ov5645 *ov5645, s32 value)
|
|
|
|
|
{
|
|
|
|
|
u32 reg_value = (value * 0x10) + 0x40;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_SDE_SAT_U, reg_value);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return ov5645_write_reg(ov5645, OV5645_SDE_SAT_V, reg_value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_hflip(struct ov5645 *ov5645, s32 value)
|
|
|
|
|
{
|
|
|
|
|
u8 val = ov5645->timing_tc_reg21;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (value == 0)
|
|
|
|
|
val &= ~(OV5645_SENSOR_MIRROR);
|
|
|
|
|
else
|
|
|
|
|
val |= (OV5645_SENSOR_MIRROR);
|
|
|
|
|
|
|
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_TIMING_TC_REG21, val);
|
|
|
|
|
if (!ret)
|
|
|
|
|
ov5645->timing_tc_reg21 = val;
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_vflip(struct ov5645 *ov5645, s32 value)
|
|
|
|
|
{
|
|
|
|
|
u8 val = ov5645->timing_tc_reg20;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (value == 0)
|
|
|
|
|
val |= (OV5645_SENSOR_VFLIP | OV5645_ISP_VFLIP);
|
|
|
|
|
else
|
|
|
|
|
val &= ~(OV5645_SENSOR_VFLIP | OV5645_ISP_VFLIP);
|
|
|
|
|
|
|
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_TIMING_TC_REG20, val);
|
|
|
|
|
if (!ret)
|
|
|
|
|
ov5645->timing_tc_reg20 = val;
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_test_pattern(struct ov5645 *ov5645, s32 value)
|
|
|
|
|
{
|
|
|
|
|
u8 val = 0;
|
|
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
|
val = OV5645_SET_TEST_PATTERN(value - 1);
|
|
|
|
|
val |= OV5645_TEST_PATTERN_ENABLE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ov5645_write_reg(ov5645, OV5645_PRE_ISP_TEST_SETTING_1, val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char * const ov5645_test_pattern_menu[] = {
|
|
|
|
|
"Disabled",
|
|
|
|
|
"Vertical Color Bars",
|
|
|
|
|
"Pseudo-Random Data",
|
|
|
|
|
"Color Square",
|
|
|
|
|
"Black Image",
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_awb(struct ov5645 *ov5645, s32 enable_auto)
|
|
|
|
|
{
|
|
|
|
|
u8 val = 0;
|
|
|
|
|
|
|
|
|
|
if (!enable_auto)
|
|
|
|
|
val = OV5645_AWB_MANUAL_ENABLE;
|
|
|
|
|
|
|
|
|
|
return ov5645_write_reg(ov5645, OV5645_AWB_MANUAL_CONTROL, val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
|
|
{
|
|
|
|
|
struct ov5645 *ov5645 = container_of(ctrl->handler,
|
|
|
|
|
struct ov5645, ctrls);
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&ov5645->power_lock);
|
|
|
|
|
if (!ov5645->power_count) {
|
|
|
|
|
mutex_unlock(&ov5645->power_lock);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
|
case V4L2_CID_SATURATION:
|
|
|
|
|
ret = ov5645_set_saturation(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_AUTO_WHITE_BALANCE:
|
|
|
|
|
ret = ov5645_set_awb(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_AUTOGAIN:
|
|
|
|
|
ret = ov5645_set_agc_mode(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_EXPOSURE_AUTO:
|
|
|
|
|
ret = ov5645_set_aec_mode(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_TEST_PATTERN:
|
|
|
|
|
ret = ov5645_set_test_pattern(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_HFLIP:
|
|
|
|
|
ret = ov5645_set_hflip(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_VFLIP:
|
|
|
|
|
ret = ov5645_set_vflip(ov5645, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
ret = -EINVAL;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_unlock(&ov5645->power_lock);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-27 20:16:40 +08:00
|
|
|
static const struct v4l2_ctrl_ops ov5645_ctrl_ops = {
|
2017-04-11 19:28:46 +08:00
|
|
|
.s_ctrl = ov5645_s_ctrl,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov5645_enum_mbus_code(struct v4l2_subdev *sd,
|
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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
|
|
|
{
|
|
|
|
|
if (code->index > 0)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
code->code = MEDIA_BUS_FMT_UYVY8_2X8;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
|
|
|
{
|
|
|
|
|
if (fse->code != MEDIA_BUS_FMT_UYVY8_2X8)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
if (fse->index >= ARRAY_SIZE(ov5645_mode_info_data))
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
fse->min_width = ov5645_mode_info_data[fse->index].width;
|
|
|
|
|
fse->max_width = ov5645_mode_info_data[fse->index].width;
|
|
|
|
|
fse->min_height = ov5645_mode_info_data[fse->index].height;
|
|
|
|
|
fse->max_height = ov5645_mode_info_data[fse->index].height;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct v4l2_mbus_framefmt *
|
|
|
|
|
__ov5645_get_pad_format(struct ov5645 *ov5645,
|
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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
unsigned int pad,
|
|
|
|
|
enum v4l2_subdev_format_whence which)
|
|
|
|
|
{
|
|
|
|
|
switch (which) {
|
|
|
|
|
case 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 22:55:58 +08:00
|
|
|
return v4l2_subdev_get_try_format(&ov5645->sd, sd_state, pad);
|
2017-04-11 19:28:46 +08:00
|
|
|
case V4L2_SUBDEV_FORMAT_ACTIVE:
|
|
|
|
|
return &ov5645->fmt;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_get_format(struct v4l2_subdev *sd,
|
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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
struct v4l2_subdev_format *format)
|
|
|
|
|
{
|
|
|
|
|
struct ov5645 *ov5645 = to_ov5645(sd);
|
|
|
|
|
|
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 22:55:58 +08:00
|
|
|
format->format = *__ov5645_get_pad_format(ov5645, sd_state,
|
|
|
|
|
format->pad,
|
2017-04-11 19:28:46 +08:00
|
|
|
format->which);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct v4l2_rect *
|
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 22:55:58 +08:00
|
|
|
__ov5645_get_pad_crop(struct ov5645 *ov5645,
|
|
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
unsigned int pad, enum v4l2_subdev_format_whence which)
|
|
|
|
|
{
|
|
|
|
|
switch (which) {
|
|
|
|
|
case 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 22:55:58 +08:00
|
|
|
return v4l2_subdev_get_try_crop(&ov5645->sd, sd_state, pad);
|
2017-04-11 19:28:46 +08:00
|
|
|
case V4L2_SUBDEV_FORMAT_ACTIVE:
|
|
|
|
|
return &ov5645->crop;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_set_format(struct v4l2_subdev *sd,
|
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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
struct v4l2_subdev_format *format)
|
|
|
|
|
{
|
|
|
|
|
struct ov5645 *ov5645 = to_ov5645(sd);
|
|
|
|
|
struct v4l2_mbus_framefmt *__format;
|
|
|
|
|
struct v4l2_rect *__crop;
|
|
|
|
|
const struct ov5645_mode_info *new_mode;
|
2017-07-05 16:44:48 +08:00
|
|
|
int ret;
|
2017-04-11 19:28:46 +08:00
|
|
|
|
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 22:55:58 +08:00
|
|
|
__crop = __ov5645_get_pad_crop(ov5645, sd_state, format->pad,
|
|
|
|
|
format->which);
|
2017-04-11 19:28:46 +08:00
|
|
|
|
2018-03-21 16:42:36 +08:00
|
|
|
new_mode = v4l2_find_nearest_size(ov5645_mode_info_data,
|
|
|
|
|
ARRAY_SIZE(ov5645_mode_info_data),
|
|
|
|
|
width, height,
|
|
|
|
|
format->format.width, format->format.height);
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
__crop->width = new_mode->width;
|
|
|
|
|
__crop->height = new_mode->height;
|
|
|
|
|
|
2017-07-05 16:44:48 +08:00
|
|
|
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
|
|
|
|
|
ret = v4l2_ctrl_s_ctrl_int64(ov5645->pixel_clock,
|
|
|
|
|
new_mode->pixel_clock);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-07-05 16:44:49 +08:00
|
|
|
ret = v4l2_ctrl_s_ctrl(ov5645->link_freq,
|
|
|
|
|
new_mode->link_freq);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
ov5645->current_mode = new_mode;
|
2017-07-05 16:44:48 +08:00
|
|
|
}
|
2017-04-11 19:28:46 +08:00
|
|
|
|
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 22:55:58 +08:00
|
|
|
__format = __ov5645_get_pad_format(ov5645, sd_state, format->pad,
|
|
|
|
|
format->which);
|
2017-04-11 19:28:46 +08:00
|
|
|
__format->width = __crop->width;
|
|
|
|
|
__format->height = __crop->height;
|
|
|
|
|
__format->code = MEDIA_BUS_FMT_UYVY8_2X8;
|
|
|
|
|
__format->field = V4L2_FIELD_NONE;
|
|
|
|
|
__format->colorspace = V4L2_COLORSPACE_SRGB;
|
|
|
|
|
|
|
|
|
|
format->format = *__format;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_entity_init_cfg(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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state)
|
2017-04-11 19:28:46 +08:00
|
|
|
{
|
|
|
|
|
struct v4l2_subdev_format fmt = { 0 };
|
|
|
|
|
|
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 22:55:58 +08:00
|
|
|
fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
|
2017-04-11 19:28:46 +08:00
|
|
|
fmt.format.width = 1920;
|
|
|
|
|
fmt.format.height = 1080;
|
|
|
|
|
|
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 22:55:58 +08:00
|
|
|
ov5645_set_format(subdev, sd_state, &fmt);
|
2017-04-11 19:28:46 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_get_selection(struct v4l2_subdev *sd,
|
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 22:55:58 +08:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-04-11 19:28:46 +08:00
|
|
|
struct v4l2_subdev_selection *sel)
|
|
|
|
|
{
|
|
|
|
|
struct ov5645 *ov5645 = to_ov5645(sd);
|
|
|
|
|
|
|
|
|
|
if (sel->target != V4L2_SEL_TGT_CROP)
|
|
|
|
|
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 22:55:58 +08:00
|
|
|
sel->r = *__ov5645_get_pad_crop(ov5645, sd_state, sel->pad,
|
2017-04-11 19:28:46 +08:00
|
|
|
sel->which);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_s_stream(struct v4l2_subdev *subdev, int enable)
|
|
|
|
|
{
|
|
|
|
|
struct ov5645 *ov5645 = to_ov5645(subdev);
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (enable) {
|
|
|
|
|
ret = ov5645_set_register_array(ov5645,
|
|
|
|
|
ov5645->current_mode->data,
|
|
|
|
|
ov5645->current_mode->data_size);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(ov5645->dev, "could not set mode %dx%d\n",
|
|
|
|
|
ov5645->current_mode->width,
|
|
|
|
|
ov5645->current_mode->height);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
ret = v4l2_ctrl_handler_setup(&ov5645->ctrls);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(ov5645->dev, "could not sync v4l2 controls\n");
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2019-08-08 19:05:40 +08:00
|
|
|
|
|
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_IO_MIPI_CTRL00, 0x45);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_SYSTEM_CTRL0,
|
|
|
|
|
OV5645_SYSTEM_CTRL0_START);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
} else {
|
2019-08-08 19:05:40 +08:00
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_IO_MIPI_CTRL00, 0x40);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
ret = ov5645_write_reg(ov5645, OV5645_SYSTEM_CTRL0,
|
|
|
|
|
OV5645_SYSTEM_CTRL0_STOP);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_core_ops ov5645_core_ops = {
|
|
|
|
|
.s_power = ov5645_s_power,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_video_ops ov5645_video_ops = {
|
|
|
|
|
.s_stream = ov5645_s_stream,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_pad_ops ov5645_subdev_pad_ops = {
|
|
|
|
|
.init_cfg = ov5645_entity_init_cfg,
|
|
|
|
|
.enum_mbus_code = ov5645_enum_mbus_code,
|
|
|
|
|
.enum_frame_size = ov5645_enum_frame_size,
|
|
|
|
|
.get_fmt = ov5645_get_format,
|
|
|
|
|
.set_fmt = ov5645_set_format,
|
|
|
|
|
.get_selection = ov5645_get_selection,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_ops ov5645_subdev_ops = {
|
|
|
|
|
.core = &ov5645_core_ops,
|
|
|
|
|
.video = &ov5645_video_ops,
|
|
|
|
|
.pad = &ov5645_subdev_pad_ops,
|
|
|
|
|
};
|
|
|
|
|
|
2019-07-11 05:51:49 +08:00
|
|
|
static int ov5645_probe(struct i2c_client *client)
|
2017-04-11 19:28:46 +08:00
|
|
|
{
|
|
|
|
|
struct device *dev = &client->dev;
|
|
|
|
|
struct device_node *endpoint;
|
|
|
|
|
struct ov5645 *ov5645;
|
|
|
|
|
u8 chip_id_high, chip_id_low;
|
2019-06-28 02:22:31 +08:00
|
|
|
unsigned int i;
|
2017-04-11 19:28:46 +08:00
|
|
|
u32 xclk_freq;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ov5645 = devm_kzalloc(dev, sizeof(struct ov5645), GFP_KERNEL);
|
|
|
|
|
if (!ov5645)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
ov5645->i2c_client = client;
|
|
|
|
|
ov5645->dev = dev;
|
|
|
|
|
|
|
|
|
|
endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
|
|
|
|
|
if (!endpoint) {
|
|
|
|
|
dev_err(dev, "endpoint node not found\n");
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-27 07:17:25 +08:00
|
|
|
ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
|
|
|
|
|
&ov5645->ep);
|
2018-03-20 00:14:17 +08:00
|
|
|
|
|
|
|
|
of_node_put(endpoint);
|
|
|
|
|
|
2017-04-11 19:28:46 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "parsing endpoint node failed\n");
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-04 05:19:27 +08:00
|
|
|
if (ov5645->ep.bus_type != V4L2_MBUS_CSI2_DPHY) {
|
2017-04-11 19:28:46 +08:00
|
|
|
dev_err(dev, "invalid bus type, must be CSI2\n");
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* get system clock (xclk) */
|
|
|
|
|
ov5645->xclk = devm_clk_get(dev, "xclk");
|
|
|
|
|
if (IS_ERR(ov5645->xclk)) {
|
|
|
|
|
dev_err(dev, "could not get xclk");
|
|
|
|
|
return PTR_ERR(ov5645->xclk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = of_property_read_u32(dev->of_node, "clock-frequency", &xclk_freq);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(dev, "could not get xclk frequency\n");
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-18 16:06:58 +08:00
|
|
|
/* external clock must be 24MHz, allow 1% tolerance */
|
|
|
|
|
if (xclk_freq < 23760000 || xclk_freq > 24240000) {
|
2017-04-11 19:28:46 +08:00
|
|
|
dev_err(dev, "external clock frequency %u is not supported\n",
|
|
|
|
|
xclk_freq);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = clk_set_rate(ov5645->xclk, xclk_freq);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(dev, "could not set xclk frequency\n");
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-28 02:22:31 +08:00
|
|
|
for (i = 0; i < OV5645_NUM_SUPPLIES; i++)
|
|
|
|
|
ov5645->supplies[i].supply = ov5645_supply_name[i];
|
2017-04-11 19:28:46 +08:00
|
|
|
|
2019-06-28 02:22:31 +08:00
|
|
|
ret = devm_regulator_bulk_get(dev, OV5645_NUM_SUPPLIES,
|
|
|
|
|
ov5645->supplies);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
2017-04-11 19:28:46 +08:00
|
|
|
|
|
|
|
|
ov5645->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_HIGH);
|
|
|
|
|
if (IS_ERR(ov5645->enable_gpio)) {
|
|
|
|
|
dev_err(dev, "cannot get enable gpio\n");
|
|
|
|
|
return PTR_ERR(ov5645->enable_gpio);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ov5645->rst_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
|
|
|
|
|
if (IS_ERR(ov5645->rst_gpio)) {
|
|
|
|
|
dev_err(dev, "cannot get reset gpio\n");
|
|
|
|
|
return PTR_ERR(ov5645->rst_gpio);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_init(&ov5645->power_lock);
|
|
|
|
|
|
2017-07-05 16:44:49 +08:00
|
|
|
v4l2_ctrl_handler_init(&ov5645->ctrls, 9);
|
2017-04-11 19:28:46 +08:00
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_SATURATION, -4, 4, 1, 0);
|
|
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_HFLIP, 0, 1, 1, 0);
|
|
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_VFLIP, 0, 1, 1, 0);
|
|
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
|
|
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
|
|
|
|
|
v4l2_ctrl_new_std_menu(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL,
|
|
|
|
|
0, V4L2_EXPOSURE_AUTO);
|
|
|
|
|
v4l2_ctrl_new_std_menu_items(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_TEST_PATTERN,
|
|
|
|
|
ARRAY_SIZE(ov5645_test_pattern_menu) - 1,
|
|
|
|
|
0, 0, ov5645_test_pattern_menu);
|
2017-07-05 16:44:48 +08:00
|
|
|
ov5645->pixel_clock = v4l2_ctrl_new_std(&ov5645->ctrls,
|
|
|
|
|
&ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_PIXEL_RATE,
|
|
|
|
|
1, INT_MAX, 1, 1);
|
2017-07-05 16:44:49 +08:00
|
|
|
ov5645->link_freq = v4l2_ctrl_new_int_menu(&ov5645->ctrls,
|
|
|
|
|
&ov5645_ctrl_ops,
|
|
|
|
|
V4L2_CID_LINK_FREQ,
|
|
|
|
|
ARRAY_SIZE(link_freq) - 1,
|
|
|
|
|
0, link_freq);
|
|
|
|
|
if (ov5645->link_freq)
|
|
|
|
|
ov5645->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
2017-04-11 19:28:46 +08:00
|
|
|
|
|
|
|
|
ov5645->sd.ctrl_handler = &ov5645->ctrls;
|
|
|
|
|
|
|
|
|
|
if (ov5645->ctrls.error) {
|
|
|
|
|
dev_err(dev, "%s: control initialization error %d\n",
|
|
|
|
|
__func__, ov5645->ctrls.error);
|
|
|
|
|
ret = ov5645->ctrls.error;
|
|
|
|
|
goto free_ctrl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
v4l2_i2c_subdev_init(&ov5645->sd, client, &ov5645_subdev_ops);
|
|
|
|
|
ov5645->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
|
|
|
|
|
ov5645->pad.flags = MEDIA_PAD_FL_SOURCE;
|
|
|
|
|
ov5645->sd.dev = &client->dev;
|
2017-07-05 16:44:47 +08:00
|
|
|
ov5645->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
|
2017-04-11 19:28:46 +08:00
|
|
|
|
|
|
|
|
ret = media_entity_pads_init(&ov5645->sd.entity, 1, &ov5645->pad);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "could not register media entity\n");
|
|
|
|
|
goto free_ctrl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = ov5645_s_power(&ov5645->sd, true);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "could not power up OV5645\n");
|
|
|
|
|
goto free_entity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_HIGH, &chip_id_high);
|
|
|
|
|
if (ret < 0 || chip_id_high != OV5645_CHIP_ID_HIGH_BYTE) {
|
|
|
|
|
dev_err(dev, "could not read ID high\n");
|
|
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto power_down;
|
|
|
|
|
}
|
|
|
|
|
ret = ov5645_read_reg(ov5645, OV5645_CHIP_ID_LOW, &chip_id_low);
|
|
|
|
|
if (ret < 0 || chip_id_low != OV5645_CHIP_ID_LOW_BYTE) {
|
|
|
|
|
dev_err(dev, "could not read ID low\n");
|
|
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto power_down;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dev_info(dev, "OV5645 detected at address 0x%02x\n", client->addr);
|
|
|
|
|
|
|
|
|
|
ret = ov5645_read_reg(ov5645, OV5645_AEC_PK_MANUAL,
|
|
|
|
|
&ov5645->aec_pk_manual);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "could not read AEC/AGC mode\n");
|
|
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto power_down;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = ov5645_read_reg(ov5645, OV5645_TIMING_TC_REG20,
|
|
|
|
|
&ov5645->timing_tc_reg20);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "could not read vflip value\n");
|
|
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto power_down;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = ov5645_read_reg(ov5645, OV5645_TIMING_TC_REG21,
|
|
|
|
|
&ov5645->timing_tc_reg21);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "could not read hflip value\n");
|
|
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto power_down;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ov5645_s_power(&ov5645->sd, false);
|
|
|
|
|
|
|
|
|
|
ret = v4l2_async_register_subdev(&ov5645->sd);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "could not register v4l2 device\n");
|
|
|
|
|
goto free_entity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ov5645_entity_init_cfg(&ov5645->sd, NULL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
power_down:
|
|
|
|
|
ov5645_s_power(&ov5645->sd, false);
|
|
|
|
|
free_entity:
|
|
|
|
|
media_entity_cleanup(&ov5645->sd.entity);
|
|
|
|
|
free_ctrl:
|
|
|
|
|
v4l2_ctrl_handler_free(&ov5645->ctrls);
|
|
|
|
|
mutex_destroy(&ov5645->power_lock);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5645_remove(struct i2c_client *client)
|
|
|
|
|
{
|
|
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
|
struct ov5645 *ov5645 = to_ov5645(sd);
|
|
|
|
|
|
|
|
|
|
v4l2_async_unregister_subdev(&ov5645->sd);
|
|
|
|
|
media_entity_cleanup(&ov5645->sd.entity);
|
|
|
|
|
v4l2_ctrl_handler_free(&ov5645->ctrls);
|
|
|
|
|
mutex_destroy(&ov5645->power_lock);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct i2c_device_id ov5645_id[] = {
|
|
|
|
|
{ "ov5645", 0 },
|
|
|
|
|
{}
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(i2c, ov5645_id);
|
|
|
|
|
|
|
|
|
|
static const struct of_device_id ov5645_of_match[] = {
|
|
|
|
|
{ .compatible = "ovti,ov5645" },
|
|
|
|
|
{ /* sentinel */ }
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(of, ov5645_of_match);
|
|
|
|
|
|
|
|
|
|
static struct i2c_driver ov5645_i2c_driver = {
|
|
|
|
|
.driver = {
|
|
|
|
|
.of_match_table = of_match_ptr(ov5645_of_match),
|
|
|
|
|
.name = "ov5645",
|
|
|
|
|
},
|
2019-07-11 05:51:49 +08:00
|
|
|
.probe_new = ov5645_probe,
|
2017-04-11 19:28:46 +08:00
|
|
|
.remove = ov5645_remove,
|
|
|
|
|
.id_table = ov5645_id,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
module_i2c_driver(ov5645_i2c_driver);
|
|
|
|
|
|
|
|
|
|
MODULE_DESCRIPTION("Omnivision OV5645 Camera Driver");
|
|
|
|
|
MODULE_AUTHOR("Todor Tomov <todor.tomov@linaro.org>");
|
|
|
|
|
MODULE_LICENSE("GPL v2");
|