2018-02-21 17:55:20 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
|
// Copyright (c) 2017 Intel Corporation.
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
|
#include <linux/i2c.h>
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/pm_runtime.h>
|
|
|
|
|
#include <media/v4l2-ctrls.h>
|
|
|
|
|
#include <media/v4l2-device.h>
|
2021-10-06 22:26:24 +00:00
|
|
|
#include <media/v4l2-event.h>
|
2020-05-09 09:04:54 +00:00
|
|
|
#include <media/v4l2-fwnode.h>
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
#define OV13858_REG_VALUE_08BIT 1
|
|
|
|
|
#define OV13858_REG_VALUE_16BIT 2
|
|
|
|
|
#define OV13858_REG_VALUE_24BIT 3
|
|
|
|
|
|
|
|
|
|
#define OV13858_REG_MODE_SELECT 0x0100
|
|
|
|
|
#define OV13858_MODE_STANDBY 0x00
|
|
|
|
|
#define OV13858_MODE_STREAMING 0x01
|
|
|
|
|
|
|
|
|
|
#define OV13858_REG_SOFTWARE_RST 0x0103
|
|
|
|
|
#define OV13858_SOFTWARE_RST 0x01
|
|
|
|
|
|
|
|
|
|
/* PLL1 generates PCLK and MIPI_PHY_CLK */
|
|
|
|
|
#define OV13858_REG_PLL1_CTRL_0 0x0300
|
|
|
|
|
#define OV13858_REG_PLL1_CTRL_1 0x0301
|
|
|
|
|
#define OV13858_REG_PLL1_CTRL_2 0x0302
|
|
|
|
|
#define OV13858_REG_PLL1_CTRL_3 0x0303
|
|
|
|
|
#define OV13858_REG_PLL1_CTRL_4 0x0304
|
|
|
|
|
#define OV13858_REG_PLL1_CTRL_5 0x0305
|
|
|
|
|
|
|
|
|
|
/* PLL2 generates DAC_CLK, SCLK and SRAM_CLK */
|
|
|
|
|
#define OV13858_REG_PLL2_CTRL_B 0x030b
|
|
|
|
|
#define OV13858_REG_PLL2_CTRL_C 0x030c
|
|
|
|
|
#define OV13858_REG_PLL2_CTRL_D 0x030d
|
|
|
|
|
#define OV13858_REG_PLL2_CTRL_E 0x030e
|
|
|
|
|
#define OV13858_REG_PLL2_CTRL_F 0x030f
|
|
|
|
|
#define OV13858_REG_PLL2_CTRL_12 0x0312
|
|
|
|
|
#define OV13858_REG_MIPI_SC_CTRL0 0x3016
|
|
|
|
|
#define OV13858_REG_MIPI_SC_CTRL1 0x3022
|
|
|
|
|
|
|
|
|
|
/* Chip ID */
|
|
|
|
|
#define OV13858_REG_CHIP_ID 0x300a
|
|
|
|
|
#define OV13858_CHIP_ID 0x00d855
|
|
|
|
|
|
|
|
|
|
/* V_TIMING internal */
|
|
|
|
|
#define OV13858_REG_VTS 0x380e
|
|
|
|
|
#define OV13858_VTS_30FPS 0x0c8e /* 30 fps */
|
|
|
|
|
#define OV13858_VTS_60FPS 0x0648 /* 60 fps */
|
|
|
|
|
#define OV13858_VTS_MAX 0x7fff
|
|
|
|
|
|
|
|
|
|
/* HBLANK control - read only */
|
2017-07-29 07:00:39 +00:00
|
|
|
#define OV13858_PPL_270MHZ 2244
|
|
|
|
|
#define OV13858_PPL_540MHZ 4488
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
/* Exposure control */
|
|
|
|
|
#define OV13858_REG_EXPOSURE 0x3500
|
|
|
|
|
#define OV13858_EXPOSURE_MIN 4
|
|
|
|
|
#define OV13858_EXPOSURE_STEP 1
|
|
|
|
|
#define OV13858_EXPOSURE_DEFAULT 0x640
|
|
|
|
|
|
|
|
|
|
/* Analog gain control */
|
|
|
|
|
#define OV13858_REG_ANALOG_GAIN 0x3508
|
|
|
|
|
#define OV13858_ANA_GAIN_MIN 0
|
|
|
|
|
#define OV13858_ANA_GAIN_MAX 0x1fff
|
|
|
|
|
#define OV13858_ANA_GAIN_STEP 1
|
|
|
|
|
#define OV13858_ANA_GAIN_DEFAULT 0x80
|
|
|
|
|
|
|
|
|
|
/* Digital gain control */
|
2017-07-28 23:21:03 +00:00
|
|
|
#define OV13858_REG_B_MWB_GAIN 0x5100
|
|
|
|
|
#define OV13858_REG_G_MWB_GAIN 0x5102
|
|
|
|
|
#define OV13858_REG_R_MWB_GAIN 0x5104
|
|
|
|
|
#define OV13858_DGTL_GAIN_MIN 0
|
|
|
|
|
#define OV13858_DGTL_GAIN_MAX 16384 /* Max = 16 X */
|
|
|
|
|
#define OV13858_DGTL_GAIN_DEFAULT 1024 /* Default gain = 1 X */
|
|
|
|
|
#define OV13858_DGTL_GAIN_STEP 1 /* Each step = 1/1024 */
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
/* Test Pattern Control */
|
|
|
|
|
#define OV13858_REG_TEST_PATTERN 0x4503
|
|
|
|
|
#define OV13858_TEST_PATTERN_ENABLE BIT(7)
|
|
|
|
|
#define OV13858_TEST_PATTERN_MASK 0xfc
|
|
|
|
|
|
|
|
|
|
/* Number of frames to skip */
|
|
|
|
|
#define OV13858_NUM_OF_SKIP_FRAMES 2
|
|
|
|
|
|
|
|
|
|
struct ov13858_reg {
|
|
|
|
|
u16 address;
|
|
|
|
|
u8 val;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ov13858_reg_list {
|
|
|
|
|
u32 num_of_regs;
|
|
|
|
|
const struct ov13858_reg *regs;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Link frequency config */
|
|
|
|
|
struct ov13858_link_freq_config {
|
|
|
|
|
u32 pixels_per_line;
|
|
|
|
|
|
|
|
|
|
/* PLL registers for this link frequency */
|
|
|
|
|
struct ov13858_reg_list reg_list;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Mode : resolution and related config&values */
|
|
|
|
|
struct ov13858_mode {
|
|
|
|
|
/* Frame width */
|
|
|
|
|
u32 width;
|
|
|
|
|
/* Frame height */
|
|
|
|
|
u32 height;
|
|
|
|
|
|
|
|
|
|
/* V-timing */
|
2017-08-18 04:29:38 +00:00
|
|
|
u32 vts_def;
|
|
|
|
|
u32 vts_min;
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
/* Index of Link frequency config to be used */
|
|
|
|
|
u32 link_freq_index;
|
|
|
|
|
/* Default register values */
|
|
|
|
|
struct ov13858_reg_list reg_list;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* 4224x3136 needs 1080Mbps/lane, 4 lanes */
|
|
|
|
|
static const struct ov13858_reg mipi_data_rate_1080mbps[] = {
|
|
|
|
|
/* PLL1 registers */
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_0, 0x07},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_1, 0x01},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_2, 0xc2},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_3, 0x00},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_4, 0x00},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_5, 0x01},
|
|
|
|
|
|
|
|
|
|
/* PLL2 registers */
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_B, 0x05},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_C, 0x01},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_D, 0x0e},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_E, 0x05},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_F, 0x01},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_12, 0x01},
|
|
|
|
|
{OV13858_REG_MIPI_SC_CTRL0, 0x72},
|
|
|
|
|
{OV13858_REG_MIPI_SC_CTRL1, 0x01},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* 2112x1568, 2112x1188, 1056x784 need 540Mbps/lane,
|
|
|
|
|
* 4 lanes
|
|
|
|
|
*/
|
|
|
|
|
static const struct ov13858_reg mipi_data_rate_540mbps[] = {
|
|
|
|
|
/* PLL1 registers */
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_0, 0x07},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_1, 0x01},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_2, 0xc2},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_3, 0x01},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_4, 0x00},
|
|
|
|
|
{OV13858_REG_PLL1_CTRL_5, 0x01},
|
|
|
|
|
|
|
|
|
|
/* PLL2 registers */
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_B, 0x05},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_C, 0x01},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_D, 0x0e},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_E, 0x05},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_F, 0x01},
|
|
|
|
|
{OV13858_REG_PLL2_CTRL_12, 0x01},
|
|
|
|
|
{OV13858_REG_MIPI_SC_CTRL0, 0x72},
|
|
|
|
|
{OV13858_REG_MIPI_SC_CTRL1, 0x01},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct ov13858_reg mode_4224x3136_regs[] = {
|
|
|
|
|
{0x3013, 0x32},
|
|
|
|
|
{0x301b, 0xf0},
|
|
|
|
|
{0x301f, 0xd0},
|
|
|
|
|
{0x3106, 0x15},
|
|
|
|
|
{0x3107, 0x23},
|
|
|
|
|
{0x350a, 0x00},
|
|
|
|
|
{0x350e, 0x00},
|
|
|
|
|
{0x3510, 0x00},
|
|
|
|
|
{0x3511, 0x02},
|
|
|
|
|
{0x3512, 0x00},
|
|
|
|
|
{0x3600, 0x2b},
|
|
|
|
|
{0x3601, 0x52},
|
|
|
|
|
{0x3602, 0x60},
|
|
|
|
|
{0x3612, 0x05},
|
|
|
|
|
{0x3613, 0xa4},
|
|
|
|
|
{0x3620, 0x80},
|
|
|
|
|
{0x3621, 0x10},
|
|
|
|
|
{0x3622, 0x30},
|
|
|
|
|
{0x3624, 0x1c},
|
|
|
|
|
{0x3640, 0x10},
|
|
|
|
|
{0x3641, 0x70},
|
2018-01-25 04:34:39 +00:00
|
|
|
{0x3660, 0x04},
|
2017-06-13 22:06:16 +00:00
|
|
|
{0x3661, 0x80},
|
|
|
|
|
{0x3662, 0x12},
|
|
|
|
|
{0x3664, 0x73},
|
|
|
|
|
{0x3665, 0xa7},
|
|
|
|
|
{0x366e, 0xff},
|
|
|
|
|
{0x366f, 0xf4},
|
|
|
|
|
{0x3674, 0x00},
|
|
|
|
|
{0x3679, 0x0c},
|
|
|
|
|
{0x367f, 0x01},
|
|
|
|
|
{0x3680, 0x0c},
|
|
|
|
|
{0x3681, 0x50},
|
|
|
|
|
{0x3682, 0x50},
|
|
|
|
|
{0x3683, 0xa9},
|
|
|
|
|
{0x3684, 0xa9},
|
|
|
|
|
{0x3709, 0x5f},
|
|
|
|
|
{0x3714, 0x24},
|
|
|
|
|
{0x371a, 0x3e},
|
|
|
|
|
{0x3737, 0x04},
|
|
|
|
|
{0x3738, 0xcc},
|
|
|
|
|
{0x3739, 0x12},
|
|
|
|
|
{0x373d, 0x26},
|
|
|
|
|
{0x3764, 0x20},
|
|
|
|
|
{0x3765, 0x20},
|
|
|
|
|
{0x37a1, 0x36},
|
|
|
|
|
{0x37a8, 0x3b},
|
|
|
|
|
{0x37ab, 0x31},
|
|
|
|
|
{0x37c2, 0x04},
|
|
|
|
|
{0x37c3, 0xf1},
|
|
|
|
|
{0x37c5, 0x00},
|
|
|
|
|
{0x37d8, 0x03},
|
|
|
|
|
{0x37d9, 0x0c},
|
|
|
|
|
{0x37da, 0xc2},
|
|
|
|
|
{0x37dc, 0x02},
|
|
|
|
|
{0x37e0, 0x00},
|
|
|
|
|
{0x37e1, 0x0a},
|
|
|
|
|
{0x37e2, 0x14},
|
|
|
|
|
{0x37e3, 0x04},
|
|
|
|
|
{0x37e4, 0x2a},
|
|
|
|
|
{0x37e5, 0x03},
|
|
|
|
|
{0x37e6, 0x04},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x00},
|
|
|
|
|
{0x3802, 0x00},
|
2017-09-18 22:47:43 +00:00
|
|
|
{0x3803, 0x08},
|
2017-06-13 22:06:16 +00:00
|
|
|
{0x3804, 0x10},
|
|
|
|
|
{0x3805, 0x9f},
|
|
|
|
|
{0x3806, 0x0c},
|
2017-09-18 22:47:43 +00:00
|
|
|
{0x3807, 0x57},
|
2017-06-13 22:06:16 +00:00
|
|
|
{0x3808, 0x10},
|
|
|
|
|
{0x3809, 0x80},
|
|
|
|
|
{0x380a, 0x0c},
|
|
|
|
|
{0x380b, 0x40},
|
|
|
|
|
{0x380c, 0x04},
|
|
|
|
|
{0x380d, 0x62},
|
|
|
|
|
{0x380e, 0x0c},
|
|
|
|
|
{0x380f, 0x8e},
|
|
|
|
|
{0x3811, 0x04},
|
|
|
|
|
{0x3813, 0x05},
|
|
|
|
|
{0x3814, 0x01},
|
|
|
|
|
{0x3815, 0x01},
|
|
|
|
|
{0x3816, 0x01},
|
|
|
|
|
{0x3817, 0x01},
|
|
|
|
|
{0x3820, 0xa8},
|
|
|
|
|
{0x3821, 0x00},
|
|
|
|
|
{0x3822, 0xc2},
|
|
|
|
|
{0x3823, 0x18},
|
|
|
|
|
{0x3826, 0x11},
|
|
|
|
|
{0x3827, 0x1c},
|
|
|
|
|
{0x3829, 0x03},
|
|
|
|
|
{0x3832, 0x00},
|
|
|
|
|
{0x3c80, 0x00},
|
|
|
|
|
{0x3c87, 0x01},
|
|
|
|
|
{0x3c8c, 0x19},
|
|
|
|
|
{0x3c8d, 0x1c},
|
|
|
|
|
{0x3c90, 0x00},
|
|
|
|
|
{0x3c91, 0x00},
|
|
|
|
|
{0x3c92, 0x00},
|
|
|
|
|
{0x3c93, 0x00},
|
|
|
|
|
{0x3c94, 0x40},
|
|
|
|
|
{0x3c95, 0x54},
|
|
|
|
|
{0x3c96, 0x34},
|
|
|
|
|
{0x3c97, 0x04},
|
|
|
|
|
{0x3c98, 0x00},
|
|
|
|
|
{0x3d8c, 0x73},
|
|
|
|
|
{0x3d8d, 0xc0},
|
|
|
|
|
{0x3f00, 0x0b},
|
|
|
|
|
{0x3f03, 0x00},
|
|
|
|
|
{0x4001, 0xe0},
|
|
|
|
|
{0x4008, 0x00},
|
|
|
|
|
{0x4009, 0x0f},
|
|
|
|
|
{0x4011, 0xf0},
|
|
|
|
|
{0x4017, 0x08},
|
|
|
|
|
{0x4050, 0x04},
|
|
|
|
|
{0x4051, 0x0b},
|
|
|
|
|
{0x4052, 0x00},
|
|
|
|
|
{0x4053, 0x80},
|
|
|
|
|
{0x4054, 0x00},
|
|
|
|
|
{0x4055, 0x80},
|
|
|
|
|
{0x4056, 0x00},
|
|
|
|
|
{0x4057, 0x80},
|
|
|
|
|
{0x4058, 0x00},
|
|
|
|
|
{0x4059, 0x80},
|
|
|
|
|
{0x405e, 0x20},
|
|
|
|
|
{0x4500, 0x07},
|
|
|
|
|
{0x4503, 0x00},
|
|
|
|
|
{0x450a, 0x04},
|
|
|
|
|
{0x4809, 0x04},
|
|
|
|
|
{0x480c, 0x12},
|
|
|
|
|
{0x481f, 0x30},
|
|
|
|
|
{0x4833, 0x10},
|
|
|
|
|
{0x4837, 0x0e},
|
|
|
|
|
{0x4902, 0x01},
|
|
|
|
|
{0x4d00, 0x03},
|
|
|
|
|
{0x4d01, 0xc9},
|
|
|
|
|
{0x4d02, 0xbc},
|
|
|
|
|
{0x4d03, 0xd7},
|
|
|
|
|
{0x4d04, 0xf0},
|
|
|
|
|
{0x4d05, 0xa2},
|
|
|
|
|
{0x5000, 0xfd},
|
|
|
|
|
{0x5001, 0x01},
|
|
|
|
|
{0x5040, 0x39},
|
|
|
|
|
{0x5041, 0x10},
|
|
|
|
|
{0x5042, 0x10},
|
|
|
|
|
{0x5043, 0x84},
|
|
|
|
|
{0x5044, 0x62},
|
|
|
|
|
{0x5180, 0x00},
|
|
|
|
|
{0x5181, 0x10},
|
|
|
|
|
{0x5182, 0x02},
|
|
|
|
|
{0x5183, 0x0f},
|
|
|
|
|
{0x5200, 0x1b},
|
|
|
|
|
{0x520b, 0x07},
|
|
|
|
|
{0x520c, 0x0f},
|
|
|
|
|
{0x5300, 0x04},
|
|
|
|
|
{0x5301, 0x0c},
|
|
|
|
|
{0x5302, 0x0c},
|
|
|
|
|
{0x5303, 0x0f},
|
|
|
|
|
{0x5304, 0x00},
|
|
|
|
|
{0x5305, 0x70},
|
|
|
|
|
{0x5306, 0x00},
|
|
|
|
|
{0x5307, 0x80},
|
|
|
|
|
{0x5308, 0x00},
|
|
|
|
|
{0x5309, 0xa5},
|
|
|
|
|
{0x530a, 0x00},
|
|
|
|
|
{0x530b, 0xd3},
|
|
|
|
|
{0x530c, 0x00},
|
|
|
|
|
{0x530d, 0xf0},
|
|
|
|
|
{0x530e, 0x01},
|
|
|
|
|
{0x530f, 0x10},
|
|
|
|
|
{0x5310, 0x01},
|
|
|
|
|
{0x5311, 0x20},
|
|
|
|
|
{0x5312, 0x01},
|
|
|
|
|
{0x5313, 0x20},
|
|
|
|
|
{0x5314, 0x01},
|
|
|
|
|
{0x5315, 0x20},
|
|
|
|
|
{0x5316, 0x08},
|
|
|
|
|
{0x5317, 0x08},
|
|
|
|
|
{0x5318, 0x10},
|
|
|
|
|
{0x5319, 0x88},
|
|
|
|
|
{0x531a, 0x88},
|
|
|
|
|
{0x531b, 0xa9},
|
|
|
|
|
{0x531c, 0xaa},
|
|
|
|
|
{0x531d, 0x0a},
|
|
|
|
|
{0x5405, 0x02},
|
|
|
|
|
{0x5406, 0x67},
|
|
|
|
|
{0x5407, 0x01},
|
|
|
|
|
{0x5408, 0x4a},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct ov13858_reg mode_2112x1568_regs[] = {
|
|
|
|
|
{0x3013, 0x32},
|
|
|
|
|
{0x301b, 0xf0},
|
|
|
|
|
{0x301f, 0xd0},
|
|
|
|
|
{0x3106, 0x15},
|
|
|
|
|
{0x3107, 0x23},
|
|
|
|
|
{0x350a, 0x00},
|
|
|
|
|
{0x350e, 0x00},
|
|
|
|
|
{0x3510, 0x00},
|
|
|
|
|
{0x3511, 0x02},
|
|
|
|
|
{0x3512, 0x00},
|
|
|
|
|
{0x3600, 0x2b},
|
|
|
|
|
{0x3601, 0x52},
|
|
|
|
|
{0x3602, 0x60},
|
|
|
|
|
{0x3612, 0x05},
|
|
|
|
|
{0x3613, 0xa4},
|
|
|
|
|
{0x3620, 0x80},
|
|
|
|
|
{0x3621, 0x10},
|
|
|
|
|
{0x3622, 0x30},
|
|
|
|
|
{0x3624, 0x1c},
|
|
|
|
|
{0x3640, 0x10},
|
|
|
|
|
{0x3641, 0x70},
|
2018-01-25 04:34:39 +00:00
|
|
|
{0x3660, 0x04},
|
2017-06-13 22:06:16 +00:00
|
|
|
{0x3661, 0x80},
|
|
|
|
|
{0x3662, 0x10},
|
|
|
|
|
{0x3664, 0x73},
|
|
|
|
|
{0x3665, 0xa7},
|
|
|
|
|
{0x366e, 0xff},
|
|
|
|
|
{0x366f, 0xf4},
|
|
|
|
|
{0x3674, 0x00},
|
|
|
|
|
{0x3679, 0x0c},
|
|
|
|
|
{0x367f, 0x01},
|
|
|
|
|
{0x3680, 0x0c},
|
|
|
|
|
{0x3681, 0x50},
|
|
|
|
|
{0x3682, 0x50},
|
|
|
|
|
{0x3683, 0xa9},
|
|
|
|
|
{0x3684, 0xa9},
|
|
|
|
|
{0x3709, 0x5f},
|
|
|
|
|
{0x3714, 0x28},
|
|
|
|
|
{0x371a, 0x3e},
|
|
|
|
|
{0x3737, 0x08},
|
|
|
|
|
{0x3738, 0xcc},
|
|
|
|
|
{0x3739, 0x20},
|
|
|
|
|
{0x373d, 0x26},
|
|
|
|
|
{0x3764, 0x20},
|
|
|
|
|
{0x3765, 0x20},
|
|
|
|
|
{0x37a1, 0x36},
|
|
|
|
|
{0x37a8, 0x3b},
|
|
|
|
|
{0x37ab, 0x31},
|
|
|
|
|
{0x37c2, 0x14},
|
|
|
|
|
{0x37c3, 0xf1},
|
|
|
|
|
{0x37c5, 0x00},
|
|
|
|
|
{0x37d8, 0x03},
|
|
|
|
|
{0x37d9, 0x0c},
|
|
|
|
|
{0x37da, 0xc2},
|
|
|
|
|
{0x37dc, 0x02},
|
|
|
|
|
{0x37e0, 0x00},
|
|
|
|
|
{0x37e1, 0x0a},
|
|
|
|
|
{0x37e2, 0x14},
|
|
|
|
|
{0x37e3, 0x08},
|
|
|
|
|
{0x37e4, 0x38},
|
|
|
|
|
{0x37e5, 0x03},
|
|
|
|
|
{0x37e6, 0x08},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x00},
|
|
|
|
|
{0x3802, 0x00},
|
|
|
|
|
{0x3803, 0x00},
|
|
|
|
|
{0x3804, 0x10},
|
|
|
|
|
{0x3805, 0x9f},
|
|
|
|
|
{0x3806, 0x0c},
|
|
|
|
|
{0x3807, 0x5f},
|
|
|
|
|
{0x3808, 0x08},
|
|
|
|
|
{0x3809, 0x40},
|
|
|
|
|
{0x380a, 0x06},
|
|
|
|
|
{0x380b, 0x20},
|
|
|
|
|
{0x380c, 0x04},
|
|
|
|
|
{0x380d, 0x62},
|
|
|
|
|
{0x380e, 0x0c},
|
|
|
|
|
{0x380f, 0x8e},
|
|
|
|
|
{0x3811, 0x04},
|
|
|
|
|
{0x3813, 0x05},
|
|
|
|
|
{0x3814, 0x03},
|
|
|
|
|
{0x3815, 0x01},
|
|
|
|
|
{0x3816, 0x03},
|
|
|
|
|
{0x3817, 0x01},
|
|
|
|
|
{0x3820, 0xab},
|
|
|
|
|
{0x3821, 0x00},
|
|
|
|
|
{0x3822, 0xc2},
|
|
|
|
|
{0x3823, 0x18},
|
|
|
|
|
{0x3826, 0x04},
|
|
|
|
|
{0x3827, 0x90},
|
|
|
|
|
{0x3829, 0x07},
|
|
|
|
|
{0x3832, 0x00},
|
|
|
|
|
{0x3c80, 0x00},
|
|
|
|
|
{0x3c87, 0x01},
|
|
|
|
|
{0x3c8c, 0x19},
|
|
|
|
|
{0x3c8d, 0x1c},
|
|
|
|
|
{0x3c90, 0x00},
|
|
|
|
|
{0x3c91, 0x00},
|
|
|
|
|
{0x3c92, 0x00},
|
|
|
|
|
{0x3c93, 0x00},
|
|
|
|
|
{0x3c94, 0x40},
|
|
|
|
|
{0x3c95, 0x54},
|
|
|
|
|
{0x3c96, 0x34},
|
|
|
|
|
{0x3c97, 0x04},
|
|
|
|
|
{0x3c98, 0x00},
|
|
|
|
|
{0x3d8c, 0x73},
|
|
|
|
|
{0x3d8d, 0xc0},
|
|
|
|
|
{0x3f00, 0x0b},
|
|
|
|
|
{0x3f03, 0x00},
|
|
|
|
|
{0x4001, 0xe0},
|
|
|
|
|
{0x4008, 0x00},
|
|
|
|
|
{0x4009, 0x0d},
|
|
|
|
|
{0x4011, 0xf0},
|
|
|
|
|
{0x4017, 0x08},
|
|
|
|
|
{0x4050, 0x04},
|
|
|
|
|
{0x4051, 0x0b},
|
|
|
|
|
{0x4052, 0x00},
|
|
|
|
|
{0x4053, 0x80},
|
|
|
|
|
{0x4054, 0x00},
|
|
|
|
|
{0x4055, 0x80},
|
|
|
|
|
{0x4056, 0x00},
|
|
|
|
|
{0x4057, 0x80},
|
|
|
|
|
{0x4058, 0x00},
|
|
|
|
|
{0x4059, 0x80},
|
|
|
|
|
{0x405e, 0x20},
|
|
|
|
|
{0x4500, 0x07},
|
|
|
|
|
{0x4503, 0x00},
|
|
|
|
|
{0x450a, 0x04},
|
|
|
|
|
{0x4809, 0x04},
|
|
|
|
|
{0x480c, 0x12},
|
|
|
|
|
{0x481f, 0x30},
|
|
|
|
|
{0x4833, 0x10},
|
|
|
|
|
{0x4837, 0x1c},
|
|
|
|
|
{0x4902, 0x01},
|
|
|
|
|
{0x4d00, 0x03},
|
|
|
|
|
{0x4d01, 0xc9},
|
|
|
|
|
{0x4d02, 0xbc},
|
|
|
|
|
{0x4d03, 0xd7},
|
|
|
|
|
{0x4d04, 0xf0},
|
|
|
|
|
{0x4d05, 0xa2},
|
|
|
|
|
{0x5000, 0xfd},
|
|
|
|
|
{0x5001, 0x01},
|
|
|
|
|
{0x5040, 0x39},
|
|
|
|
|
{0x5041, 0x10},
|
|
|
|
|
{0x5042, 0x10},
|
|
|
|
|
{0x5043, 0x84},
|
|
|
|
|
{0x5044, 0x62},
|
|
|
|
|
{0x5180, 0x00},
|
|
|
|
|
{0x5181, 0x10},
|
|
|
|
|
{0x5182, 0x02},
|
|
|
|
|
{0x5183, 0x0f},
|
|
|
|
|
{0x5200, 0x1b},
|
|
|
|
|
{0x520b, 0x07},
|
|
|
|
|
{0x520c, 0x0f},
|
|
|
|
|
{0x5300, 0x04},
|
|
|
|
|
{0x5301, 0x0c},
|
|
|
|
|
{0x5302, 0x0c},
|
|
|
|
|
{0x5303, 0x0f},
|
|
|
|
|
{0x5304, 0x00},
|
|
|
|
|
{0x5305, 0x70},
|
|
|
|
|
{0x5306, 0x00},
|
|
|
|
|
{0x5307, 0x80},
|
|
|
|
|
{0x5308, 0x00},
|
|
|
|
|
{0x5309, 0xa5},
|
|
|
|
|
{0x530a, 0x00},
|
|
|
|
|
{0x530b, 0xd3},
|
|
|
|
|
{0x530c, 0x00},
|
|
|
|
|
{0x530d, 0xf0},
|
|
|
|
|
{0x530e, 0x01},
|
|
|
|
|
{0x530f, 0x10},
|
|
|
|
|
{0x5310, 0x01},
|
|
|
|
|
{0x5311, 0x20},
|
|
|
|
|
{0x5312, 0x01},
|
|
|
|
|
{0x5313, 0x20},
|
|
|
|
|
{0x5314, 0x01},
|
|
|
|
|
{0x5315, 0x20},
|
|
|
|
|
{0x5316, 0x08},
|
|
|
|
|
{0x5317, 0x08},
|
|
|
|
|
{0x5318, 0x10},
|
|
|
|
|
{0x5319, 0x88},
|
|
|
|
|
{0x531a, 0x88},
|
|
|
|
|
{0x531b, 0xa9},
|
|
|
|
|
{0x531c, 0xaa},
|
|
|
|
|
{0x531d, 0x0a},
|
|
|
|
|
{0x5405, 0x02},
|
|
|
|
|
{0x5406, 0x67},
|
|
|
|
|
{0x5407, 0x01},
|
|
|
|
|
{0x5408, 0x4a},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct ov13858_reg mode_2112x1188_regs[] = {
|
|
|
|
|
{0x3013, 0x32},
|
|
|
|
|
{0x301b, 0xf0},
|
|
|
|
|
{0x301f, 0xd0},
|
|
|
|
|
{0x3106, 0x15},
|
|
|
|
|
{0x3107, 0x23},
|
|
|
|
|
{0x350a, 0x00},
|
|
|
|
|
{0x350e, 0x00},
|
|
|
|
|
{0x3510, 0x00},
|
|
|
|
|
{0x3511, 0x02},
|
|
|
|
|
{0x3512, 0x00},
|
|
|
|
|
{0x3600, 0x2b},
|
|
|
|
|
{0x3601, 0x52},
|
|
|
|
|
{0x3602, 0x60},
|
|
|
|
|
{0x3612, 0x05},
|
|
|
|
|
{0x3613, 0xa4},
|
|
|
|
|
{0x3620, 0x80},
|
|
|
|
|
{0x3621, 0x10},
|
|
|
|
|
{0x3622, 0x30},
|
|
|
|
|
{0x3624, 0x1c},
|
|
|
|
|
{0x3640, 0x10},
|
|
|
|
|
{0x3641, 0x70},
|
2018-01-25 04:34:39 +00:00
|
|
|
{0x3660, 0x04},
|
2017-06-13 22:06:16 +00:00
|
|
|
{0x3661, 0x80},
|
|
|
|
|
{0x3662, 0x10},
|
|
|
|
|
{0x3664, 0x73},
|
|
|
|
|
{0x3665, 0xa7},
|
|
|
|
|
{0x366e, 0xff},
|
|
|
|
|
{0x366f, 0xf4},
|
|
|
|
|
{0x3674, 0x00},
|
|
|
|
|
{0x3679, 0x0c},
|
|
|
|
|
{0x367f, 0x01},
|
|
|
|
|
{0x3680, 0x0c},
|
|
|
|
|
{0x3681, 0x50},
|
|
|
|
|
{0x3682, 0x50},
|
|
|
|
|
{0x3683, 0xa9},
|
|
|
|
|
{0x3684, 0xa9},
|
|
|
|
|
{0x3709, 0x5f},
|
|
|
|
|
{0x3714, 0x28},
|
|
|
|
|
{0x371a, 0x3e},
|
|
|
|
|
{0x3737, 0x08},
|
|
|
|
|
{0x3738, 0xcc},
|
|
|
|
|
{0x3739, 0x20},
|
|
|
|
|
{0x373d, 0x26},
|
|
|
|
|
{0x3764, 0x20},
|
|
|
|
|
{0x3765, 0x20},
|
|
|
|
|
{0x37a1, 0x36},
|
|
|
|
|
{0x37a8, 0x3b},
|
|
|
|
|
{0x37ab, 0x31},
|
|
|
|
|
{0x37c2, 0x14},
|
|
|
|
|
{0x37c3, 0xf1},
|
|
|
|
|
{0x37c5, 0x00},
|
|
|
|
|
{0x37d8, 0x03},
|
|
|
|
|
{0x37d9, 0x0c},
|
|
|
|
|
{0x37da, 0xc2},
|
|
|
|
|
{0x37dc, 0x02},
|
|
|
|
|
{0x37e0, 0x00},
|
|
|
|
|
{0x37e1, 0x0a},
|
|
|
|
|
{0x37e2, 0x14},
|
|
|
|
|
{0x37e3, 0x08},
|
|
|
|
|
{0x37e4, 0x38},
|
|
|
|
|
{0x37e5, 0x03},
|
|
|
|
|
{0x37e6, 0x08},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x00},
|
|
|
|
|
{0x3802, 0x01},
|
|
|
|
|
{0x3803, 0x84},
|
|
|
|
|
{0x3804, 0x10},
|
|
|
|
|
{0x3805, 0x9f},
|
|
|
|
|
{0x3806, 0x0a},
|
|
|
|
|
{0x3807, 0xd3},
|
|
|
|
|
{0x3808, 0x08},
|
|
|
|
|
{0x3809, 0x40},
|
|
|
|
|
{0x380a, 0x04},
|
|
|
|
|
{0x380b, 0xa4},
|
|
|
|
|
{0x380c, 0x04},
|
|
|
|
|
{0x380d, 0x62},
|
|
|
|
|
{0x380e, 0x0c},
|
|
|
|
|
{0x380f, 0x8e},
|
|
|
|
|
{0x3811, 0x08},
|
|
|
|
|
{0x3813, 0x03},
|
|
|
|
|
{0x3814, 0x03},
|
|
|
|
|
{0x3815, 0x01},
|
|
|
|
|
{0x3816, 0x03},
|
|
|
|
|
{0x3817, 0x01},
|
|
|
|
|
{0x3820, 0xab},
|
|
|
|
|
{0x3821, 0x00},
|
|
|
|
|
{0x3822, 0xc2},
|
|
|
|
|
{0x3823, 0x18},
|
|
|
|
|
{0x3826, 0x04},
|
|
|
|
|
{0x3827, 0x90},
|
|
|
|
|
{0x3829, 0x07},
|
|
|
|
|
{0x3832, 0x00},
|
|
|
|
|
{0x3c80, 0x00},
|
|
|
|
|
{0x3c87, 0x01},
|
|
|
|
|
{0x3c8c, 0x19},
|
|
|
|
|
{0x3c8d, 0x1c},
|
|
|
|
|
{0x3c90, 0x00},
|
|
|
|
|
{0x3c91, 0x00},
|
|
|
|
|
{0x3c92, 0x00},
|
|
|
|
|
{0x3c93, 0x00},
|
|
|
|
|
{0x3c94, 0x40},
|
|
|
|
|
{0x3c95, 0x54},
|
|
|
|
|
{0x3c96, 0x34},
|
|
|
|
|
{0x3c97, 0x04},
|
|
|
|
|
{0x3c98, 0x00},
|
|
|
|
|
{0x3d8c, 0x73},
|
|
|
|
|
{0x3d8d, 0xc0},
|
|
|
|
|
{0x3f00, 0x0b},
|
|
|
|
|
{0x3f03, 0x00},
|
|
|
|
|
{0x4001, 0xe0},
|
|
|
|
|
{0x4008, 0x00},
|
|
|
|
|
{0x4009, 0x0d},
|
|
|
|
|
{0x4011, 0xf0},
|
|
|
|
|
{0x4017, 0x08},
|
|
|
|
|
{0x4050, 0x04},
|
|
|
|
|
{0x4051, 0x0b},
|
|
|
|
|
{0x4052, 0x00},
|
|
|
|
|
{0x4053, 0x80},
|
|
|
|
|
{0x4054, 0x00},
|
|
|
|
|
{0x4055, 0x80},
|
|
|
|
|
{0x4056, 0x00},
|
|
|
|
|
{0x4057, 0x80},
|
|
|
|
|
{0x4058, 0x00},
|
|
|
|
|
{0x4059, 0x80},
|
|
|
|
|
{0x405e, 0x20},
|
|
|
|
|
{0x4500, 0x07},
|
|
|
|
|
{0x4503, 0x00},
|
|
|
|
|
{0x450a, 0x04},
|
|
|
|
|
{0x4809, 0x04},
|
|
|
|
|
{0x480c, 0x12},
|
|
|
|
|
{0x481f, 0x30},
|
|
|
|
|
{0x4833, 0x10},
|
|
|
|
|
{0x4837, 0x1c},
|
|
|
|
|
{0x4902, 0x01},
|
|
|
|
|
{0x4d00, 0x03},
|
|
|
|
|
{0x4d01, 0xc9},
|
|
|
|
|
{0x4d02, 0xbc},
|
|
|
|
|
{0x4d03, 0xd7},
|
|
|
|
|
{0x4d04, 0xf0},
|
|
|
|
|
{0x4d05, 0xa2},
|
|
|
|
|
{0x5000, 0xfd},
|
|
|
|
|
{0x5001, 0x01},
|
|
|
|
|
{0x5040, 0x39},
|
|
|
|
|
{0x5041, 0x10},
|
|
|
|
|
{0x5042, 0x10},
|
|
|
|
|
{0x5043, 0x84},
|
|
|
|
|
{0x5044, 0x62},
|
|
|
|
|
{0x5180, 0x00},
|
|
|
|
|
{0x5181, 0x10},
|
|
|
|
|
{0x5182, 0x02},
|
|
|
|
|
{0x5183, 0x0f},
|
|
|
|
|
{0x5200, 0x1b},
|
|
|
|
|
{0x520b, 0x07},
|
|
|
|
|
{0x520c, 0x0f},
|
|
|
|
|
{0x5300, 0x04},
|
|
|
|
|
{0x5301, 0x0c},
|
|
|
|
|
{0x5302, 0x0c},
|
|
|
|
|
{0x5303, 0x0f},
|
|
|
|
|
{0x5304, 0x00},
|
|
|
|
|
{0x5305, 0x70},
|
|
|
|
|
{0x5306, 0x00},
|
|
|
|
|
{0x5307, 0x80},
|
|
|
|
|
{0x5308, 0x00},
|
|
|
|
|
{0x5309, 0xa5},
|
|
|
|
|
{0x530a, 0x00},
|
|
|
|
|
{0x530b, 0xd3},
|
|
|
|
|
{0x530c, 0x00},
|
|
|
|
|
{0x530d, 0xf0},
|
|
|
|
|
{0x530e, 0x01},
|
|
|
|
|
{0x530f, 0x10},
|
|
|
|
|
{0x5310, 0x01},
|
|
|
|
|
{0x5311, 0x20},
|
|
|
|
|
{0x5312, 0x01},
|
|
|
|
|
{0x5313, 0x20},
|
|
|
|
|
{0x5314, 0x01},
|
|
|
|
|
{0x5315, 0x20},
|
|
|
|
|
{0x5316, 0x08},
|
|
|
|
|
{0x5317, 0x08},
|
|
|
|
|
{0x5318, 0x10},
|
|
|
|
|
{0x5319, 0x88},
|
|
|
|
|
{0x531a, 0x88},
|
|
|
|
|
{0x531b, 0xa9},
|
|
|
|
|
{0x531c, 0xaa},
|
|
|
|
|
{0x531d, 0x0a},
|
|
|
|
|
{0x5405, 0x02},
|
|
|
|
|
{0x5406, 0x67},
|
|
|
|
|
{0x5407, 0x01},
|
|
|
|
|
{0x5408, 0x4a},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct ov13858_reg mode_1056x784_regs[] = {
|
|
|
|
|
{0x3013, 0x32},
|
|
|
|
|
{0x301b, 0xf0},
|
|
|
|
|
{0x301f, 0xd0},
|
|
|
|
|
{0x3106, 0x15},
|
|
|
|
|
{0x3107, 0x23},
|
|
|
|
|
{0x350a, 0x00},
|
|
|
|
|
{0x350e, 0x00},
|
|
|
|
|
{0x3510, 0x00},
|
|
|
|
|
{0x3511, 0x02},
|
|
|
|
|
{0x3512, 0x00},
|
|
|
|
|
{0x3600, 0x2b},
|
|
|
|
|
{0x3601, 0x52},
|
|
|
|
|
{0x3602, 0x60},
|
|
|
|
|
{0x3612, 0x05},
|
|
|
|
|
{0x3613, 0xa4},
|
|
|
|
|
{0x3620, 0x80},
|
|
|
|
|
{0x3621, 0x10},
|
|
|
|
|
{0x3622, 0x30},
|
|
|
|
|
{0x3624, 0x1c},
|
|
|
|
|
{0x3640, 0x10},
|
|
|
|
|
{0x3641, 0x70},
|
2018-01-25 04:34:39 +00:00
|
|
|
{0x3660, 0x04},
|
2017-06-13 22:06:16 +00:00
|
|
|
{0x3661, 0x80},
|
|
|
|
|
{0x3662, 0x08},
|
|
|
|
|
{0x3664, 0x73},
|
|
|
|
|
{0x3665, 0xa7},
|
|
|
|
|
{0x366e, 0xff},
|
|
|
|
|
{0x366f, 0xf4},
|
|
|
|
|
{0x3674, 0x00},
|
|
|
|
|
{0x3679, 0x0c},
|
|
|
|
|
{0x367f, 0x01},
|
|
|
|
|
{0x3680, 0x0c},
|
|
|
|
|
{0x3681, 0x50},
|
|
|
|
|
{0x3682, 0x50},
|
|
|
|
|
{0x3683, 0xa9},
|
|
|
|
|
{0x3684, 0xa9},
|
|
|
|
|
{0x3709, 0x5f},
|
|
|
|
|
{0x3714, 0x30},
|
|
|
|
|
{0x371a, 0x3e},
|
|
|
|
|
{0x3737, 0x08},
|
|
|
|
|
{0x3738, 0xcc},
|
|
|
|
|
{0x3739, 0x20},
|
|
|
|
|
{0x373d, 0x26},
|
|
|
|
|
{0x3764, 0x20},
|
|
|
|
|
{0x3765, 0x20},
|
|
|
|
|
{0x37a1, 0x36},
|
|
|
|
|
{0x37a8, 0x3b},
|
|
|
|
|
{0x37ab, 0x31},
|
|
|
|
|
{0x37c2, 0x2c},
|
|
|
|
|
{0x37c3, 0xf1},
|
|
|
|
|
{0x37c5, 0x00},
|
|
|
|
|
{0x37d8, 0x03},
|
|
|
|
|
{0x37d9, 0x06},
|
|
|
|
|
{0x37da, 0xc2},
|
|
|
|
|
{0x37dc, 0x02},
|
|
|
|
|
{0x37e0, 0x00},
|
|
|
|
|
{0x37e1, 0x0a},
|
|
|
|
|
{0x37e2, 0x14},
|
|
|
|
|
{0x37e3, 0x08},
|
|
|
|
|
{0x37e4, 0x36},
|
|
|
|
|
{0x37e5, 0x03},
|
|
|
|
|
{0x37e6, 0x08},
|
|
|
|
|
{0x3800, 0x00},
|
|
|
|
|
{0x3801, 0x00},
|
|
|
|
|
{0x3802, 0x00},
|
|
|
|
|
{0x3803, 0x00},
|
|
|
|
|
{0x3804, 0x10},
|
|
|
|
|
{0x3805, 0x9f},
|
|
|
|
|
{0x3806, 0x0c},
|
|
|
|
|
{0x3807, 0x5f},
|
|
|
|
|
{0x3808, 0x04},
|
|
|
|
|
{0x3809, 0x20},
|
|
|
|
|
{0x380a, 0x03},
|
|
|
|
|
{0x380b, 0x10},
|
|
|
|
|
{0x380c, 0x04},
|
|
|
|
|
{0x380d, 0x62},
|
|
|
|
|
{0x380e, 0x0c},
|
|
|
|
|
{0x380f, 0x8e},
|
|
|
|
|
{0x3811, 0x04},
|
|
|
|
|
{0x3813, 0x05},
|
|
|
|
|
{0x3814, 0x07},
|
|
|
|
|
{0x3815, 0x01},
|
|
|
|
|
{0x3816, 0x07},
|
|
|
|
|
{0x3817, 0x01},
|
|
|
|
|
{0x3820, 0xac},
|
|
|
|
|
{0x3821, 0x00},
|
|
|
|
|
{0x3822, 0xc2},
|
|
|
|
|
{0x3823, 0x18},
|
|
|
|
|
{0x3826, 0x04},
|
|
|
|
|
{0x3827, 0x48},
|
|
|
|
|
{0x3829, 0x03},
|
|
|
|
|
{0x3832, 0x00},
|
|
|
|
|
{0x3c80, 0x00},
|
|
|
|
|
{0x3c87, 0x01},
|
|
|
|
|
{0x3c8c, 0x19},
|
|
|
|
|
{0x3c8d, 0x1c},
|
|
|
|
|
{0x3c90, 0x00},
|
|
|
|
|
{0x3c91, 0x00},
|
|
|
|
|
{0x3c92, 0x00},
|
|
|
|
|
{0x3c93, 0x00},
|
|
|
|
|
{0x3c94, 0x40},
|
|
|
|
|
{0x3c95, 0x54},
|
|
|
|
|
{0x3c96, 0x34},
|
|
|
|
|
{0x3c97, 0x04},
|
|
|
|
|
{0x3c98, 0x00},
|
|
|
|
|
{0x3d8c, 0x73},
|
|
|
|
|
{0x3d8d, 0xc0},
|
|
|
|
|
{0x3f00, 0x0b},
|
|
|
|
|
{0x3f03, 0x00},
|
|
|
|
|
{0x4001, 0xe0},
|
|
|
|
|
{0x4008, 0x00},
|
|
|
|
|
{0x4009, 0x05},
|
|
|
|
|
{0x4011, 0xf0},
|
|
|
|
|
{0x4017, 0x08},
|
|
|
|
|
{0x4050, 0x02},
|
|
|
|
|
{0x4051, 0x05},
|
|
|
|
|
{0x4052, 0x00},
|
|
|
|
|
{0x4053, 0x80},
|
|
|
|
|
{0x4054, 0x00},
|
|
|
|
|
{0x4055, 0x80},
|
|
|
|
|
{0x4056, 0x00},
|
|
|
|
|
{0x4057, 0x80},
|
|
|
|
|
{0x4058, 0x00},
|
|
|
|
|
{0x4059, 0x80},
|
|
|
|
|
{0x405e, 0x20},
|
|
|
|
|
{0x4500, 0x07},
|
|
|
|
|
{0x4503, 0x00},
|
|
|
|
|
{0x450a, 0x04},
|
|
|
|
|
{0x4809, 0x04},
|
|
|
|
|
{0x480c, 0x12},
|
|
|
|
|
{0x481f, 0x30},
|
|
|
|
|
{0x4833, 0x10},
|
|
|
|
|
{0x4837, 0x1e},
|
|
|
|
|
{0x4902, 0x02},
|
|
|
|
|
{0x4d00, 0x03},
|
|
|
|
|
{0x4d01, 0xc9},
|
|
|
|
|
{0x4d02, 0xbc},
|
|
|
|
|
{0x4d03, 0xd7},
|
|
|
|
|
{0x4d04, 0xf0},
|
|
|
|
|
{0x4d05, 0xa2},
|
|
|
|
|
{0x5000, 0xfd},
|
|
|
|
|
{0x5001, 0x01},
|
|
|
|
|
{0x5040, 0x39},
|
|
|
|
|
{0x5041, 0x10},
|
|
|
|
|
{0x5042, 0x10},
|
|
|
|
|
{0x5043, 0x84},
|
|
|
|
|
{0x5044, 0x62},
|
|
|
|
|
{0x5180, 0x00},
|
|
|
|
|
{0x5181, 0x10},
|
|
|
|
|
{0x5182, 0x02},
|
|
|
|
|
{0x5183, 0x0f},
|
|
|
|
|
{0x5200, 0x1b},
|
|
|
|
|
{0x520b, 0x07},
|
|
|
|
|
{0x520c, 0x0f},
|
|
|
|
|
{0x5300, 0x04},
|
|
|
|
|
{0x5301, 0x0c},
|
|
|
|
|
{0x5302, 0x0c},
|
|
|
|
|
{0x5303, 0x0f},
|
|
|
|
|
{0x5304, 0x00},
|
|
|
|
|
{0x5305, 0x70},
|
|
|
|
|
{0x5306, 0x00},
|
|
|
|
|
{0x5307, 0x80},
|
|
|
|
|
{0x5308, 0x00},
|
|
|
|
|
{0x5309, 0xa5},
|
|
|
|
|
{0x530a, 0x00},
|
|
|
|
|
{0x530b, 0xd3},
|
|
|
|
|
{0x530c, 0x00},
|
|
|
|
|
{0x530d, 0xf0},
|
|
|
|
|
{0x530e, 0x01},
|
|
|
|
|
{0x530f, 0x10},
|
|
|
|
|
{0x5310, 0x01},
|
|
|
|
|
{0x5311, 0x20},
|
|
|
|
|
{0x5312, 0x01},
|
|
|
|
|
{0x5313, 0x20},
|
|
|
|
|
{0x5314, 0x01},
|
|
|
|
|
{0x5315, 0x20},
|
|
|
|
|
{0x5316, 0x08},
|
|
|
|
|
{0x5317, 0x08},
|
|
|
|
|
{0x5318, 0x10},
|
|
|
|
|
{0x5319, 0x88},
|
|
|
|
|
{0x531a, 0x88},
|
|
|
|
|
{0x531b, 0xa9},
|
|
|
|
|
{0x531c, 0xaa},
|
|
|
|
|
{0x531d, 0x0a},
|
|
|
|
|
{0x5405, 0x02},
|
|
|
|
|
{0x5406, 0x67},
|
|
|
|
|
{0x5407, 0x01},
|
|
|
|
|
{0x5408, 0x4a},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const char * const ov13858_test_pattern_menu[] = {
|
|
|
|
|
"Disabled",
|
|
|
|
|
"Vertical Color Bar Type 1",
|
|
|
|
|
"Vertical Color Bar Type 2",
|
|
|
|
|
"Vertical Color Bar Type 3",
|
|
|
|
|
"Vertical Color Bar Type 4"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Configurations for supported link frequencies */
|
|
|
|
|
#define OV13858_NUM_OF_LINK_FREQS 2
|
2017-07-29 07:00:39 +00:00
|
|
|
#define OV13858_LINK_FREQ_540MHZ 540000000ULL
|
|
|
|
|
#define OV13858_LINK_FREQ_270MHZ 270000000ULL
|
2017-06-13 22:06:16 +00:00
|
|
|
#define OV13858_LINK_FREQ_INDEX_0 0
|
|
|
|
|
#define OV13858_LINK_FREQ_INDEX_1 1
|
|
|
|
|
|
2017-09-18 20:43:40 +00:00
|
|
|
/*
|
|
|
|
|
* pixel_rate = link_freq * data-rate * nr_of_lanes / bits_per_sample
|
|
|
|
|
* data rate => double data rate; number of lanes => 4; bits per pixel => 10
|
|
|
|
|
*/
|
2017-09-21 14:24:53 +00:00
|
|
|
static u64 link_freq_to_pixel_rate(u64 f)
|
|
|
|
|
{
|
|
|
|
|
f *= 2 * 4;
|
|
|
|
|
do_div(f, 10);
|
|
|
|
|
|
|
|
|
|
return f;
|
|
|
|
|
}
|
2017-09-18 20:43:40 +00:00
|
|
|
|
2017-06-13 22:06:16 +00:00
|
|
|
/* Menu items for LINK_FREQ V4L2 control */
|
2017-06-20 11:19:56 +00:00
|
|
|
static const s64 link_freq_menu_items[OV13858_NUM_OF_LINK_FREQS] = {
|
2017-07-29 07:00:39 +00:00
|
|
|
OV13858_LINK_FREQ_540MHZ,
|
|
|
|
|
OV13858_LINK_FREQ_270MHZ
|
2017-06-13 22:06:16 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Link frequency configs */
|
|
|
|
|
static const struct ov13858_link_freq_config
|
|
|
|
|
link_freq_configs[OV13858_NUM_OF_LINK_FREQS] = {
|
|
|
|
|
{
|
2017-07-29 07:00:39 +00:00
|
|
|
.pixels_per_line = OV13858_PPL_540MHZ,
|
2017-06-13 22:06:16 +00:00
|
|
|
.reg_list = {
|
|
|
|
|
.num_of_regs = ARRAY_SIZE(mipi_data_rate_1080mbps),
|
|
|
|
|
.regs = mipi_data_rate_1080mbps,
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
2017-07-29 07:00:39 +00:00
|
|
|
.pixels_per_line = OV13858_PPL_270MHZ,
|
2017-06-13 22:06:16 +00:00
|
|
|
.reg_list = {
|
|
|
|
|
.num_of_regs = ARRAY_SIZE(mipi_data_rate_540mbps),
|
|
|
|
|
.regs = mipi_data_rate_540mbps,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Mode configs */
|
|
|
|
|
static const struct ov13858_mode supported_modes[] = {
|
|
|
|
|
{
|
|
|
|
|
.width = 4224,
|
|
|
|
|
.height = 3136,
|
2017-08-18 04:29:38 +00:00
|
|
|
.vts_def = OV13858_VTS_30FPS,
|
|
|
|
|
.vts_min = OV13858_VTS_30FPS,
|
2017-06-13 22:06:16 +00:00
|
|
|
.reg_list = {
|
|
|
|
|
.num_of_regs = ARRAY_SIZE(mode_4224x3136_regs),
|
|
|
|
|
.regs = mode_4224x3136_regs,
|
|
|
|
|
},
|
|
|
|
|
.link_freq_index = OV13858_LINK_FREQ_INDEX_0,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.width = 2112,
|
|
|
|
|
.height = 1568,
|
2017-08-18 04:29:38 +00:00
|
|
|
.vts_def = OV13858_VTS_30FPS,
|
|
|
|
|
.vts_min = 1608,
|
2017-06-13 22:06:16 +00:00
|
|
|
.reg_list = {
|
|
|
|
|
.num_of_regs = ARRAY_SIZE(mode_2112x1568_regs),
|
|
|
|
|
.regs = mode_2112x1568_regs,
|
|
|
|
|
},
|
|
|
|
|
.link_freq_index = OV13858_LINK_FREQ_INDEX_1,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.width = 2112,
|
|
|
|
|
.height = 1188,
|
2017-08-18 04:29:38 +00:00
|
|
|
.vts_def = OV13858_VTS_30FPS,
|
|
|
|
|
.vts_min = 1608,
|
2017-06-13 22:06:16 +00:00
|
|
|
.reg_list = {
|
|
|
|
|
.num_of_regs = ARRAY_SIZE(mode_2112x1188_regs),
|
|
|
|
|
.regs = mode_2112x1188_regs,
|
|
|
|
|
},
|
|
|
|
|
.link_freq_index = OV13858_LINK_FREQ_INDEX_1,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.width = 1056,
|
|
|
|
|
.height = 784,
|
2017-08-18 04:29:38 +00:00
|
|
|
.vts_def = OV13858_VTS_30FPS,
|
|
|
|
|
.vts_min = 804,
|
2017-06-13 22:06:16 +00:00
|
|
|
.reg_list = {
|
|
|
|
|
.num_of_regs = ARRAY_SIZE(mode_1056x784_regs),
|
|
|
|
|
.regs = mode_1056x784_regs,
|
|
|
|
|
},
|
|
|
|
|
.link_freq_index = OV13858_LINK_FREQ_INDEX_1,
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ov13858 {
|
|
|
|
|
struct v4l2_subdev sd;
|
|
|
|
|
struct media_pad pad;
|
|
|
|
|
|
|
|
|
|
struct v4l2_ctrl_handler ctrl_handler;
|
|
|
|
|
/* V4L2 Controls */
|
|
|
|
|
struct v4l2_ctrl *link_freq;
|
|
|
|
|
struct v4l2_ctrl *pixel_rate;
|
|
|
|
|
struct v4l2_ctrl *vblank;
|
|
|
|
|
struct v4l2_ctrl *hblank;
|
|
|
|
|
struct v4l2_ctrl *exposure;
|
|
|
|
|
|
|
|
|
|
/* Current mode */
|
|
|
|
|
const struct ov13858_mode *cur_mode;
|
|
|
|
|
|
|
|
|
|
/* Mutex for serialized access */
|
|
|
|
|
struct mutex mutex;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define to_ov13858(_sd) container_of(_sd, struct ov13858, sd)
|
|
|
|
|
|
|
|
|
|
/* Read registers up to 4 at a time */
|
2018-02-23 08:15:42 +00:00
|
|
|
static int ov13858_read_reg(struct ov13858 *ov13858, u16 reg, u32 len,
|
|
|
|
|
u32 *val)
|
2017-06-13 22:06:16 +00:00
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
|
|
|
|
struct i2c_msg msgs[2];
|
|
|
|
|
u8 *data_be_p;
|
|
|
|
|
int ret;
|
2018-02-23 08:15:42 +00:00
|
|
|
__be32 data_be = 0;
|
|
|
|
|
__be16 reg_addr_be = cpu_to_be16(reg);
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
if (len > 4)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
data_be_p = (u8 *)&data_be;
|
|
|
|
|
/* Write register address */
|
|
|
|
|
msgs[0].addr = client->addr;
|
|
|
|
|
msgs[0].flags = 0;
|
|
|
|
|
msgs[0].len = 2;
|
|
|
|
|
msgs[0].buf = (u8 *)®_addr_be;
|
|
|
|
|
|
|
|
|
|
/* Read data from register */
|
|
|
|
|
msgs[1].addr = client->addr;
|
|
|
|
|
msgs[1].flags = I2C_M_RD;
|
|
|
|
|
msgs[1].len = len;
|
|
|
|
|
msgs[1].buf = &data_be_p[4 - len];
|
|
|
|
|
|
|
|
|
|
ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
|
|
|
|
if (ret != ARRAY_SIZE(msgs))
|
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
|
|
*val = be32_to_cpu(data_be);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write registers up to 4 at a time */
|
2018-02-23 08:15:42 +00:00
|
|
|
static int ov13858_write_reg(struct ov13858 *ov13858, u16 reg, u32 len,
|
|
|
|
|
u32 __val)
|
2017-06-13 22:06:16 +00:00
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
|
|
|
|
int buf_i, val_i;
|
|
|
|
|
u8 buf[6], *val_p;
|
2018-02-23 08:15:42 +00:00
|
|
|
__be32 val;
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
if (len > 4)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
buf[0] = reg >> 8;
|
|
|
|
|
buf[1] = reg & 0xff;
|
|
|
|
|
|
2018-02-23 08:15:42 +00:00
|
|
|
val = cpu_to_be32(__val);
|
2017-06-13 22:06:16 +00:00
|
|
|
val_p = (u8 *)&val;
|
|
|
|
|
buf_i = 2;
|
|
|
|
|
val_i = 4 - len;
|
|
|
|
|
|
|
|
|
|
while (val_i < 4)
|
|
|
|
|
buf[buf_i++] = val_p[val_i++];
|
|
|
|
|
|
|
|
|
|
if (i2c_master_send(client, buf, len + 2) != len + 2)
|
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write a list of registers */
|
|
|
|
|
static int ov13858_write_regs(struct ov13858 *ov13858,
|
|
|
|
|
const struct ov13858_reg *regs, u32 len)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
|
|
|
|
int ret;
|
|
|
|
|
u32 i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
ret = ov13858_write_reg(ov13858, regs[i].address, 1,
|
|
|
|
|
regs[i].val);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err_ratelimited(
|
|
|
|
|
&client->dev,
|
|
|
|
|
"Failed to write reg 0x%4.4x. error = %d\n",
|
|
|
|
|
regs[i].address, ret);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_write_reg_list(struct ov13858 *ov13858,
|
|
|
|
|
const struct ov13858_reg_list *r_list)
|
|
|
|
|
{
|
|
|
|
|
return ov13858_write_regs(ov13858, r_list->regs, r_list->num_of_regs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Open sub-device */
|
|
|
|
|
static int ov13858_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
|
|
|
|
|
{
|
|
|
|
|
struct ov13858 *ov13858 = to_ov13858(sd);
|
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 07:37:10 +00:00
|
|
|
struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_state_get_format(fh->state,
|
|
|
|
|
0);
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
mutex_lock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
/* Initialize try_fmt */
|
|
|
|
|
try_fmt->width = ov13858->cur_mode->width;
|
|
|
|
|
try_fmt->height = ov13858->cur_mode->height;
|
|
|
|
|
try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
|
|
|
|
|
try_fmt->field = V4L2_FIELD_NONE;
|
|
|
|
|
|
|
|
|
|
/* No crop or compose */
|
|
|
|
|
mutex_unlock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_update_digital_gain(struct ov13858 *ov13858, u32 d_gain)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2017-07-28 23:21:03 +00:00
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_B_MWB_GAIN,
|
|
|
|
|
OV13858_REG_VALUE_16BIT, d_gain);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
2017-06-13 22:06:16 +00:00
|
|
|
|
2017-07-28 23:21:03 +00:00
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_G_MWB_GAIN,
|
|
|
|
|
OV13858_REG_VALUE_16BIT, d_gain);
|
2017-06-13 22:06:16 +00:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2017-07-28 23:21:03 +00:00
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_R_MWB_GAIN,
|
|
|
|
|
OV13858_REG_VALUE_16BIT, d_gain);
|
2017-06-13 22:06:16 +00:00
|
|
|
|
2017-07-28 23:21:03 +00:00
|
|
|
return ret;
|
2017-06-13 22:06:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_enable_test_pattern(struct ov13858 *ov13858, u32 pattern)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
|
|
ret = ov13858_read_reg(ov13858, OV13858_REG_TEST_PATTERN,
|
|
|
|
|
OV13858_REG_VALUE_08BIT, &val);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (pattern) {
|
|
|
|
|
val &= OV13858_TEST_PATTERN_MASK;
|
|
|
|
|
val |= (pattern - 1) | OV13858_TEST_PATTERN_ENABLE;
|
|
|
|
|
} else {
|
|
|
|
|
val &= ~OV13858_TEST_PATTERN_ENABLE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ov13858_write_reg(ov13858, OV13858_REG_TEST_PATTERN,
|
|
|
|
|
OV13858_REG_VALUE_08BIT, val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_set_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
|
|
{
|
|
|
|
|
struct ov13858 *ov13858 = container_of(ctrl->handler,
|
|
|
|
|
struct ov13858, ctrl_handler);
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
|
|
|
|
s64 max;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
/* Propagate change of current control to all related controls */
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
|
case V4L2_CID_VBLANK:
|
|
|
|
|
/* Update max exposure while meeting expected vblanking */
|
|
|
|
|
max = ov13858->cur_mode->height + ctrl->val - 8;
|
|
|
|
|
__v4l2_ctrl_modify_range(ov13858->exposure,
|
|
|
|
|
ov13858->exposure->minimum,
|
|
|
|
|
max, ov13858->exposure->step, max);
|
|
|
|
|
break;
|
2019-06-01 15:27:34 +00:00
|
|
|
}
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Applying V4L2 control value only happens
|
|
|
|
|
* when power is up for streaming
|
|
|
|
|
*/
|
2018-07-30 11:44:43 +00:00
|
|
|
if (!pm_runtime_get_if_in_use(&client->dev))
|
2017-06-13 22:06:16 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
|
case V4L2_CID_ANALOGUE_GAIN:
|
|
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_ANALOG_GAIN,
|
|
|
|
|
OV13858_REG_VALUE_16BIT, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_DIGITAL_GAIN:
|
|
|
|
|
ret = ov13858_update_digital_gain(ov13858, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_EXPOSURE:
|
|
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_EXPOSURE,
|
|
|
|
|
OV13858_REG_VALUE_24BIT,
|
|
|
|
|
ctrl->val << 4);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_VBLANK:
|
|
|
|
|
/* Update VTS that meets expected vertical blanking */
|
|
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_VTS,
|
|
|
|
|
OV13858_REG_VALUE_16BIT,
|
|
|
|
|
ov13858->cur_mode->height
|
|
|
|
|
+ ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
case V4L2_CID_TEST_PATTERN:
|
|
|
|
|
ret = ov13858_enable_test_pattern(ov13858, ctrl->val);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
dev_info(&client->dev,
|
|
|
|
|
"ctrl(id:0x%x,val:0x%x) is not handled\n",
|
|
|
|
|
ctrl->id, ctrl->val);
|
|
|
|
|
break;
|
2019-06-01 15:27:34 +00:00
|
|
|
}
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
pm_runtime_put(&client->dev);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_ctrl_ops ov13858_ctrl_ops = {
|
|
|
|
|
.s_ctrl = ov13858_set_ctrl,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int ov13858_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 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-06-13 22:06:16 +00:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
|
|
|
{
|
|
|
|
|
/* Only one bayer order(GRBG) is supported */
|
|
|
|
|
if (code->index > 0)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
code->code = MEDIA_BUS_FMT_SGRBG10_1X10;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_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 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-06-13 22:06:16 +00:00
|
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
|
|
|
{
|
|
|
|
|
if (fse->index >= ARRAY_SIZE(supported_modes))
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
if (fse->code != MEDIA_BUS_FMT_SGRBG10_1X10)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
fse->min_width = supported_modes[fse->index].width;
|
|
|
|
|
fse->max_width = fse->min_width;
|
|
|
|
|
fse->min_height = supported_modes[fse->index].height;
|
|
|
|
|
fse->max_height = fse->min_height;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ov13858_update_pad_format(const struct ov13858_mode *mode,
|
|
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
|
{
|
|
|
|
|
fmt->format.width = mode->width;
|
|
|
|
|
fmt->format.height = mode->height;
|
|
|
|
|
fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
|
|
|
|
|
fmt->format.field = V4L2_FIELD_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-06-13 22:06:16 +00:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
|
{
|
|
|
|
|
struct v4l2_mbus_framefmt *framefmt;
|
|
|
|
|
|
|
|
|
|
if (fmt->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 07:37:10 +00:00
|
|
|
framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
|
2017-06-13 22:06:16 +00:00
|
|
|
fmt->format = *framefmt;
|
|
|
|
|
} else {
|
|
|
|
|
ov13858_update_pad_format(ov13858->cur_mode, fmt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_get_pad_format(struct v4l2_subdev *sd,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-06-13 22:06:16 +00:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
|
{
|
|
|
|
|
struct ov13858 *ov13858 = to_ov13858(sd);
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&ov13858->mutex);
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 14:55:58 +00:00
|
|
|
ret = ov13858_do_get_pad_format(ov13858, sd_state, fmt);
|
2017-06-13 22:06:16 +00:00
|
|
|
mutex_unlock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ov13858_set_pad_format(struct v4l2_subdev *sd,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 14:55:58 +00:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2017-06-13 22:06:16 +00:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
|
{
|
|
|
|
|
struct ov13858 *ov13858 = to_ov13858(sd);
|
|
|
|
|
const struct ov13858_mode *mode;
|
|
|
|
|
struct v4l2_mbus_framefmt *framefmt;
|
2017-07-27 07:28:05 +00:00
|
|
|
s32 vblank_def;
|
2017-08-18 04:29:38 +00:00
|
|
|
s32 vblank_min;
|
2017-06-13 22:06:16 +00:00
|
|
|
s64 h_blank;
|
2017-09-18 20:43:40 +00:00
|
|
|
s64 pixel_rate;
|
|
|
|
|
s64 link_freq;
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
mutex_lock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
/* Only one raw bayer(GRBG) order is supported */
|
|
|
|
|
if (fmt->format.code != MEDIA_BUS_FMT_SGRBG10_1X10)
|
|
|
|
|
fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
|
|
|
|
|
|
2018-03-21 20:29:27 +00:00
|
|
|
mode = v4l2_find_nearest_size(supported_modes,
|
|
|
|
|
ARRAY_SIZE(supported_modes),
|
|
|
|
|
width, height,
|
2018-02-08 11:24:34 +00:00
|
|
|
fmt->format.width, fmt->format.height);
|
2017-06-13 22:06:16 +00:00
|
|
|
ov13858_update_pad_format(mode, fmt);
|
|
|
|
|
if (fmt->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 07:37:10 +00:00
|
|
|
framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
|
2017-06-13 22:06:16 +00:00
|
|
|
*framefmt = fmt->format;
|
|
|
|
|
} else {
|
|
|
|
|
ov13858->cur_mode = mode;
|
|
|
|
|
__v4l2_ctrl_s_ctrl(ov13858->link_freq, mode->link_freq_index);
|
2017-09-18 20:43:40 +00:00
|
|
|
link_freq = link_freq_menu_items[mode->link_freq_index];
|
2017-09-21 14:24:53 +00:00
|
|
|
pixel_rate = link_freq_to_pixel_rate(link_freq);
|
2017-09-18 20:43:40 +00:00
|
|
|
__v4l2_ctrl_s_ctrl_int64(ov13858->pixel_rate, pixel_rate);
|
|
|
|
|
|
2017-06-13 22:06:16 +00:00
|
|
|
/* Update limits and set FPS to default */
|
2017-08-18 04:29:38 +00:00
|
|
|
vblank_def = ov13858->cur_mode->vts_def -
|
|
|
|
|
ov13858->cur_mode->height;
|
|
|
|
|
vblank_min = ov13858->cur_mode->vts_min -
|
|
|
|
|
ov13858->cur_mode->height;
|
2017-06-13 22:06:16 +00:00
|
|
|
__v4l2_ctrl_modify_range(
|
2017-08-18 04:29:38 +00:00
|
|
|
ov13858->vblank, vblank_min,
|
2017-06-13 22:06:16 +00:00
|
|
|
OV13858_VTS_MAX - ov13858->cur_mode->height, 1,
|
2017-07-27 07:28:05 +00:00
|
|
|
vblank_def);
|
|
|
|
|
__v4l2_ctrl_s_ctrl(ov13858->vblank, vblank_def);
|
2017-06-13 22:06:16 +00:00
|
|
|
h_blank =
|
|
|
|
|
link_freq_configs[mode->link_freq_index].pixels_per_line
|
|
|
|
|
- ov13858->cur_mode->width;
|
|
|
|
|
__v4l2_ctrl_modify_range(ov13858->hblank, h_blank,
|
|
|
|
|
h_blank, 1, h_blank);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_unlock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_get_skip_frames(struct v4l2_subdev *sd, u32 *frames)
|
|
|
|
|
{
|
|
|
|
|
*frames = OV13858_NUM_OF_SKIP_FRAMES;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Start streaming */
|
|
|
|
|
static int ov13858_start_streaming(struct ov13858 *ov13858)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
|
|
|
|
const struct ov13858_reg_list *reg_list;
|
|
|
|
|
int ret, link_freq_index;
|
|
|
|
|
|
|
|
|
|
/* Get out of from software reset */
|
|
|
|
|
ret = ov13858_write_reg(ov13858, OV13858_REG_SOFTWARE_RST,
|
|
|
|
|
OV13858_REG_VALUE_08BIT, OV13858_SOFTWARE_RST);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(&client->dev, "%s failed to set powerup registers\n",
|
|
|
|
|
__func__);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Setup PLL */
|
|
|
|
|
link_freq_index = ov13858->cur_mode->link_freq_index;
|
|
|
|
|
reg_list = &link_freq_configs[link_freq_index].reg_list;
|
|
|
|
|
ret = ov13858_write_reg_list(ov13858, reg_list);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(&client->dev, "%s failed to set plls\n", __func__);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Apply default values of current mode */
|
|
|
|
|
reg_list = &ov13858->cur_mode->reg_list;
|
|
|
|
|
ret = ov13858_write_reg_list(ov13858, reg_list);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(&client->dev, "%s failed to set mode\n", __func__);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Apply customized values from user */
|
|
|
|
|
ret = __v4l2_ctrl_handler_setup(ov13858->sd.ctrl_handler);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return ov13858_write_reg(ov13858, OV13858_REG_MODE_SELECT,
|
|
|
|
|
OV13858_REG_VALUE_08BIT,
|
|
|
|
|
OV13858_MODE_STREAMING);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Stop streaming */
|
|
|
|
|
static int ov13858_stop_streaming(struct ov13858 *ov13858)
|
|
|
|
|
{
|
|
|
|
|
return ov13858_write_reg(ov13858, OV13858_REG_MODE_SELECT,
|
|
|
|
|
OV13858_REG_VALUE_08BIT, OV13858_MODE_STANDBY);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ov13858_set_stream(struct v4l2_subdev *sd, int enable)
|
|
|
|
|
{
|
|
|
|
|
struct ov13858 *ov13858 = to_ov13858(sd);
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
if (enable) {
|
2021-04-23 15:19:14 +00:00
|
|
|
ret = pm_runtime_resume_and_get(&client->dev);
|
|
|
|
|
if (ret < 0)
|
2017-06-13 22:06:16 +00:00
|
|
|
goto err_unlock;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Apply default & customized values
|
|
|
|
|
* and then start streaming.
|
|
|
|
|
*/
|
|
|
|
|
ret = ov13858_start_streaming(ov13858);
|
|
|
|
|
if (ret)
|
|
|
|
|
goto err_rpm_put;
|
|
|
|
|
} else {
|
|
|
|
|
ov13858_stop_streaming(ov13858);
|
|
|
|
|
pm_runtime_put(&client->dev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_unlock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
err_rpm_put:
|
|
|
|
|
pm_runtime_put(&client->dev);
|
|
|
|
|
err_unlock:
|
|
|
|
|
mutex_unlock(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Verify chip ID */
|
|
|
|
|
static int ov13858_identify_module(struct ov13858 *ov13858)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
|
|
|
|
int ret;
|
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
|
|
ret = ov13858_read_reg(ov13858, OV13858_REG_CHIP_ID,
|
|
|
|
|
OV13858_REG_VALUE_24BIT, &val);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (val != OV13858_CHIP_ID) {
|
|
|
|
|
dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
|
|
|
|
|
OV13858_CHIP_ID, val);
|
|
|
|
|
return -EIO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2021-10-06 22:26:24 +00:00
|
|
|
static const struct v4l2_subdev_core_ops ov13858_core_ops = {
|
|
|
|
|
.log_status = v4l2_ctrl_subdev_log_status,
|
|
|
|
|
.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
|
|
|
|
|
.unsubscribe_event = v4l2_event_subdev_unsubscribe,
|
|
|
|
|
};
|
|
|
|
|
|
2017-06-13 22:06:16 +00:00
|
|
|
static const struct v4l2_subdev_video_ops ov13858_video_ops = {
|
|
|
|
|
.s_stream = ov13858_set_stream,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_pad_ops ov13858_pad_ops = {
|
|
|
|
|
.enum_mbus_code = ov13858_enum_mbus_code,
|
|
|
|
|
.get_fmt = ov13858_get_pad_format,
|
|
|
|
|
.set_fmt = ov13858_set_pad_format,
|
|
|
|
|
.enum_frame_size = ov13858_enum_frame_size,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_sensor_ops ov13858_sensor_ops = {
|
|
|
|
|
.g_skip_frames = ov13858_get_skip_frames,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_ops ov13858_subdev_ops = {
|
2021-10-06 22:26:24 +00:00
|
|
|
.core = &ov13858_core_ops,
|
2017-06-13 22:06:16 +00:00
|
|
|
.video = &ov13858_video_ops,
|
|
|
|
|
.pad = &ov13858_pad_ops,
|
|
|
|
|
.sensor = &ov13858_sensor_ops,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct media_entity_operations ov13858_subdev_entity_ops = {
|
|
|
|
|
.link_validate = v4l2_subdev_link_validate,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_internal_ops ov13858_internal_ops = {
|
|
|
|
|
.open = ov13858_open,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Initialize control handlers */
|
|
|
|
|
static int ov13858_init_controls(struct ov13858 *ov13858)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
|
2020-05-09 09:04:54 +00:00
|
|
|
struct v4l2_fwnode_device_properties props;
|
2017-06-13 22:06:16 +00:00
|
|
|
struct v4l2_ctrl_handler *ctrl_hdlr;
|
2017-07-27 07:44:19 +00:00
|
|
|
s64 exposure_max;
|
2017-08-18 04:29:38 +00:00
|
|
|
s64 vblank_def;
|
|
|
|
|
s64 vblank_min;
|
2017-09-18 20:43:40 +00:00
|
|
|
s64 hblank;
|
|
|
|
|
s64 pixel_rate_min;
|
|
|
|
|
s64 pixel_rate_max;
|
|
|
|
|
const struct ov13858_mode *mode;
|
2017-06-13 22:06:16 +00:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ctrl_hdlr = &ov13858->ctrl_handler;
|
2020-05-09 09:04:54 +00:00
|
|
|
ret = v4l2_ctrl_handler_init(ctrl_hdlr, 10);
|
2017-06-13 22:06:16 +00:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
mutex_init(&ov13858->mutex);
|
|
|
|
|
ctrl_hdlr->lock = &ov13858->mutex;
|
|
|
|
|
ov13858->link_freq = v4l2_ctrl_new_int_menu(ctrl_hdlr,
|
|
|
|
|
&ov13858_ctrl_ops,
|
|
|
|
|
V4L2_CID_LINK_FREQ,
|
|
|
|
|
OV13858_NUM_OF_LINK_FREQS - 1,
|
|
|
|
|
0,
|
|
|
|
|
link_freq_menu_items);
|
2018-10-26 15:34:30 +00:00
|
|
|
if (ov13858->link_freq)
|
|
|
|
|
ov13858->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
2017-06-13 22:06:16 +00:00
|
|
|
|
2017-09-21 14:24:53 +00:00
|
|
|
pixel_rate_max = link_freq_to_pixel_rate(link_freq_menu_items[0]);
|
|
|
|
|
pixel_rate_min = link_freq_to_pixel_rate(link_freq_menu_items[1]);
|
2017-06-13 22:06:16 +00:00
|
|
|
/* By default, PIXEL_RATE is read only */
|
|
|
|
|
ov13858->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &ov13858_ctrl_ops,
|
2017-09-18 20:43:40 +00:00
|
|
|
V4L2_CID_PIXEL_RATE,
|
|
|
|
|
pixel_rate_min, pixel_rate_max,
|
|
|
|
|
1, pixel_rate_max);
|
2017-06-13 22:06:16 +00:00
|
|
|
|
2017-09-18 20:43:40 +00:00
|
|
|
mode = ov13858->cur_mode;
|
|
|
|
|
vblank_def = mode->vts_def - mode->height;
|
|
|
|
|
vblank_min = mode->vts_min - mode->height;
|
2017-06-13 22:06:16 +00:00
|
|
|
ov13858->vblank = v4l2_ctrl_new_std(
|
|
|
|
|
ctrl_hdlr, &ov13858_ctrl_ops, V4L2_CID_VBLANK,
|
2017-09-18 20:43:40 +00:00
|
|
|
vblank_min, OV13858_VTS_MAX - mode->height, 1,
|
2017-08-18 04:29:38 +00:00
|
|
|
vblank_def);
|
2017-06-13 22:06:16 +00:00
|
|
|
|
2017-09-18 20:43:40 +00:00
|
|
|
hblank = link_freq_configs[mode->link_freq_index].pixels_per_line -
|
|
|
|
|
mode->width;
|
2017-06-13 22:06:16 +00:00
|
|
|
ov13858->hblank = v4l2_ctrl_new_std(
|
|
|
|
|
ctrl_hdlr, &ov13858_ctrl_ops, V4L2_CID_HBLANK,
|
2017-09-18 20:43:40 +00:00
|
|
|
hblank, hblank, 1, hblank);
|
2018-10-26 15:34:30 +00:00
|
|
|
if (ov13858->hblank)
|
|
|
|
|
ov13858->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
2017-06-13 22:06:16 +00:00
|
|
|
|
2017-09-18 20:43:40 +00:00
|
|
|
exposure_max = mode->vts_def - 8;
|
2017-06-13 22:06:16 +00:00
|
|
|
ov13858->exposure = v4l2_ctrl_new_std(
|
|
|
|
|
ctrl_hdlr, &ov13858_ctrl_ops,
|
|
|
|
|
V4L2_CID_EXPOSURE, OV13858_EXPOSURE_MIN,
|
2017-07-27 07:44:19 +00:00
|
|
|
exposure_max, OV13858_EXPOSURE_STEP,
|
2017-06-13 22:06:16 +00:00
|
|
|
OV13858_EXPOSURE_DEFAULT);
|
|
|
|
|
|
|
|
|
|
v4l2_ctrl_new_std(ctrl_hdlr, &ov13858_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
|
|
|
|
|
OV13858_ANA_GAIN_MIN, OV13858_ANA_GAIN_MAX,
|
|
|
|
|
OV13858_ANA_GAIN_STEP, OV13858_ANA_GAIN_DEFAULT);
|
|
|
|
|
|
|
|
|
|
/* Digital gain */
|
|
|
|
|
v4l2_ctrl_new_std(ctrl_hdlr, &ov13858_ctrl_ops, V4L2_CID_DIGITAL_GAIN,
|
|
|
|
|
OV13858_DGTL_GAIN_MIN, OV13858_DGTL_GAIN_MAX,
|
|
|
|
|
OV13858_DGTL_GAIN_STEP, OV13858_DGTL_GAIN_DEFAULT);
|
|
|
|
|
|
|
|
|
|
v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &ov13858_ctrl_ops,
|
|
|
|
|
V4L2_CID_TEST_PATTERN,
|
|
|
|
|
ARRAY_SIZE(ov13858_test_pattern_menu) - 1,
|
|
|
|
|
0, 0, ov13858_test_pattern_menu);
|
|
|
|
|
if (ctrl_hdlr->error) {
|
|
|
|
|
ret = ctrl_hdlr->error;
|
|
|
|
|
dev_err(&client->dev, "%s control init failed (%d)\n",
|
|
|
|
|
__func__, ret);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-09 09:04:54 +00:00
|
|
|
ret = v4l2_fwnode_device_parse(&client->dev, &props);
|
|
|
|
|
if (ret)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &ov13858_ctrl_ops,
|
|
|
|
|
&props);
|
|
|
|
|
if (ret)
|
|
|
|
|
goto error;
|
|
|
|
|
|
2017-06-13 22:06:16 +00:00
|
|
|
ov13858->sd.ctrl_handler = ctrl_hdlr;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
v4l2_ctrl_handler_free(ctrl_hdlr);
|
|
|
|
|
mutex_destroy(&ov13858->mutex);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ov13858_free_controls(struct ov13858 *ov13858)
|
|
|
|
|
{
|
|
|
|
|
v4l2_ctrl_handler_free(ov13858->sd.ctrl_handler);
|
|
|
|
|
mutex_destroy(&ov13858->mutex);
|
|
|
|
|
}
|
|
|
|
|
|
2022-11-18 22:41:31 +00:00
|
|
|
static int ov13858_probe(struct i2c_client *client)
|
2017-06-13 22:06:16 +00:00
|
|
|
{
|
|
|
|
|
struct ov13858 *ov13858;
|
|
|
|
|
int ret;
|
|
|
|
|
u32 val = 0;
|
|
|
|
|
|
|
|
|
|
device_property_read_u32(&client->dev, "clock-frequency", &val);
|
|
|
|
|
if (val != 19200000)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
ov13858 = devm_kzalloc(&client->dev, sizeof(*ov13858), GFP_KERNEL);
|
|
|
|
|
if (!ov13858)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
/* Initialize subdev */
|
|
|
|
|
v4l2_i2c_subdev_init(&ov13858->sd, client, &ov13858_subdev_ops);
|
|
|
|
|
|
|
|
|
|
/* Check module identity */
|
|
|
|
|
ret = ov13858_identify_module(ov13858);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(&client->dev, "failed to find sensor: %d\n", ret);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set default mode to max resolution */
|
|
|
|
|
ov13858->cur_mode = &supported_modes[0];
|
|
|
|
|
|
|
|
|
|
ret = ov13858_init_controls(ov13858);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* Initialize subdev */
|
|
|
|
|
ov13858->sd.internal_ops = &ov13858_internal_ops;
|
2021-10-06 22:26:24 +00:00
|
|
|
ov13858->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
|
|
|
|
|
V4L2_SUBDEV_FL_HAS_EVENTS;
|
2017-06-13 22:06:16 +00:00
|
|
|
ov13858->sd.entity.ops = &ov13858_subdev_entity_ops;
|
|
|
|
|
ov13858->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
|
|
|
|
|
|
|
|
|
|
/* Initialize source pad */
|
|
|
|
|
ov13858->pad.flags = MEDIA_PAD_FL_SOURCE;
|
|
|
|
|
ret = media_entity_pads_init(&ov13858->sd.entity, 1, &ov13858->pad);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
|
|
|
|
|
goto error_handler_free;
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-05 16:42:34 +00:00
|
|
|
ret = v4l2_async_register_subdev_sensor(&ov13858->sd);
|
2017-06-13 22:06:16 +00:00
|
|
|
if (ret < 0)
|
|
|
|
|
goto error_media_entity;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Device is already turned on by i2c-core with ACPI domain PM.
|
|
|
|
|
* Enable runtime PM and turn off the device.
|
|
|
|
|
*/
|
|
|
|
|
pm_runtime_set_active(&client->dev);
|
|
|
|
|
pm_runtime_enable(&client->dev);
|
2018-07-20 20:26:44 +00:00
|
|
|
pm_runtime_idle(&client->dev);
|
2017-06-13 22:06:16 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
error_media_entity:
|
|
|
|
|
media_entity_cleanup(&ov13858->sd.entity);
|
|
|
|
|
|
|
|
|
|
error_handler_free:
|
|
|
|
|
ov13858_free_controls(ov13858);
|
|
|
|
|
dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2022-08-15 08:02:30 +00:00
|
|
|
static void ov13858_remove(struct i2c_client *client)
|
2017-06-13 22:06:16 +00:00
|
|
|
{
|
|
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
|
struct ov13858 *ov13858 = to_ov13858(sd);
|
|
|
|
|
|
|
|
|
|
v4l2_async_unregister_subdev(sd);
|
|
|
|
|
media_entity_cleanup(&sd->entity);
|
|
|
|
|
ov13858_free_controls(ov13858);
|
|
|
|
|
|
|
|
|
|
pm_runtime_disable(&client->dev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct i2c_device_id ov13858_id_table[] = {
|
|
|
|
|
{"ov13858", 0},
|
|
|
|
|
{},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(i2c, ov13858_id_table);
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_ACPI
|
|
|
|
|
static const struct acpi_device_id ov13858_acpi_ids[] = {
|
|
|
|
|
{"OVTID858"},
|
|
|
|
|
{ /* sentinel */ }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(acpi, ov13858_acpi_ids);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static struct i2c_driver ov13858_i2c_driver = {
|
|
|
|
|
.driver = {
|
|
|
|
|
.name = "ov13858",
|
|
|
|
|
.acpi_match_table = ACPI_PTR(ov13858_acpi_ids),
|
|
|
|
|
},
|
2023-05-14 12:04:07 +00:00
|
|
|
.probe = ov13858_probe,
|
2017-06-13 22:06:16 +00:00
|
|
|
.remove = ov13858_remove,
|
|
|
|
|
.id_table = ov13858_id_table,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
module_i2c_driver(ov13858_i2c_driver);
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Kan, Chris <chris.kan@intel.com>");
|
2023-06-09 09:19:28 +00:00
|
|
|
MODULE_AUTHOR("Rapolu, Chiranjeevi");
|
2021-12-14 16:13:31 +00:00
|
|
|
MODULE_AUTHOR("Yang, Hyungwoo");
|
2017-06-13 22:06:16 +00:00
|
|
|
MODULE_DESCRIPTION("Omnivision ov13858 sensor driver");
|
|
|
|
|
MODULE_LICENSE("GPL v2");
|