2020-11-19 09:19:33 -07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-03-22 05:30:27 -07:00
|
|
|
/*
|
|
|
|
|
* A V4L2 driver for OmniVision OV5647 cameras.
|
|
|
|
|
*
|
|
|
|
|
* Based on Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor driver
|
|
|
|
|
* Copyright (C) 2011 Sylwester Nawrocki <s.nawrocki@samsung.com>
|
|
|
|
|
*
|
|
|
|
|
* Based on Omnivision OV7670 Camera Driver
|
|
|
|
|
* Copyright (C) 2006-7 Jonathan Corbet <corbet@lwn.net>
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2016, Synopsys, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/clk.h>
|
|
|
|
|
#include <linux/delay.h>
|
2020-11-19 09:19:28 -07:00
|
|
|
#include <linux/gpio/consumer.h>
|
2017-03-22 05:30:27 -07:00
|
|
|
#include <linux/i2c.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/io.h>
|
|
|
|
|
#include <linux/module.h>
|
2016-08-26 16:17:25 -07:00
|
|
|
#include <linux/of_graph.h>
|
2020-11-19 09:35:45 -07:00
|
|
|
#include <linux/pm_runtime.h>
|
2017-03-22 05:30:27 -07:00
|
|
|
#include <linux/slab.h>
|
|
|
|
|
#include <linux/videodev2.h>
|
2020-11-19 09:32:31 -07:00
|
|
|
#include <media/v4l2-ctrls.h>
|
2017-03-22 05:30:27 -07:00
|
|
|
#include <media/v4l2-device.h>
|
2020-11-19 09:35:49 -07:00
|
|
|
#include <media/v4l2-event.h>
|
2016-08-26 16:17:25 -07:00
|
|
|
#include <media/v4l2-fwnode.h>
|
2017-03-22 05:30:27 -07:00
|
|
|
#include <media/v4l2-image-sizes.h>
|
|
|
|
|
#include <media/v4l2-mediabus.h>
|
|
|
|
|
|
2020-11-19 09:19:28 -07:00
|
|
|
/*
|
|
|
|
|
* From the datasheet, "20ms after PWDN goes low or 20ms after RESETB goes
|
|
|
|
|
* high if reset is inserted after PWDN goes high, host can access sensor's
|
|
|
|
|
* SCCB to initialize sensor."
|
|
|
|
|
*/
|
|
|
|
|
#define PWDN_ACTIVE_DELAY_MS 20
|
|
|
|
|
|
2017-10-01 03:22:38 -07:00
|
|
|
#define MIPI_CTRL00_CLOCK_LANE_GATE BIT(5)
|
2020-11-19 09:19:29 -07:00
|
|
|
#define MIPI_CTRL00_LINE_SYNC_ENABLE BIT(4)
|
2017-10-01 03:22:38 -07:00
|
|
|
#define MIPI_CTRL00_BUS_IDLE BIT(2)
|
|
|
|
|
#define MIPI_CTRL00_CLOCK_LANE_DISABLE BIT(0)
|
|
|
|
|
|
|
|
|
|
#define OV5647_SW_STANDBY 0x0100
|
|
|
|
|
#define OV5647_SW_RESET 0x0103
|
2020-11-19 09:19:32 -07:00
|
|
|
#define OV5647_REG_CHIPID_H 0x300a
|
|
|
|
|
#define OV5647_REG_CHIPID_L 0x300b
|
|
|
|
|
#define OV5640_REG_PAD_OUT 0x300d
|
2020-11-19 09:32:31 -07:00
|
|
|
#define OV5647_REG_EXP_HI 0x3500
|
|
|
|
|
#define OV5647_REG_EXP_MID 0x3501
|
|
|
|
|
#define OV5647_REG_EXP_LO 0x3502
|
|
|
|
|
#define OV5647_REG_AEC_AGC 0x3503
|
|
|
|
|
#define OV5647_REG_GAIN_HI 0x350a
|
|
|
|
|
#define OV5647_REG_GAIN_LO 0x350b
|
2020-11-19 09:35:43 -07:00
|
|
|
#define OV5647_REG_VTS_HI 0x380e
|
|
|
|
|
#define OV5647_REG_VTS_LO 0x380f
|
2017-10-01 03:22:38 -07:00
|
|
|
#define OV5647_REG_FRAME_OFF_NUMBER 0x4202
|
|
|
|
|
#define OV5647_REG_MIPI_CTRL00 0x4800
|
|
|
|
|
#define OV5647_REG_MIPI_CTRL14 0x4814
|
2020-11-19 09:32:31 -07:00
|
|
|
#define OV5647_REG_AWB 0x5001
|
2023-02-21 10:10:47 -07:00
|
|
|
#define OV5647_REG_ISPCTRL3D 0x503d
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
#define REG_TERM 0xfffe
|
|
|
|
|
#define VAL_TERM 0xfe
|
|
|
|
|
#define REG_DLY 0xffff
|
|
|
|
|
|
2020-11-19 09:32:34 -07:00
|
|
|
/* OV5647 native and active pixel array size */
|
|
|
|
|
#define OV5647_NATIVE_WIDTH 2624U
|
|
|
|
|
#define OV5647_NATIVE_HEIGHT 1956U
|
|
|
|
|
|
|
|
|
|
#define OV5647_PIXEL_ARRAY_LEFT 16U
|
|
|
|
|
#define OV5647_PIXEL_ARRAY_TOP 16U
|
|
|
|
|
#define OV5647_PIXEL_ARRAY_WIDTH 2592U
|
|
|
|
|
#define OV5647_PIXEL_ARRAY_HEIGHT 1944U
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:43 -07:00
|
|
|
#define OV5647_VBLANK_MIN 4
|
|
|
|
|
#define OV5647_VTS_MAX 32767
|
|
|
|
|
|
2020-11-19 09:35:44 -07:00
|
|
|
#define OV5647_EXPOSURE_MIN 4
|
|
|
|
|
#define OV5647_EXPOSURE_STEP 1
|
|
|
|
|
#define OV5647_EXPOSURE_DEFAULT 1000
|
|
|
|
|
#define OV5647_EXPOSURE_MAX 65535
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
struct regval_list {
|
|
|
|
|
u16 addr;
|
|
|
|
|
u8 data;
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:32:33 -07:00
|
|
|
struct ov5647_mode {
|
|
|
|
|
struct v4l2_mbus_framefmt format;
|
2020-11-19 09:32:34 -07:00
|
|
|
struct v4l2_rect crop;
|
2020-11-19 09:35:41 -07:00
|
|
|
u64 pixel_rate;
|
2020-11-19 09:35:42 -07:00
|
|
|
int hts;
|
2020-11-19 09:35:43 -07:00
|
|
|
int vts;
|
2020-11-19 09:32:33 -07:00
|
|
|
const struct regval_list *reg_list;
|
|
|
|
|
unsigned int num_regs;
|
|
|
|
|
};
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
struct ov5647 {
|
|
|
|
|
struct v4l2_subdev sd;
|
|
|
|
|
struct media_pad pad;
|
|
|
|
|
struct mutex lock;
|
|
|
|
|
struct clk *xclk;
|
2020-11-19 09:19:28 -07:00
|
|
|
struct gpio_desc *pwdn;
|
2020-11-19 09:19:29 -07:00
|
|
|
bool clock_ncont;
|
2020-11-19 09:32:31 -07:00
|
|
|
struct v4l2_ctrl_handler ctrls;
|
2020-11-19 09:32:33 -07:00
|
|
|
const struct ov5647_mode *mode;
|
2020-11-19 09:35:41 -07:00
|
|
|
struct v4l2_ctrl *pixel_rate;
|
2020-11-19 09:35:42 -07:00
|
|
|
struct v4l2_ctrl *hblank;
|
2020-11-19 09:35:43 -07:00
|
|
|
struct v4l2_ctrl *vblank;
|
2020-11-19 09:35:44 -07:00
|
|
|
struct v4l2_ctrl *exposure;
|
2017-03-22 05:30:27 -07:00
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:32:32 -07:00
|
|
|
static inline struct ov5647 *to_sensor(struct v4l2_subdev *sd)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
|
|
|
|
return container_of(sd, struct ov5647, sd);
|
|
|
|
|
}
|
|
|
|
|
|
2023-02-21 10:10:47 -07:00
|
|
|
static const char * const ov5647_test_pattern_menu[] = {
|
|
|
|
|
"Disabled",
|
|
|
|
|
"Color Bars",
|
|
|
|
|
"Color Squares",
|
|
|
|
|
"Random Data",
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const u8 ov5647_test_pattern_val[] = {
|
|
|
|
|
0x00, /* Disabled */
|
|
|
|
|
0x80, /* Color Bars */
|
|
|
|
|
0x82, /* Color Squares */
|
|
|
|
|
0x81, /* Random Data */
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:35:48 -07:00
|
|
|
static const struct regval_list sensor_oe_disable_regs[] = {
|
2017-03-22 05:30:27 -07:00
|
|
|
{0x3000, 0x00},
|
|
|
|
|
{0x3001, 0x00},
|
|
|
|
|
{0x3002, 0x00},
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:35:48 -07:00
|
|
|
static const struct regval_list sensor_oe_enable_regs[] = {
|
2017-03-22 05:30:27 -07:00
|
|
|
{0x3000, 0x0f},
|
|
|
|
|
{0x3001, 0xff},
|
|
|
|
|
{0x3002, 0xe4},
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:32:36 -07:00
|
|
|
static struct regval_list ov5647_2592x1944_10bpp[] = {
|
|
|
|
|
{0x0100, 0x00},
|
|
|
|
|
{0x0103, 0x01},
|
|
|
|
|
{0x3034, 0x1a},
|
|
|
|
|
{0x3035, 0x21},
|
|
|
|
|
{0x3036, 0x69},
|
|
|
|
|
{0x303c, 0x11},
|
|
|
|
|
{0x3106, 0xf5},
|
|
|
|
|
{0x3821, 0x06},
|
|
|
|
|
{0x3820, 0x00},
|
|
|
|
|
{0x3827, 0xec},
|
|
|
|
|
{0x370c, 0x03},
|
|
|
|
|
{0x3612, 0x5b},
|
|
|
|
|
{0x3618, 0x04},
|
|
|
|
|
{0x5000, 0x06},
|
|
|
|
|
{0x5002, 0x41},
|
|
|
|
|
{0x5003, 0x08},
|
|
|
|
|
{0x5a00, 0x08},
|
|
|
|
|
{0x3000, 0x00},
|
|
|
|
|
{0x3001, 0x00},
|
|
|
|
|
{0x3002, 0x00},
|
|
|
|
|
{0x3016, 0x08},
|
|
|
|
|
{0x3017, 0xe0},
|
|
|
|
|
{0x3018, 0x44},
|
|
|
|
|
{0x301c, 0xf8},
|
|
|
|
|
{0x301d, 0xf0},
|
|
|
|
|
{0x3a18, 0x00},
|
|
|
|
|
{0x3a19, 0xf8},
|
|
|
|
|
{0x3c01, 0x80},
|
|
|
|
|
{0x3b07, 0x0c},
|
|
|
|
|
{0x380c, 0x0b},
|
|
|
|
|
{0x380d, 0x1c},
|
|
|
|
|
{0x3814, 0x11},
|
|
|
|
|
{0x3815, 0x11},
|
|
|
|
|
{0x3708, 0x64},
|
|
|
|
|
{0x3709, 0x12},
|
|
|
|
|
{0x3808, 0x0a},
|
|
|
|
|
{0x3809, 0x20},
|
|
|
|
|
{0x380a, 0x07},
|
|
|
|
|
{0x380b, 0x98},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x00},
|
|
|
|
|
{0x3802, 0x00},
|
|
|
|
|
{0x3803, 0x00},
|
|
|
|
|
{0x3804, 0x0a},
|
|
|
|
|
{0x3805, 0x3f},
|
|
|
|
|
{0x3806, 0x07},
|
|
|
|
|
{0x3807, 0xa3},
|
|
|
|
|
{0x3811, 0x10},
|
|
|
|
|
{0x3813, 0x06},
|
|
|
|
|
{0x3630, 0x2e},
|
|
|
|
|
{0x3632, 0xe2},
|
|
|
|
|
{0x3633, 0x23},
|
|
|
|
|
{0x3634, 0x44},
|
|
|
|
|
{0x3636, 0x06},
|
|
|
|
|
{0x3620, 0x64},
|
|
|
|
|
{0x3621, 0xe0},
|
|
|
|
|
{0x3600, 0x37},
|
|
|
|
|
{0x3704, 0xa0},
|
|
|
|
|
{0x3703, 0x5a},
|
|
|
|
|
{0x3715, 0x78},
|
|
|
|
|
{0x3717, 0x01},
|
|
|
|
|
{0x3731, 0x02},
|
|
|
|
|
{0x370b, 0x60},
|
|
|
|
|
{0x3705, 0x1a},
|
|
|
|
|
{0x3f05, 0x02},
|
|
|
|
|
{0x3f06, 0x10},
|
|
|
|
|
{0x3f01, 0x0a},
|
|
|
|
|
{0x3a08, 0x01},
|
|
|
|
|
{0x3a09, 0x28},
|
|
|
|
|
{0x3a0a, 0x00},
|
|
|
|
|
{0x3a0b, 0xf6},
|
|
|
|
|
{0x3a0d, 0x08},
|
|
|
|
|
{0x3a0e, 0x06},
|
|
|
|
|
{0x3a0f, 0x58},
|
|
|
|
|
{0x3a10, 0x50},
|
|
|
|
|
{0x3a1b, 0x58},
|
|
|
|
|
{0x3a1e, 0x50},
|
|
|
|
|
{0x3a11, 0x60},
|
|
|
|
|
{0x3a1f, 0x28},
|
|
|
|
|
{0x4001, 0x02},
|
|
|
|
|
{0x4004, 0x04},
|
|
|
|
|
{0x4000, 0x09},
|
|
|
|
|
{0x4837, 0x19},
|
|
|
|
|
{0x4800, 0x24},
|
|
|
|
|
{0x3503, 0x03},
|
|
|
|
|
{0x0100, 0x01},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct regval_list ov5647_1080p30_10bpp[] = {
|
|
|
|
|
{0x0100, 0x00},
|
|
|
|
|
{0x0103, 0x01},
|
|
|
|
|
{0x3034, 0x1a},
|
|
|
|
|
{0x3035, 0x21},
|
|
|
|
|
{0x3036, 0x62},
|
|
|
|
|
{0x303c, 0x11},
|
|
|
|
|
{0x3106, 0xf5},
|
|
|
|
|
{0x3821, 0x06},
|
|
|
|
|
{0x3820, 0x00},
|
|
|
|
|
{0x3827, 0xec},
|
|
|
|
|
{0x370c, 0x03},
|
|
|
|
|
{0x3612, 0x5b},
|
|
|
|
|
{0x3618, 0x04},
|
|
|
|
|
{0x5000, 0x06},
|
|
|
|
|
{0x5002, 0x41},
|
|
|
|
|
{0x5003, 0x08},
|
|
|
|
|
{0x5a00, 0x08},
|
|
|
|
|
{0x3000, 0x00},
|
|
|
|
|
{0x3001, 0x00},
|
|
|
|
|
{0x3002, 0x00},
|
|
|
|
|
{0x3016, 0x08},
|
|
|
|
|
{0x3017, 0xe0},
|
|
|
|
|
{0x3018, 0x44},
|
|
|
|
|
{0x301c, 0xf8},
|
|
|
|
|
{0x301d, 0xf0},
|
|
|
|
|
{0x3a18, 0x00},
|
|
|
|
|
{0x3a19, 0xf8},
|
|
|
|
|
{0x3c01, 0x80},
|
|
|
|
|
{0x3b07, 0x0c},
|
|
|
|
|
{0x380c, 0x09},
|
|
|
|
|
{0x380d, 0x70},
|
|
|
|
|
{0x3814, 0x11},
|
|
|
|
|
{0x3815, 0x11},
|
|
|
|
|
{0x3708, 0x64},
|
|
|
|
|
{0x3709, 0x12},
|
|
|
|
|
{0x3808, 0x07},
|
|
|
|
|
{0x3809, 0x80},
|
|
|
|
|
{0x380a, 0x04},
|
|
|
|
|
{0x380b, 0x38},
|
|
|
|
|
{0x3800, 0x01},
|
|
|
|
|
{0x3801, 0x5c},
|
|
|
|
|
{0x3802, 0x01},
|
|
|
|
|
{0x3803, 0xb2},
|
|
|
|
|
{0x3804, 0x08},
|
|
|
|
|
{0x3805, 0xe3},
|
|
|
|
|
{0x3806, 0x05},
|
|
|
|
|
{0x3807, 0xf1},
|
|
|
|
|
{0x3811, 0x04},
|
|
|
|
|
{0x3813, 0x02},
|
|
|
|
|
{0x3630, 0x2e},
|
|
|
|
|
{0x3632, 0xe2},
|
|
|
|
|
{0x3633, 0x23},
|
|
|
|
|
{0x3634, 0x44},
|
|
|
|
|
{0x3636, 0x06},
|
|
|
|
|
{0x3620, 0x64},
|
|
|
|
|
{0x3621, 0xe0},
|
|
|
|
|
{0x3600, 0x37},
|
|
|
|
|
{0x3704, 0xa0},
|
|
|
|
|
{0x3703, 0x5a},
|
|
|
|
|
{0x3715, 0x78},
|
|
|
|
|
{0x3717, 0x01},
|
|
|
|
|
{0x3731, 0x02},
|
|
|
|
|
{0x370b, 0x60},
|
|
|
|
|
{0x3705, 0x1a},
|
|
|
|
|
{0x3f05, 0x02},
|
|
|
|
|
{0x3f06, 0x10},
|
|
|
|
|
{0x3f01, 0x0a},
|
|
|
|
|
{0x3a08, 0x01},
|
|
|
|
|
{0x3a09, 0x4b},
|
|
|
|
|
{0x3a0a, 0x01},
|
|
|
|
|
{0x3a0b, 0x13},
|
|
|
|
|
{0x3a0d, 0x04},
|
|
|
|
|
{0x3a0e, 0x03},
|
|
|
|
|
{0x3a0f, 0x58},
|
|
|
|
|
{0x3a10, 0x50},
|
|
|
|
|
{0x3a1b, 0x58},
|
|
|
|
|
{0x3a1e, 0x50},
|
|
|
|
|
{0x3a11, 0x60},
|
|
|
|
|
{0x3a1f, 0x28},
|
|
|
|
|
{0x4001, 0x02},
|
|
|
|
|
{0x4004, 0x04},
|
|
|
|
|
{0x4000, 0x09},
|
|
|
|
|
{0x4837, 0x19},
|
|
|
|
|
{0x4800, 0x34},
|
|
|
|
|
{0x3503, 0x03},
|
|
|
|
|
{0x0100, 0x01},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct regval_list ov5647_2x2binned_10bpp[] = {
|
|
|
|
|
{0x0100, 0x00},
|
|
|
|
|
{0x0103, 0x01},
|
|
|
|
|
{0x3034, 0x1a},
|
|
|
|
|
{0x3035, 0x21},
|
|
|
|
|
{0x3036, 0x62},
|
|
|
|
|
{0x303c, 0x11},
|
|
|
|
|
{0x3106, 0xf5},
|
|
|
|
|
{0x3827, 0xec},
|
|
|
|
|
{0x370c, 0x03},
|
|
|
|
|
{0x3612, 0x59},
|
|
|
|
|
{0x3618, 0x00},
|
|
|
|
|
{0x5000, 0x06},
|
|
|
|
|
{0x5002, 0x41},
|
|
|
|
|
{0x5003, 0x08},
|
|
|
|
|
{0x5a00, 0x08},
|
|
|
|
|
{0x3000, 0x00},
|
|
|
|
|
{0x3001, 0x00},
|
|
|
|
|
{0x3002, 0x00},
|
|
|
|
|
{0x3016, 0x08},
|
|
|
|
|
{0x3017, 0xe0},
|
|
|
|
|
{0x3018, 0x44},
|
|
|
|
|
{0x301c, 0xf8},
|
|
|
|
|
{0x301d, 0xf0},
|
|
|
|
|
{0x3a18, 0x00},
|
|
|
|
|
{0x3a19, 0xf8},
|
|
|
|
|
{0x3c01, 0x80},
|
|
|
|
|
{0x3b07, 0x0c},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x00},
|
|
|
|
|
{0x3802, 0x00},
|
|
|
|
|
{0x3803, 0x00},
|
|
|
|
|
{0x3804, 0x0a},
|
|
|
|
|
{0x3805, 0x3f},
|
|
|
|
|
{0x3806, 0x07},
|
|
|
|
|
{0x3807, 0xa3},
|
|
|
|
|
{0x3808, 0x05},
|
|
|
|
|
{0x3809, 0x10},
|
|
|
|
|
{0x380a, 0x03},
|
|
|
|
|
{0x380b, 0xcc},
|
|
|
|
|
{0x380c, 0x07},
|
|
|
|
|
{0x380d, 0x68},
|
|
|
|
|
{0x3811, 0x0c},
|
|
|
|
|
{0x3813, 0x06},
|
|
|
|
|
{0x3814, 0x31},
|
|
|
|
|
{0x3815, 0x31},
|
|
|
|
|
{0x3630, 0x2e},
|
|
|
|
|
{0x3632, 0xe2},
|
|
|
|
|
{0x3633, 0x23},
|
|
|
|
|
{0x3634, 0x44},
|
|
|
|
|
{0x3636, 0x06},
|
|
|
|
|
{0x3620, 0x64},
|
|
|
|
|
{0x3621, 0xe0},
|
|
|
|
|
{0x3600, 0x37},
|
|
|
|
|
{0x3704, 0xa0},
|
|
|
|
|
{0x3703, 0x5a},
|
|
|
|
|
{0x3715, 0x78},
|
|
|
|
|
{0x3717, 0x01},
|
|
|
|
|
{0x3731, 0x02},
|
|
|
|
|
{0x370b, 0x60},
|
|
|
|
|
{0x3705, 0x1a},
|
|
|
|
|
{0x3f05, 0x02},
|
|
|
|
|
{0x3f06, 0x10},
|
|
|
|
|
{0x3f01, 0x0a},
|
|
|
|
|
{0x3a08, 0x01},
|
|
|
|
|
{0x3a09, 0x28},
|
|
|
|
|
{0x3a0a, 0x00},
|
|
|
|
|
{0x3a0b, 0xf6},
|
|
|
|
|
{0x3a0d, 0x08},
|
|
|
|
|
{0x3a0e, 0x06},
|
|
|
|
|
{0x3a0f, 0x58},
|
|
|
|
|
{0x3a10, 0x50},
|
|
|
|
|
{0x3a1b, 0x58},
|
|
|
|
|
{0x3a1e, 0x50},
|
|
|
|
|
{0x3a11, 0x60},
|
|
|
|
|
{0x3a1f, 0x28},
|
|
|
|
|
{0x4001, 0x02},
|
|
|
|
|
{0x4004, 0x04},
|
|
|
|
|
{0x4000, 0x09},
|
|
|
|
|
{0x4837, 0x16},
|
|
|
|
|
{0x4800, 0x24},
|
|
|
|
|
{0x3503, 0x03},
|
|
|
|
|
{0x3820, 0x41},
|
|
|
|
|
{0x3821, 0x07},
|
|
|
|
|
{0x350a, 0x00},
|
|
|
|
|
{0x350b, 0x10},
|
|
|
|
|
{0x3500, 0x00},
|
|
|
|
|
{0x3501, 0x1a},
|
|
|
|
|
{0x3502, 0xf0},
|
|
|
|
|
{0x3212, 0xa0},
|
|
|
|
|
{0x0100, 0x01},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct regval_list ov5647_640x480_10bpp[] = {
|
|
|
|
|
{0x0100, 0x00},
|
|
|
|
|
{0x0103, 0x01},
|
|
|
|
|
{0x3035, 0x11},
|
|
|
|
|
{0x3036, 0x46},
|
|
|
|
|
{0x303c, 0x11},
|
|
|
|
|
{0x3821, 0x07},
|
|
|
|
|
{0x3820, 0x41},
|
|
|
|
|
{0x370c, 0x03},
|
|
|
|
|
{0x3612, 0x59},
|
|
|
|
|
{0x3618, 0x00},
|
|
|
|
|
{0x5000, 0x06},
|
|
|
|
|
{0x5003, 0x08},
|
|
|
|
|
{0x5a00, 0x08},
|
|
|
|
|
{0x3000, 0xff},
|
|
|
|
|
{0x3001, 0xff},
|
|
|
|
|
{0x3002, 0xff},
|
|
|
|
|
{0x301d, 0xf0},
|
|
|
|
|
{0x3a18, 0x00},
|
|
|
|
|
{0x3a19, 0xf8},
|
|
|
|
|
{0x3c01, 0x80},
|
|
|
|
|
{0x3b07, 0x0c},
|
|
|
|
|
{0x380c, 0x07},
|
|
|
|
|
{0x380d, 0x3c},
|
|
|
|
|
{0x3814, 0x35},
|
|
|
|
|
{0x3815, 0x35},
|
|
|
|
|
{0x3708, 0x64},
|
|
|
|
|
{0x3709, 0x52},
|
|
|
|
|
{0x3808, 0x02},
|
|
|
|
|
{0x3809, 0x80},
|
|
|
|
|
{0x380a, 0x01},
|
|
|
|
|
{0x380b, 0xe0},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x10},
|
|
|
|
|
{0x3802, 0x00},
|
|
|
|
|
{0x3803, 0x00},
|
|
|
|
|
{0x3804, 0x0a},
|
|
|
|
|
{0x3805, 0x2f},
|
|
|
|
|
{0x3806, 0x07},
|
|
|
|
|
{0x3807, 0x9f},
|
|
|
|
|
{0x3630, 0x2e},
|
|
|
|
|
{0x3632, 0xe2},
|
|
|
|
|
{0x3633, 0x23},
|
|
|
|
|
{0x3634, 0x44},
|
|
|
|
|
{0x3620, 0x64},
|
|
|
|
|
{0x3621, 0xe0},
|
|
|
|
|
{0x3600, 0x37},
|
|
|
|
|
{0x3704, 0xa0},
|
|
|
|
|
{0x3703, 0x5a},
|
|
|
|
|
{0x3715, 0x78},
|
|
|
|
|
{0x3717, 0x01},
|
|
|
|
|
{0x3731, 0x02},
|
|
|
|
|
{0x370b, 0x60},
|
|
|
|
|
{0x3705, 0x1a},
|
|
|
|
|
{0x3f05, 0x02},
|
|
|
|
|
{0x3f06, 0x10},
|
|
|
|
|
{0x3f01, 0x0a},
|
|
|
|
|
{0x3a08, 0x01},
|
|
|
|
|
{0x3a09, 0x2e},
|
|
|
|
|
{0x3a0a, 0x00},
|
|
|
|
|
{0x3a0b, 0xfb},
|
|
|
|
|
{0x3a0d, 0x02},
|
|
|
|
|
{0x3a0e, 0x01},
|
|
|
|
|
{0x3a0f, 0x58},
|
|
|
|
|
{0x3a10, 0x50},
|
|
|
|
|
{0x3a1b, 0x58},
|
|
|
|
|
{0x3a1e, 0x50},
|
|
|
|
|
{0x3a11, 0x60},
|
|
|
|
|
{0x3a1f, 0x28},
|
|
|
|
|
{0x4001, 0x02},
|
|
|
|
|
{0x4004, 0x02},
|
|
|
|
|
{0x4000, 0x09},
|
|
|
|
|
{0x3000, 0x00},
|
|
|
|
|
{0x3001, 0x00},
|
|
|
|
|
{0x3002, 0x00},
|
|
|
|
|
{0x3017, 0xe0},
|
|
|
|
|
{0x301c, 0xfc},
|
|
|
|
|
{0x3636, 0x06},
|
|
|
|
|
{0x3016, 0x08},
|
|
|
|
|
{0x3827, 0xec},
|
|
|
|
|
{0x3018, 0x44},
|
|
|
|
|
{0x3035, 0x21},
|
|
|
|
|
{0x3106, 0xf5},
|
|
|
|
|
{0x3034, 0x1a},
|
|
|
|
|
{0x301c, 0xf8},
|
|
|
|
|
{0x4800, 0x34},
|
|
|
|
|
{0x3503, 0x03},
|
|
|
|
|
{0x0100, 0x01},
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:37:53 -07:00
|
|
|
static const struct ov5647_mode ov5647_modes[] = {
|
2020-11-19 09:32:36 -07:00
|
|
|
/* 2592x1944 full resolution full FOV 10-bit mode. */
|
|
|
|
|
{
|
|
|
|
|
.format = {
|
|
|
|
|
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
|
|
|
|
|
.colorspace = V4L2_COLORSPACE_SRGB,
|
|
|
|
|
.field = V4L2_FIELD_NONE,
|
|
|
|
|
.width = 2592,
|
|
|
|
|
.height = 1944
|
|
|
|
|
},
|
|
|
|
|
.crop = {
|
|
|
|
|
.left = OV5647_PIXEL_ARRAY_LEFT,
|
|
|
|
|
.top = OV5647_PIXEL_ARRAY_TOP,
|
|
|
|
|
.width = 2592,
|
|
|
|
|
.height = 1944
|
|
|
|
|
},
|
2020-11-19 09:35:41 -07:00
|
|
|
.pixel_rate = 87500000,
|
2020-11-19 09:35:42 -07:00
|
|
|
.hts = 2844,
|
2020-11-19 09:35:43 -07:00
|
|
|
.vts = 0x7b0,
|
2020-11-19 09:32:36 -07:00
|
|
|
.reg_list = ov5647_2592x1944_10bpp,
|
|
|
|
|
.num_regs = ARRAY_SIZE(ov5647_2592x1944_10bpp)
|
|
|
|
|
},
|
|
|
|
|
/* 1080p30 10-bit mode. Full resolution centre-cropped down to 1080p. */
|
|
|
|
|
{
|
|
|
|
|
.format = {
|
|
|
|
|
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
|
|
|
|
|
.colorspace = V4L2_COLORSPACE_SRGB,
|
|
|
|
|
.field = V4L2_FIELD_NONE,
|
|
|
|
|
.width = 1920,
|
|
|
|
|
.height = 1080
|
|
|
|
|
},
|
|
|
|
|
.crop = {
|
|
|
|
|
.left = 348 + OV5647_PIXEL_ARRAY_LEFT,
|
|
|
|
|
.top = 434 + OV5647_PIXEL_ARRAY_TOP,
|
|
|
|
|
.width = 1928,
|
|
|
|
|
.height = 1080,
|
|
|
|
|
},
|
2020-11-19 09:35:41 -07:00
|
|
|
.pixel_rate = 81666700,
|
2020-11-19 09:35:42 -07:00
|
|
|
.hts = 2416,
|
2020-11-19 09:35:43 -07:00
|
|
|
.vts = 0x450,
|
2020-11-19 09:32:36 -07:00
|
|
|
.reg_list = ov5647_1080p30_10bpp,
|
|
|
|
|
.num_regs = ARRAY_SIZE(ov5647_1080p30_10bpp)
|
|
|
|
|
},
|
|
|
|
|
/* 2x2 binned full FOV 10-bit mode. */
|
|
|
|
|
{
|
|
|
|
|
.format = {
|
|
|
|
|
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
|
|
|
|
|
.colorspace = V4L2_COLORSPACE_SRGB,
|
|
|
|
|
.field = V4L2_FIELD_NONE,
|
|
|
|
|
.width = 1296,
|
|
|
|
|
.height = 972
|
|
|
|
|
},
|
|
|
|
|
.crop = {
|
|
|
|
|
.left = OV5647_PIXEL_ARRAY_LEFT,
|
|
|
|
|
.top = OV5647_PIXEL_ARRAY_TOP,
|
|
|
|
|
.width = 2592,
|
|
|
|
|
.height = 1944,
|
|
|
|
|
},
|
2020-11-19 09:35:41 -07:00
|
|
|
.pixel_rate = 81666700,
|
2020-11-19 09:35:42 -07:00
|
|
|
.hts = 1896,
|
2020-11-19 09:35:43 -07:00
|
|
|
.vts = 0x59b,
|
2020-11-19 09:32:36 -07:00
|
|
|
.reg_list = ov5647_2x2binned_10bpp,
|
|
|
|
|
.num_regs = ARRAY_SIZE(ov5647_2x2binned_10bpp)
|
|
|
|
|
},
|
|
|
|
|
/* 10-bit VGA full FOV 60fps. 2x2 binned and subsampled down to VGA. */
|
|
|
|
|
{
|
|
|
|
|
.format = {
|
|
|
|
|
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
|
|
|
|
|
.colorspace = V4L2_COLORSPACE_SRGB,
|
|
|
|
|
.field = V4L2_FIELD_NONE,
|
|
|
|
|
.width = 640,
|
|
|
|
|
.height = 480
|
|
|
|
|
},
|
|
|
|
|
.crop = {
|
|
|
|
|
.left = 16 + OV5647_PIXEL_ARRAY_LEFT,
|
|
|
|
|
.top = OV5647_PIXEL_ARRAY_TOP,
|
|
|
|
|
.width = 2560,
|
|
|
|
|
.height = 1920,
|
|
|
|
|
},
|
2020-11-19 09:35:41 -07:00
|
|
|
.pixel_rate = 55000000,
|
2020-11-19 09:35:42 -07:00
|
|
|
.hts = 1852,
|
2020-11-19 09:35:43 -07:00
|
|
|
.vts = 0x1f8,
|
2020-11-19 09:32:36 -07:00
|
|
|
.reg_list = ov5647_640x480_10bpp,
|
|
|
|
|
.num_regs = ARRAY_SIZE(ov5647_640x480_10bpp)
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:32:37 -07:00
|
|
|
/* Default sensor mode is 2x2 binned 640x480 SBGGR10_1X10. */
|
2020-11-19 09:37:53 -07:00
|
|
|
#define OV5647_DEFAULT_MODE (&ov5647_modes[3])
|
|
|
|
|
#define OV5647_DEFAULT_FORMAT (ov5647_modes[3].format)
|
2020-11-19 09:32:33 -07:00
|
|
|
|
2020-11-19 09:35:43 -07:00
|
|
|
static int ov5647_write16(struct v4l2_subdev *sd, u16 reg, u16 val)
|
|
|
|
|
{
|
|
|
|
|
unsigned char data[4] = { reg >> 8, reg & 0xff, val >> 8, val & 0xff};
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = i2c_master_send(client, data, 4);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
|
|
|
|
|
__func__, reg);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val)
|
|
|
|
|
{
|
|
|
|
|
unsigned char data[3] = { reg >> 8, reg & 0xff, val};
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2020-11-19 09:19:32 -07:00
|
|
|
int ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
ret = i2c_master_send(client, data, 3);
|
2020-11-19 09:19:34 -07:00
|
|
|
if (ret < 0) {
|
2017-03-22 05:30:27 -07:00
|
|
|
dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
|
|
|
|
|
__func__, reg);
|
2020-11-19 09:19:34 -07:00
|
|
|
return ret;
|
|
|
|
|
}
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:19:34 -07:00
|
|
|
return 0;
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_read(struct v4l2_subdev *sd, u16 reg, u8 *val)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2023-02-21 10:10:48 -07:00
|
|
|
u8 buf[2] = { reg >> 8, reg & 0xff };
|
|
|
|
|
struct i2c_msg msg[2];
|
2020-11-19 09:19:32 -07:00
|
|
|
int ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2023-02-21 10:10:48 -07:00
|
|
|
msg[0].addr = client->addr;
|
|
|
|
|
msg[0].flags = client->flags;
|
|
|
|
|
msg[0].buf = buf;
|
|
|
|
|
msg[0].len = sizeof(buf);
|
|
|
|
|
|
|
|
|
|
msg[1].addr = client->addr;
|
|
|
|
|
msg[1].flags = client->flags | I2C_M_RD;
|
|
|
|
|
msg[1].buf = buf;
|
|
|
|
|
msg[1].len = 1;
|
|
|
|
|
|
|
|
|
|
ret = i2c_transfer(client->adapter, msg, 2);
|
|
|
|
|
if (ret != 2) {
|
|
|
|
|
dev_err(&client->dev, "%s: i2c read error, reg: %x = %d\n",
|
|
|
|
|
__func__, reg, ret);
|
|
|
|
|
return ret >= 0 ? -EINVAL : ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
2023-02-21 10:10:48 -07:00
|
|
|
*val = buf[0];
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:19:34 -07:00
|
|
|
return 0;
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_write_array(struct v4l2_subdev *sd,
|
2020-11-19 09:32:33 -07:00
|
|
|
const struct regval_list *regs, int array_size)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < array_size; i++) {
|
|
|
|
|
ret = ov5647_write(sd, regs[i].addr, regs[i].data);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_set_virtual_channel(struct v4l2_subdev *sd, int channel)
|
|
|
|
|
{
|
|
|
|
|
u8 channel_id;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2017-10-01 03:22:38 -07:00
|
|
|
ret = ov5647_read(sd, OV5647_REG_MIPI_CTRL14, &channel_id);
|
2017-03-22 05:30:27 -07:00
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
channel_id &= ~(3 << 6);
|
2020-11-19 09:19:32 -07:00
|
|
|
|
|
|
|
|
return ov5647_write(sd, OV5647_REG_MIPI_CTRL14,
|
|
|
|
|
channel_id | (channel << 6));
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:19:35 -07:00
|
|
|
static int ov5647_set_mode(struct v4l2_subdev *sd)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2020-11-19 09:32:33 -07:00
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
2020-11-19 09:19:35 -07:00
|
|
|
u8 resetval, rdval;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = ov5647_read(sd, OV5647_SW_STANDBY, &rdval);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-11-19 09:32:33 -07:00
|
|
|
ret = ov5647_write_array(sd, sensor->mode->reg_list,
|
|
|
|
|
sensor->mode->num_regs);
|
2020-11-19 09:19:35 -07:00
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(&client->dev, "write sensor default regs error\n");
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = ov5647_set_virtual_channel(sd, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
ret = ov5647_read(sd, OV5647_SW_STANDBY, &resetval);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (!(resetval & 0x01)) {
|
|
|
|
|
dev_err(&client->dev, "Device was in SW standby");
|
|
|
|
|
ret = ov5647_write(sd, OV5647_SW_STANDBY, 0x01);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
static int ov5647_stream_on(struct v4l2_subdev *sd)
|
|
|
|
|
{
|
2020-11-19 09:19:35 -07:00
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2020-11-19 09:32:32 -07:00
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
2020-11-19 09:19:29 -07:00
|
|
|
u8 val = MIPI_CTRL00_BUS_IDLE;
|
2017-03-22 05:30:27 -07:00
|
|
|
int ret;
|
|
|
|
|
|
2020-11-19 09:19:35 -07:00
|
|
|
ret = ov5647_set_mode(sd);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(&client->dev, "Failed to program sensor mode: %d\n", ret);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:32:31 -07:00
|
|
|
/* Apply customized values from user when stream starts. */
|
|
|
|
|
ret = __v4l2_ctrl_handler_setup(sd->ctrl_handler);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-11-19 09:32:32 -07:00
|
|
|
if (sensor->clock_ncont)
|
2020-11-19 09:19:29 -07:00
|
|
|
val |= MIPI_CTRL00_CLOCK_LANE_GATE |
|
|
|
|
|
MIPI_CTRL00_LINE_SYNC_ENABLE;
|
|
|
|
|
|
|
|
|
|
ret = ov5647_write(sd, OV5647_REG_MIPI_CTRL00, val);
|
2017-10-01 03:22:37 -07:00
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-10-01 03:22:38 -07:00
|
|
|
ret = ov5647_write(sd, OV5647_REG_FRAME_OFF_NUMBER, 0x00);
|
2017-03-22 05:30:27 -07:00
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-10-01 03:22:38 -07:00
|
|
|
return ov5647_write(sd, OV5640_REG_PAD_OUT, 0x00);
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_stream_off(struct v4l2_subdev *sd)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2020-11-19 09:19:32 -07:00
|
|
|
ret = ov5647_write(sd, OV5647_REG_MIPI_CTRL00,
|
|
|
|
|
MIPI_CTRL00_CLOCK_LANE_GATE | MIPI_CTRL00_BUS_IDLE |
|
|
|
|
|
MIPI_CTRL00_CLOCK_LANE_DISABLE);
|
2017-10-01 03:22:37 -07:00
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-10-01 03:22:38 -07:00
|
|
|
ret = ov5647_write(sd, OV5647_REG_FRAME_OFF_NUMBER, 0x0f);
|
2017-03-22 05:30:27 -07:00
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-10-01 03:22:38 -07:00
|
|
|
return ov5647_write(sd, OV5640_REG_PAD_OUT, 0x01);
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
static int ov5647_power_on(struct device *dev)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
2020-11-19 09:35:45 -07:00
|
|
|
struct ov5647 *sensor = dev_get_drvdata(dev);
|
2017-03-22 05:30:27 -07:00
|
|
|
int ret;
|
|
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
dev_dbg(dev, "OV5647 power on\n");
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
if (sensor->pwdn) {
|
|
|
|
|
gpiod_set_value_cansleep(sensor->pwdn, 0);
|
|
|
|
|
msleep(PWDN_ACTIVE_DELAY_MS);
|
|
|
|
|
}
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
ret = clk_prepare_enable(sensor->xclk);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "clk prepare enable failed\n");
|
|
|
|
|
goto error_pwdn;
|
|
|
|
|
}
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
ret = ov5647_write_array(&sensor->sd, sensor_oe_enable_regs,
|
|
|
|
|
ARRAY_SIZE(sensor_oe_enable_regs));
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "write sensor_oe_enable_regs error\n");
|
|
|
|
|
goto error_clk_disable;
|
|
|
|
|
}
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
/* Stream off to coax lanes into LP-11 state. */
|
|
|
|
|
ret = ov5647_stream_off(&sensor->sd);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(dev, "camera not available, check power\n");
|
|
|
|
|
goto error_clk_disable;
|
|
|
|
|
}
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
return 0;
|
2020-11-19 09:19:28 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
error_clk_disable:
|
|
|
|
|
clk_disable_unprepare(sensor->xclk);
|
|
|
|
|
error_pwdn:
|
|
|
|
|
gpiod_set_value_cansleep(sensor->pwdn, 1);
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
return ret;
|
|
|
|
|
}
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
static int ov5647_power_off(struct device *dev)
|
|
|
|
|
{
|
|
|
|
|
struct ov5647 *sensor = dev_get_drvdata(dev);
|
|
|
|
|
u8 rdval;
|
|
|
|
|
int ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
dev_dbg(dev, "OV5647 power off\n");
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
ret = ov5647_write_array(&sensor->sd, sensor_oe_disable_regs,
|
|
|
|
|
ARRAY_SIZE(sensor_oe_disable_regs));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
dev_dbg(dev, "disable oe failed\n");
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
/* Enter software standby */
|
|
|
|
|
ret = ov5647_read(&sensor->sd, OV5647_SW_STANDBY, &rdval);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
dev_dbg(dev, "software standby failed\n");
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
rdval &= ~0x01;
|
|
|
|
|
ret = ov5647_write(&sensor->sd, OV5647_SW_STANDBY, rdval);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
dev_dbg(dev, "software standby failed\n");
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
clk_disable_unprepare(sensor->xclk);
|
|
|
|
|
gpiod_set_value_cansleep(sensor->pwdn, 1);
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
return 0;
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
|
|
|
|
static int ov5647_sensor_get_register(struct v4l2_subdev *sd,
|
2020-11-19 09:19:32 -07:00
|
|
|
struct v4l2_dbg_register *reg)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
|
|
|
|
int ret;
|
2020-11-19 09:19:32 -07:00
|
|
|
u8 val;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
ret = ov5647_read(sd, reg->reg & 0xff, &val);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
reg->val = val;
|
|
|
|
|
reg->size = 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_sensor_set_register(struct v4l2_subdev *sd,
|
2020-11-19 09:19:32 -07:00
|
|
|
const struct v4l2_dbg_register *reg)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
|
|
|
|
return ov5647_write(sd, reg->reg & 0xff, reg->val & 0xff);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2020-11-19 09:19:32 -07:00
|
|
|
/* Subdev core operations registration */
|
2017-03-22 05:30:27 -07:00
|
|
|
static const struct v4l2_subdev_core_ops ov5647_subdev_core_ops = {
|
2020-11-19 09:35:49 -07:00
|
|
|
.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
|
|
|
|
|
.unsubscribe_event = v4l2_event_subdev_unsubscribe,
|
2017-03-22 05:30:27 -07:00
|
|
|
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
|
|
|
|
.g_register = ov5647_sensor_get_register,
|
|
|
|
|
.s_register = ov5647_sensor_set_register,
|
|
|
|
|
#endif
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:32:34 -07:00
|
|
|
static const 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 07:55:58 -07:00
|
|
|
__ov5647_get_pad_crop(struct ov5647 *ov5647,
|
|
|
|
|
struct v4l2_subdev_state *sd_state,
|
2020-11-19 09:32:34 -07:00
|
|
|
unsigned int pad, enum v4l2_subdev_format_whence which)
|
|
|
|
|
{
|
|
|
|
|
switch (which) {
|
|
|
|
|
case V4L2_SUBDEV_FORMAT_TRY:
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
return v4l2_subdev_state_get_crop(sd_state, pad);
|
2020-11-19 09:32:34 -07:00
|
|
|
case V4L2_SUBDEV_FORMAT_ACTIVE:
|
|
|
|
|
return &ov5647->mode->crop;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
static int ov5647_s_stream(struct v4l2_subdev *sd, int enable)
|
|
|
|
|
{
|
2020-11-19 09:35:46 -07:00
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2020-11-19 09:32:32 -07:00
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
2020-11-19 09:32:30 -07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&sensor->lock);
|
2020-11-19 09:35:46 -07:00
|
|
|
|
|
|
|
|
if (enable) {
|
2021-04-23 08:19:15 -07:00
|
|
|
ret = pm_runtime_resume_and_get(&client->dev);
|
2020-11-19 09:35:46 -07:00
|
|
|
if (ret < 0)
|
|
|
|
|
goto error_unlock;
|
|
|
|
|
|
2020-11-19 09:32:30 -07:00
|
|
|
ret = ov5647_stream_on(sd);
|
2020-11-19 09:35:46 -07:00
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(&client->dev, "stream start failed: %d\n", ret);
|
2021-04-23 08:19:15 -07:00
|
|
|
goto error_pm;
|
2020-11-19 09:35:46 -07:00
|
|
|
}
|
|
|
|
|
} else {
|
2020-11-19 09:32:30 -07:00
|
|
|
ret = ov5647_stream_off(sd);
|
2020-11-19 09:35:46 -07:00
|
|
|
if (ret < 0) {
|
|
|
|
|
dev_err(&client->dev, "stream stop failed: %d\n", ret);
|
2021-04-23 08:19:15 -07:00
|
|
|
goto error_pm;
|
2020-11-19 09:35:46 -07:00
|
|
|
}
|
|
|
|
|
pm_runtime_put(&client->dev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_unlock(&sensor->lock);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
2021-04-23 08:19:15 -07:00
|
|
|
error_pm:
|
2020-11-19 09:35:46 -07:00
|
|
|
pm_runtime_put(&client->dev);
|
2021-04-23 08:19:15 -07:00
|
|
|
error_unlock:
|
2020-11-19 09:32:30 -07:00
|
|
|
mutex_unlock(&sensor->lock);
|
|
|
|
|
|
|
|
|
|
return ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_video_ops ov5647_subdev_video_ops = {
|
|
|
|
|
.s_stream = ov5647_s_stream,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov5647_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 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2020-11-19 09:19:32 -07:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
2020-11-19 09:37:53 -07:00
|
|
|
if (code->index > 0)
|
2017-03-22 05:30:27 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
2020-11-19 09:37:53 -07:00
|
|
|
code->code = MEDIA_BUS_FMT_SBGGR10_1X10;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:32:29 -07:00
|
|
|
static int ov5647_enum_frame_size(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 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2020-11-19 09:32:29 -07:00
|
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
|
|
|
{
|
2020-11-19 09:32:33 -07:00
|
|
|
const struct v4l2_mbus_framefmt *fmt;
|
2020-11-19 09:32:29 -07:00
|
|
|
|
2020-11-19 09:37:53 -07:00
|
|
|
if (fse->code != MEDIA_BUS_FMT_SBGGR10_1X10 ||
|
|
|
|
|
fse->index >= ARRAY_SIZE(ov5647_modes))
|
2020-11-19 09:32:29 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
2020-11-19 09:37:53 -07:00
|
|
|
fmt = &ov5647_modes[fse->index].format;
|
2020-11-19 09:32:33 -07:00
|
|
|
fse->min_width = fmt->width;
|
|
|
|
|
fse->max_width = fmt->width;
|
|
|
|
|
fse->min_height = fmt->height;
|
|
|
|
|
fse->max_height = fmt->height;
|
2020-11-19 09:32:29 -07:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:32:38 -07:00
|
|
|
static int ov5647_get_pad_fmt(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 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2020-11-19 09:19:30 -07:00
|
|
|
struct v4l2_subdev_format *format)
|
|
|
|
|
{
|
|
|
|
|
struct v4l2_mbus_framefmt *fmt = &format->format;
|
2020-11-19 09:32:38 -07:00
|
|
|
const struct v4l2_mbus_framefmt *sensor_format;
|
|
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
|
|
|
|
|
|
|
|
|
mutex_lock(&sensor->lock);
|
|
|
|
|
switch (format->which) {
|
|
|
|
|
case V4L2_SUBDEV_FORMAT_TRY:
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
sensor_format = v4l2_subdev_state_get_format(sd_state,
|
|
|
|
|
format->pad);
|
2020-11-19 09:32:38 -07:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
sensor_format = &sensor->mode->format;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*fmt = *sensor_format;
|
|
|
|
|
mutex_unlock(&sensor->lock);
|
2020-11-19 09:19:30 -07:00
|
|
|
|
2020-11-19 09:32:38 -07:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_set_pad_fmt(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 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2020-11-19 09:32:38 -07:00
|
|
|
struct v4l2_subdev_format *format)
|
|
|
|
|
{
|
|
|
|
|
struct v4l2_mbus_framefmt *fmt = &format->format;
|
|
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
|
|
|
|
const struct ov5647_mode *mode;
|
|
|
|
|
|
2020-11-19 09:37:53 -07:00
|
|
|
mode = v4l2_find_nearest_size(ov5647_modes, ARRAY_SIZE(ov5647_modes),
|
2020-11-19 09:32:38 -07:00
|
|
|
format.width, format.height,
|
|
|
|
|
fmt->width, fmt->height);
|
|
|
|
|
|
|
|
|
|
/* Update the sensor mode and apply at it at streamon time. */
|
|
|
|
|
mutex_lock(&sensor->lock);
|
2020-11-19 09:35:41 -07:00
|
|
|
if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
*v4l2_subdev_state_get_format(sd_state, format->pad) = mode->format;
|
2020-11-19 09:35:41 -07:00
|
|
|
} else {
|
2020-11-19 09:35:44 -07:00
|
|
|
int exposure_max, exposure_def;
|
2020-11-19 09:35:43 -07:00
|
|
|
int hblank, vblank;
|
2020-11-19 09:35:42 -07:00
|
|
|
|
2020-11-19 09:32:38 -07:00
|
|
|
sensor->mode = mode;
|
2020-11-19 09:35:41 -07:00
|
|
|
__v4l2_ctrl_modify_range(sensor->pixel_rate, mode->pixel_rate,
|
|
|
|
|
mode->pixel_rate, 1, mode->pixel_rate);
|
2020-11-19 09:35:42 -07:00
|
|
|
|
|
|
|
|
hblank = mode->hts - mode->format.width;
|
|
|
|
|
__v4l2_ctrl_modify_range(sensor->hblank, hblank, hblank, 1,
|
|
|
|
|
hblank);
|
2020-11-19 09:35:43 -07:00
|
|
|
|
|
|
|
|
vblank = mode->vts - mode->format.height;
|
|
|
|
|
__v4l2_ctrl_modify_range(sensor->vblank, OV5647_VBLANK_MIN,
|
|
|
|
|
OV5647_VTS_MAX - mode->format.height,
|
|
|
|
|
1, vblank);
|
|
|
|
|
__v4l2_ctrl_s_ctrl(sensor->vblank, vblank);
|
2020-11-19 09:35:44 -07:00
|
|
|
|
|
|
|
|
exposure_max = mode->vts - 4;
|
|
|
|
|
exposure_def = min(exposure_max, OV5647_EXPOSURE_DEFAULT);
|
|
|
|
|
__v4l2_ctrl_modify_range(sensor->exposure,
|
|
|
|
|
sensor->exposure->minimum,
|
|
|
|
|
exposure_max, sensor->exposure->step,
|
|
|
|
|
exposure_def);
|
2020-11-19 09:35:41 -07:00
|
|
|
}
|
2020-11-19 09:32:38 -07:00
|
|
|
*fmt = mode->format;
|
|
|
|
|
mutex_unlock(&sensor->lock);
|
2020-11-19 09:19:30 -07:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:32:34 -07:00
|
|
|
static int ov5647_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 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2020-11-19 09:32:34 -07:00
|
|
|
struct v4l2_subdev_selection *sel)
|
|
|
|
|
{
|
|
|
|
|
switch (sel->target) {
|
|
|
|
|
case V4L2_SEL_TGT_CROP: {
|
|
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
|
|
|
|
|
|
|
|
|
mutex_lock(&sensor->lock);
|
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 07:55:58 -07:00
|
|
|
sel->r = *__ov5647_get_pad_crop(sensor, sd_state, sel->pad,
|
2020-11-19 09:32:34 -07:00
|
|
|
sel->which);
|
|
|
|
|
mutex_unlock(&sensor->lock);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case V4L2_SEL_TGT_NATIVE_SIZE:
|
|
|
|
|
sel->r.top = 0;
|
|
|
|
|
sel->r.left = 0;
|
|
|
|
|
sel->r.width = OV5647_NATIVE_WIDTH;
|
|
|
|
|
sel->r.height = OV5647_NATIVE_HEIGHT;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
case V4L2_SEL_TGT_CROP_DEFAULT:
|
|
|
|
|
case V4L2_SEL_TGT_CROP_BOUNDS:
|
|
|
|
|
sel->r.top = OV5647_PIXEL_ARRAY_TOP;
|
|
|
|
|
sel->r.left = OV5647_PIXEL_ARRAY_LEFT;
|
|
|
|
|
sel->r.width = OV5647_PIXEL_ARRAY_WIDTH;
|
|
|
|
|
sel->r.height = OV5647_PIXEL_ARRAY_HEIGHT;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
static const struct v4l2_subdev_pad_ops ov5647_subdev_pad_ops = {
|
2020-11-19 09:32:29 -07:00
|
|
|
.enum_mbus_code = ov5647_enum_mbus_code,
|
|
|
|
|
.enum_frame_size = ov5647_enum_frame_size,
|
2020-11-19 09:32:38 -07:00
|
|
|
.set_fmt = ov5647_set_pad_fmt,
|
|
|
|
|
.get_fmt = ov5647_get_pad_fmt,
|
2020-11-19 09:32:34 -07:00
|
|
|
.get_selection = ov5647_get_selection,
|
2017-03-22 05:30:27 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_ops ov5647_subdev_ops = {
|
|
|
|
|
.core = &ov5647_subdev_core_ops,
|
|
|
|
|
.video = &ov5647_subdev_video_ops,
|
|
|
|
|
.pad = &ov5647_subdev_pad_ops,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov5647_detect(struct v4l2_subdev *sd)
|
|
|
|
|
{
|
2020-11-19 09:19:32 -07:00
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2017-03-22 05:30:27 -07:00
|
|
|
u8 read;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = ov5647_write(sd, OV5647_SW_RESET, 0x01);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
ret = ov5647_read(sd, OV5647_REG_CHIPID_H, &read);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (read != 0x56) {
|
|
|
|
|
dev_err(&client->dev, "ID High expected 0x56 got %x", read);
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = ov5647_read(sd, OV5647_REG_CHIPID_L, &read);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (read != 0x47) {
|
|
|
|
|
dev_err(&client->dev, "ID Low expected 0x47 got %x", read);
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ov5647_write(sd, OV5647_SW_RESET, 0x00);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
|
|
|
|
|
{
|
|
|
|
|
struct v4l2_mbus_framefmt *format =
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
v4l2_subdev_state_get_format(fh->state, 0);
|
|
|
|
|
struct v4l2_rect *crop = v4l2_subdev_state_get_crop(fh->state, 0);
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:32:34 -07:00
|
|
|
crop->left = OV5647_PIXEL_ARRAY_LEFT;
|
|
|
|
|
crop->top = OV5647_PIXEL_ARRAY_TOP;
|
|
|
|
|
crop->width = OV5647_PIXEL_ARRAY_WIDTH;
|
|
|
|
|
crop->height = OV5647_PIXEL_ARRAY_HEIGHT;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:32:33 -07:00
|
|
|
*format = OV5647_DEFAULT_FORMAT;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_internal_ops ov5647_subdev_internal_ops = {
|
|
|
|
|
.open = ov5647_open,
|
|
|
|
|
};
|
|
|
|
|
|
2020-11-19 09:32:31 -07:00
|
|
|
static int ov5647_s_auto_white_balance(struct v4l2_subdev *sd, u32 val)
|
|
|
|
|
{
|
|
|
|
|
return ov5647_write(sd, OV5647_REG_AWB, val ? 1 : 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_s_autogain(struct v4l2_subdev *sd, u32 val)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
u8 reg;
|
|
|
|
|
|
|
|
|
|
/* Non-zero turns on AGC by clearing bit 1.*/
|
|
|
|
|
ret = ov5647_read(sd, OV5647_REG_AEC_AGC, ®);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return ov5647_write(sd, OV5647_REG_AEC_AGC, val ? reg & ~BIT(1)
|
|
|
|
|
: reg | BIT(1));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_s_exposure_auto(struct v4l2_subdev *sd, u32 val)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
u8 reg;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Everything except V4L2_EXPOSURE_MANUAL turns on AEC by
|
|
|
|
|
* clearing bit 0.
|
|
|
|
|
*/
|
|
|
|
|
ret = ov5647_read(sd, OV5647_REG_AEC_AGC, ®);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return ov5647_write(sd, OV5647_REG_AEC_AGC,
|
|
|
|
|
val == V4L2_EXPOSURE_MANUAL ? reg | BIT(0)
|
|
|
|
|
: reg & ~BIT(0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_s_analogue_gain(struct v4l2_subdev *sd, u32 val)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
/* 10 bits of gain, 2 in the high register. */
|
|
|
|
|
ret = ov5647_write(sd, OV5647_REG_GAIN_HI, (val >> 8) & 3);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return ov5647_write(sd, OV5647_REG_GAIN_LO, val & 0xff);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_s_exposure(struct v4l2_subdev *sd, u32 val)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Sensor has 20 bits, but the bottom 4 bits are fractions of a line
|
|
|
|
|
* which we leave as zero (and don't receive in "val").
|
|
|
|
|
*/
|
|
|
|
|
ret = ov5647_write(sd, OV5647_REG_EXP_HI, (val >> 12) & 0xf);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
ret = ov5647_write(sd, OV5647_REG_EXP_MID, (val >> 4) & 0xff);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return ov5647_write(sd, OV5647_REG_EXP_LO, (val & 0xf) << 4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
|
|
{
|
|
|
|
|
struct ov5647 *sensor = container_of(ctrl->handler,
|
|
|
|
|
struct ov5647, ctrls);
|
|
|
|
|
struct v4l2_subdev *sd = &sensor->sd;
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2020-11-19 09:35:47 -07:00
|
|
|
int ret = 0;
|
|
|
|
|
|
2020-11-19 09:32:31 -07:00
|
|
|
|
|
|
|
|
/* v4l2_ctrl_lock() locks our own mutex */
|
|
|
|
|
|
2020-11-19 09:35:44 -07:00
|
|
|
if (ctrl->id == V4L2_CID_VBLANK) {
|
|
|
|
|
int exposure_max, exposure_def;
|
|
|
|
|
|
|
|
|
|
/* Update max exposure while meeting expected vblanking */
|
|
|
|
|
exposure_max = sensor->mode->format.height + ctrl->val - 4;
|
|
|
|
|
exposure_def = min(exposure_max, OV5647_EXPOSURE_DEFAULT);
|
|
|
|
|
__v4l2_ctrl_modify_range(sensor->exposure,
|
|
|
|
|
sensor->exposure->minimum,
|
|
|
|
|
exposure_max, sensor->exposure->step,
|
|
|
|
|
exposure_def);
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:32:31 -07:00
|
|
|
/*
|
2020-11-19 09:35:47 -07:00
|
|
|
* If the device is not powered up do not apply any controls
|
|
|
|
|
* to H/W at this time. Instead the controls will be restored
|
|
|
|
|
* at s_stream(1) time.
|
2020-11-19 09:32:31 -07:00
|
|
|
*/
|
2020-11-19 09:35:47 -07:00
|
|
|
if (pm_runtime_get_if_in_use(&client->dev) == 0)
|
2020-11-19 09:32:31 -07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
|
case V4L2_CID_AUTO_WHITE_BALANCE:
|
2020-11-19 09:35:47 -07:00
|
|
|
ret = ov5647_s_auto_white_balance(sd, ctrl->val);
|
|
|
|
|
break;
|
2020-11-19 09:32:31 -07:00
|
|
|
case V4L2_CID_AUTOGAIN:
|
2020-11-19 09:35:47 -07:00
|
|
|
ret = ov5647_s_autogain(sd, ctrl->val);
|
|
|
|
|
break;
|
2020-11-19 09:32:31 -07:00
|
|
|
case V4L2_CID_EXPOSURE_AUTO:
|
2020-11-19 09:35:47 -07:00
|
|
|
ret = ov5647_s_exposure_auto(sd, ctrl->val);
|
|
|
|
|
break;
|
2020-11-19 09:32:31 -07:00
|
|
|
case V4L2_CID_ANALOGUE_GAIN:
|
2020-11-19 09:35:47 -07:00
|
|
|
ret = ov5647_s_analogue_gain(sd, ctrl->val);
|
|
|
|
|
break;
|
2020-11-19 09:32:31 -07:00
|
|
|
case V4L2_CID_EXPOSURE:
|
2020-11-19 09:35:47 -07:00
|
|
|
ret = ov5647_s_exposure(sd, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_VBLANK:
|
|
|
|
|
ret = ov5647_write16(sd, OV5647_REG_VTS_HI,
|
|
|
|
|
sensor->mode->format.height + ctrl->val);
|
|
|
|
|
break;
|
2023-02-21 10:10:47 -07:00
|
|
|
case V4L2_CID_TEST_PATTERN:
|
|
|
|
|
ret = ov5647_write(sd, OV5647_REG_ISPCTRL3D,
|
|
|
|
|
ov5647_test_pattern_val[ctrl->val]);
|
|
|
|
|
break;
|
2020-11-19 09:35:47 -07:00
|
|
|
|
|
|
|
|
/* Read-only, but we adjust it based on mode. */
|
2020-11-19 09:35:41 -07:00
|
|
|
case V4L2_CID_PIXEL_RATE:
|
2020-11-19 09:35:42 -07:00
|
|
|
case V4L2_CID_HBLANK:
|
|
|
|
|
/* Read-only, but we adjust it based on mode. */
|
2020-11-19 09:35:47 -07:00
|
|
|
break;
|
|
|
|
|
|
2020-11-19 09:32:31 -07:00
|
|
|
default:
|
|
|
|
|
dev_info(&client->dev,
|
|
|
|
|
"Control (id:0x%x, val:0x%x) not supported\n",
|
|
|
|
|
ctrl->id, ctrl->val);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:35:47 -07:00
|
|
|
pm_runtime_put(&client->dev);
|
|
|
|
|
|
|
|
|
|
return ret;
|
2020-11-19 09:32:31 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_ctrl_ops ov5647_ctrl_ops = {
|
|
|
|
|
.s_ctrl = ov5647_s_ctrl,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov5647_init_controls(struct ov5647 *sensor)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);
|
2020-11-19 09:35:44 -07:00
|
|
|
int hblank, exposure_max, exposure_def;
|
2020-11-19 09:32:31 -07:00
|
|
|
|
2023-02-21 10:10:47 -07:00
|
|
|
v4l2_ctrl_handler_init(&sensor->ctrls, 9);
|
2020-11-19 09:32:31 -07:00
|
|
|
|
|
|
|
|
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_AUTOGAIN, 0, 1, 1, 0);
|
|
|
|
|
|
|
|
|
|
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 0);
|
|
|
|
|
|
|
|
|
|
v4l2_ctrl_new_std_menu(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL,
|
|
|
|
|
0, V4L2_EXPOSURE_MANUAL);
|
|
|
|
|
|
2020-11-19 09:35:44 -07:00
|
|
|
exposure_max = sensor->mode->vts - 4;
|
|
|
|
|
exposure_def = min(exposure_max, OV5647_EXPOSURE_DEFAULT);
|
|
|
|
|
sensor->exposure = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_EXPOSURE,
|
|
|
|
|
OV5647_EXPOSURE_MIN,
|
|
|
|
|
exposure_max, OV5647_EXPOSURE_STEP,
|
|
|
|
|
exposure_def);
|
2020-11-19 09:32:31 -07:00
|
|
|
|
|
|
|
|
/* min: 16 = 1.0x; max (10 bits); default: 32 = 2.0x. */
|
|
|
|
|
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_ANALOGUE_GAIN, 16, 1023, 1, 32);
|
|
|
|
|
|
2020-11-19 09:35:41 -07:00
|
|
|
/* By default, PIXEL_RATE is read only, but it does change per mode */
|
|
|
|
|
sensor->pixel_rate = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_PIXEL_RATE,
|
|
|
|
|
sensor->mode->pixel_rate,
|
|
|
|
|
sensor->mode->pixel_rate, 1,
|
|
|
|
|
sensor->mode->pixel_rate);
|
2020-11-19 09:35:42 -07:00
|
|
|
|
|
|
|
|
/* By default, HBLANK is read only, but it does change per mode. */
|
|
|
|
|
hblank = sensor->mode->hts - sensor->mode->format.width;
|
|
|
|
|
sensor->hblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_HBLANK, hblank, hblank, 1,
|
|
|
|
|
hblank);
|
|
|
|
|
|
2020-11-19 09:35:43 -07:00
|
|
|
sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_VBLANK, OV5647_VBLANK_MIN,
|
|
|
|
|
OV5647_VTS_MAX -
|
|
|
|
|
sensor->mode->format.height, 1,
|
|
|
|
|
sensor->mode->vts -
|
|
|
|
|
sensor->mode->format.height);
|
|
|
|
|
|
2023-02-21 10:10:47 -07:00
|
|
|
v4l2_ctrl_new_std_menu_items(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
|
|
|
V4L2_CID_TEST_PATTERN,
|
|
|
|
|
ARRAY_SIZE(ov5647_test_pattern_menu) - 1,
|
|
|
|
|
0, 0, ov5647_test_pattern_menu);
|
|
|
|
|
|
2020-11-19 09:35:41 -07:00
|
|
|
if (sensor->ctrls.error)
|
|
|
|
|
goto handler_free;
|
2020-11-19 09:32:31 -07:00
|
|
|
|
2020-11-19 09:35:41 -07:00
|
|
|
sensor->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
2020-11-19 09:35:42 -07:00
|
|
|
sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
2020-11-19 09:32:31 -07:00
|
|
|
sensor->sd.ctrl_handler = &sensor->ctrls;
|
|
|
|
|
|
|
|
|
|
return 0;
|
2020-11-19 09:35:41 -07:00
|
|
|
|
|
|
|
|
handler_free:
|
|
|
|
|
dev_err(&client->dev, "%s Controls initialization failed (%d)\n",
|
|
|
|
|
__func__, sensor->ctrls.error);
|
|
|
|
|
v4l2_ctrl_handler_free(&sensor->ctrls);
|
|
|
|
|
|
|
|
|
|
return sensor->ctrls.error;
|
2020-11-19 09:32:31 -07:00
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:19:29 -07:00
|
|
|
static int ov5647_parse_dt(struct ov5647 *sensor, struct device_node *np)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
2020-11-19 09:19:29 -07:00
|
|
|
struct v4l2_fwnode_endpoint bus_cfg = {
|
|
|
|
|
.bus_type = V4L2_MBUS_CSI2_DPHY,
|
|
|
|
|
};
|
2024-06-12 03:51:58 -07:00
|
|
|
struct device_node *ep __free(device_node) =
|
|
|
|
|
of_graph_get_endpoint_by_regs(np, 0, -1);
|
2017-03-22 05:30:27 -07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (!ep)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
2016-08-26 16:17:25 -07:00
|
|
|
ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &bus_cfg);
|
2020-11-19 09:19:29 -07:00
|
|
|
if (ret)
|
2024-06-12 03:51:58 -07:00
|
|
|
return ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:19:29 -07:00
|
|
|
sensor->clock_ncont = bus_cfg.bus.mipi_csi2.flags &
|
|
|
|
|
V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK;
|
|
|
|
|
|
2024-06-12 03:51:58 -07:00
|
|
|
return 0;
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
2019-07-10 14:51:49 -07:00
|
|
|
static int ov5647_probe(struct i2c_client *client)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
2020-11-19 09:19:32 -07:00
|
|
|
struct device_node *np = client->dev.of_node;
|
2017-03-22 05:30:27 -07:00
|
|
|
struct device *dev = &client->dev;
|
|
|
|
|
struct ov5647 *sensor;
|
|
|
|
|
struct v4l2_subdev *sd;
|
|
|
|
|
u32 xclk_freq;
|
2020-11-19 09:19:32 -07:00
|
|
|
int ret;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
|
|
|
|
|
if (!sensor)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
if (IS_ENABLED(CONFIG_OF) && np) {
|
2020-11-19 09:19:29 -07:00
|
|
|
ret = ov5647_parse_dt(sensor, np);
|
2017-03-22 05:30:27 -07:00
|
|
|
if (ret) {
|
|
|
|
|
dev_err(dev, "DT parsing error: %d\n", ret);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sensor->xclk = devm_clk_get(dev, NULL);
|
|
|
|
|
if (IS_ERR(sensor->xclk)) {
|
|
|
|
|
dev_err(dev, "could not get xclk");
|
|
|
|
|
return PTR_ERR(sensor->xclk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xclk_freq = clk_get_rate(sensor->xclk);
|
|
|
|
|
if (xclk_freq != 25000000) {
|
|
|
|
|
dev_err(dev, "Unsupported clock frequency: %u\n", xclk_freq);
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:19:32 -07:00
|
|
|
/* Request the power down GPIO asserted. */
|
|
|
|
|
sensor->pwdn = devm_gpiod_get_optional(dev, "pwdn", GPIOD_OUT_HIGH);
|
2020-11-19 09:19:28 -07:00
|
|
|
if (IS_ERR(sensor->pwdn)) {
|
|
|
|
|
dev_err(dev, "Failed to get 'pwdn' gpio\n");
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
mutex_init(&sensor->lock);
|
|
|
|
|
|
2020-11-19 09:32:33 -07:00
|
|
|
sensor->mode = OV5647_DEFAULT_MODE;
|
|
|
|
|
|
2020-11-19 09:32:31 -07:00
|
|
|
ret = ov5647_init_controls(sensor);
|
|
|
|
|
if (ret)
|
|
|
|
|
goto mutex_destroy;
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
sd = &sensor->sd;
|
|
|
|
|
v4l2_i2c_subdev_init(sd, client, &ov5647_subdev_ops);
|
2020-11-19 09:19:32 -07:00
|
|
|
sd->internal_ops = &ov5647_subdev_internal_ops;
|
2020-11-19 09:35:40 -07:00
|
|
|
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
|
|
|
|
|
sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
|
|
|
|
|
ret = media_entity_pads_init(&sd->entity, 1, &sensor->pad);
|
|
|
|
|
if (ret < 0)
|
2020-11-19 09:32:31 -07:00
|
|
|
goto ctrl_handler_free;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
ret = ov5647_power_on(dev);
|
|
|
|
|
if (ret)
|
|
|
|
|
goto entity_cleanup;
|
2020-11-19 09:19:28 -07:00
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
ret = ov5647_detect(sd);
|
|
|
|
|
if (ret < 0)
|
2020-11-19 09:35:45 -07:00
|
|
|
goto power_off;
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
ret = v4l2_async_register_subdev(sd);
|
|
|
|
|
if (ret < 0)
|
2020-11-19 09:35:45 -07:00
|
|
|
goto power_off;
|
|
|
|
|
|
|
|
|
|
/* Enable runtime PM and turn off the device */
|
|
|
|
|
pm_runtime_set_active(dev);
|
|
|
|
|
pm_runtime_enable(dev);
|
|
|
|
|
pm_runtime_idle(dev);
|
2017-03-22 05:30:27 -07:00
|
|
|
|
|
|
|
|
dev_dbg(dev, "OmniVision OV5647 camera driver probed\n");
|
2020-11-19 09:19:32 -07:00
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
return 0;
|
2020-11-19 09:19:32 -07:00
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
power_off:
|
|
|
|
|
ov5647_power_off(dev);
|
2020-11-19 09:19:32 -07:00
|
|
|
entity_cleanup:
|
2017-03-22 05:30:27 -07:00
|
|
|
media_entity_cleanup(&sd->entity);
|
2020-11-19 09:32:31 -07:00
|
|
|
ctrl_handler_free:
|
|
|
|
|
v4l2_ctrl_handler_free(&sensor->ctrls);
|
2020-11-19 09:19:32 -07:00
|
|
|
mutex_destroy:
|
2017-03-22 05:30:27 -07:00
|
|
|
mutex_destroy(&sensor->lock);
|
2020-11-19 09:19:32 -07:00
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2022-08-15 01:02:30 -07:00
|
|
|
static void ov5647_remove(struct i2c_client *client)
|
2017-03-22 05:30:27 -07:00
|
|
|
{
|
|
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
2020-11-19 09:32:32 -07:00
|
|
|
struct ov5647 *sensor = to_sensor(sd);
|
2017-03-22 05:30:27 -07:00
|
|
|
|
2020-11-19 09:32:32 -07:00
|
|
|
v4l2_async_unregister_subdev(&sensor->sd);
|
|
|
|
|
media_entity_cleanup(&sensor->sd.entity);
|
|
|
|
|
v4l2_ctrl_handler_free(&sensor->ctrls);
|
2017-03-22 05:30:27 -07:00
|
|
|
v4l2_device_unregister_subdev(sd);
|
2020-11-19 09:35:45 -07:00
|
|
|
pm_runtime_disable(&client->dev);
|
2020-11-19 09:32:32 -07:00
|
|
|
mutex_destroy(&sensor->lock);
|
2017-03-22 05:30:27 -07:00
|
|
|
}
|
|
|
|
|
|
2020-11-19 09:35:45 -07:00
|
|
|
static const struct dev_pm_ops ov5647_pm_ops = {
|
|
|
|
|
SET_RUNTIME_PM_OPS(ov5647_power_off, ov5647_power_on, NULL)
|
|
|
|
|
};
|
|
|
|
|
|
2017-03-22 05:30:27 -07:00
|
|
|
static const struct i2c_device_id ov5647_id[] = {
|
2024-05-08 06:20:42 -07:00
|
|
|
{ "ov5647" },
|
2020-11-19 09:19:32 -07:00
|
|
|
{ /* sentinel */ }
|
2017-03-22 05:30:27 -07:00
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(i2c, ov5647_id);
|
|
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_OF)
|
|
|
|
|
static const struct of_device_id ov5647_of_match[] = {
|
|
|
|
|
{ .compatible = "ovti,ov5647" },
|
|
|
|
|
{ /* sentinel */ },
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(of, ov5647_of_match);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static struct i2c_driver ov5647_driver = {
|
|
|
|
|
.driver = {
|
|
|
|
|
.of_match_table = of_match_ptr(ov5647_of_match),
|
2020-11-19 09:19:32 -07:00
|
|
|
.name = "ov5647",
|
2020-11-19 09:35:45 -07:00
|
|
|
.pm = &ov5647_pm_ops,
|
2017-03-22 05:30:27 -07:00
|
|
|
},
|
2023-05-14 05:04:07 -07:00
|
|
|
.probe = ov5647_probe,
|
2017-03-22 05:30:27 -07:00
|
|
|
.remove = ov5647_remove,
|
|
|
|
|
.id_table = ov5647_id,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
module_i2c_driver(ov5647_driver);
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Ramiro Oliveira <roliveir@synopsys.com>");
|
|
|
|
|
MODULE_DESCRIPTION("A low-level driver for OmniVision ov5647 sensors");
|
|
|
|
|
MODULE_LICENSE("GPL v2");
|