2018-05-02 11:46:08 -04:00
// SPDX-License-Identifier: GPL-2.0
// Copyright (C) 2018 Intel Corporation
# include <linux/acpi.h>
2021-01-27 18:46:35 +01:00
# include <linux/clk.h>
2018-05-02 11:46:08 -04:00
# include <linux/delay.h>
# include <linux/i2c.h>
# include <linux/module.h>
# include <linux/pm_runtime.h>
# include <media/v4l2-ctrls.h>
# include <media/v4l2-device.h>
2023-01-04 13:23:37 +01:00
# include <media/v4l2-fwnode.h>
2018-05-02 11:46:08 -04:00
# include <asm/unaligned.h>
# define IMX258_REG_VALUE_08BIT 1
# define IMX258_REG_VALUE_16BIT 2
# define IMX258_REG_MODE_SELECT 0x0100
# define IMX258_MODE_STANDBY 0x00
# define IMX258_MODE_STREAMING 0x01
/* Chip ID */
# define IMX258_REG_CHIP_ID 0x0016
# define IMX258_CHIP_ID 0x0258
/* V_TIMING internal */
2021-07-23 13:22:32 +02:00
# define IMX258_VTS_30FPS 0x0c50
2018-05-02 11:46:08 -04:00
# define IMX258_VTS_30FPS_2K 0x0638
# define IMX258_VTS_30FPS_VGA 0x034c
# define IMX258_VTS_MAX 0xffff
/*Frame Length Line*/
# define IMX258_FLL_MIN 0x08a6
# define IMX258_FLL_MAX 0xffff
# define IMX258_FLL_STEP 1
# define IMX258_FLL_DEFAULT 0x0c98
/* HBLANK control - read only */
# define IMX258_PPL_DEFAULT 5352
/* Exposure control */
# define IMX258_REG_EXPOSURE 0x0202
# define IMX258_EXPOSURE_MIN 4
# define IMX258_EXPOSURE_STEP 1
# define IMX258_EXPOSURE_DEFAULT 0x640
# define IMX258_EXPOSURE_MAX 65535
/* Analog gain control */
# define IMX258_REG_ANALOG_GAIN 0x0204
# define IMX258_ANA_GAIN_MIN 0
2021-07-23 13:22:33 +02:00
# define IMX258_ANA_GAIN_MAX 480
2018-05-02 11:46:08 -04:00
# define IMX258_ANA_GAIN_STEP 1
# define IMX258_ANA_GAIN_DEFAULT 0x0
/* Digital gain control */
# define IMX258_REG_GR_DIGITAL_GAIN 0x020e
# define IMX258_REG_R_DIGITAL_GAIN 0x0210
# define IMX258_REG_B_DIGITAL_GAIN 0x0212
# define IMX258_REG_GB_DIGITAL_GAIN 0x0214
# define IMX258_DGTL_GAIN_MIN 0
# define IMX258_DGTL_GAIN_MAX 4096 /* Max = 0xFFF */
# define IMX258_DGTL_GAIN_DEFAULT 1024
# define IMX258_DGTL_GAIN_STEP 1
2020-10-05 17:15:58 +02:00
/* HDR control */
# define IMX258_REG_HDR 0x0220
# define IMX258_HDR_ON BIT(0)
# define IMX258_REG_HDR_RATIO 0x0222
# define IMX258_HDR_RATIO_MIN 0
# define IMX258_HDR_RATIO_MAX 5
# define IMX258_HDR_RATIO_STEP 1
# define IMX258_HDR_RATIO_DEFAULT 0x0
2018-05-02 11:46:08 -04:00
/* Test Pattern Control */
# define IMX258_REG_TEST_PATTERN 0x0600
/* Orientation */
# define REG_MIRROR_FLIP_CONTROL 0x0101
# define REG_CONFIG_MIRROR_FLIP 0x03
# define REG_CONFIG_FLIP_TEST_PATTERN 0x02
2021-01-27 18:46:35 +01:00
/* Input clock frequency in Hz */
# define IMX258_INPUT_CLOCK_FREQ 19200000
2018-05-02 11:46:08 -04:00
struct imx258_reg {
u16 address ;
u8 val ;
} ;
struct imx258_reg_list {
u32 num_of_regs ;
const struct imx258_reg * regs ;
} ;
/* Link frequency config */
struct imx258_link_freq_config {
u32 pixels_per_line ;
/* PLL registers for this link frequency */
struct imx258_reg_list reg_list ;
} ;
/* Mode : resolution and related config&values */
struct imx258_mode {
/* Frame width */
u32 width ;
/* Frame height */
u32 height ;
/* V-timing */
u32 vts_def ;
u32 vts_min ;
/* Index of Link frequency config to be used */
u32 link_freq_index ;
/* Default register values */
struct imx258_reg_list reg_list ;
} ;
/* 4208x3118 needs 1267Mbps/lane, 4 lanes */
static const struct imx258_reg mipi_data_rate_1267mbps [ ] = {
{ 0x0301 , 0x05 } ,
{ 0x0303 , 0x02 } ,
{ 0x0305 , 0x03 } ,
{ 0x0306 , 0x00 } ,
{ 0x0307 , 0xC6 } ,
{ 0x0309 , 0x0A } ,
{ 0x030B , 0x01 } ,
{ 0x030D , 0x02 } ,
{ 0x030E , 0x00 } ,
{ 0x030F , 0xD8 } ,
{ 0x0310 , 0x00 } ,
{ 0x0820 , 0x13 } ,
{ 0x0821 , 0x4C } ,
{ 0x0822 , 0xCC } ,
{ 0x0823 , 0xCC } ,
} ;
static const struct imx258_reg mipi_data_rate_640mbps [ ] = {
{ 0x0301 , 0x05 } ,
{ 0x0303 , 0x02 } ,
{ 0x0305 , 0x03 } ,
{ 0x0306 , 0x00 } ,
{ 0x0307 , 0x64 } ,
{ 0x0309 , 0x0A } ,
{ 0x030B , 0x01 } ,
{ 0x030D , 0x02 } ,
{ 0x030E , 0x00 } ,
{ 0x030F , 0xD8 } ,
{ 0x0310 , 0x00 } ,
{ 0x0820 , 0x0A } ,
{ 0x0821 , 0x00 } ,
{ 0x0822 , 0x00 } ,
{ 0x0823 , 0x00 } ,
} ;
static const struct imx258_reg mode_4208x3118_regs [ ] = {
{ 0x0136 , 0x13 } ,
{ 0x0137 , 0x33 } ,
{ 0x3051 , 0x00 } ,
{ 0x3052 , 0x00 } ,
{ 0x4E21 , 0x14 } ,
{ 0x6B11 , 0xCF } ,
{ 0x7FF0 , 0x08 } ,
{ 0x7FF1 , 0x0F } ,
{ 0x7FF2 , 0x08 } ,
{ 0x7FF3 , 0x1B } ,
{ 0x7FF4 , 0x23 } ,
{ 0x7FF5 , 0x60 } ,
{ 0x7FF6 , 0x00 } ,
{ 0x7FF7 , 0x01 } ,
{ 0x7FF8 , 0x00 } ,
{ 0x7FF9 , 0x78 } ,
{ 0x7FFA , 0x00 } ,
{ 0x7FFB , 0x00 } ,
{ 0x7FFC , 0x00 } ,
{ 0x7FFD , 0x00 } ,
{ 0x7FFE , 0x00 } ,
{ 0x7FFF , 0x03 } ,
{ 0x7F76 , 0x03 } ,
{ 0x7F77 , 0xFE } ,
{ 0x7FA8 , 0x03 } ,
{ 0x7FA9 , 0xFE } ,
{ 0x7B24 , 0x81 } ,
{ 0x7B25 , 0x00 } ,
{ 0x6564 , 0x07 } ,
{ 0x6B0D , 0x41 } ,
{ 0x653D , 0x04 } ,
{ 0x6B05 , 0x8C } ,
{ 0x6B06 , 0xF9 } ,
{ 0x6B08 , 0x65 } ,
{ 0x6B09 , 0xFC } ,
{ 0x6B0A , 0xCF } ,
{ 0x6B0B , 0xD2 } ,
{ 0x6700 , 0x0E } ,
{ 0x6707 , 0x0E } ,
{ 0x9104 , 0x00 } ,
{ 0x4648 , 0x7F } ,
{ 0x7420 , 0x00 } ,
{ 0x7421 , 0x1C } ,
{ 0x7422 , 0x00 } ,
{ 0x7423 , 0xD7 } ,
{ 0x5F04 , 0x00 } ,
{ 0x5F05 , 0xED } ,
{ 0x0112 , 0x0A } ,
{ 0x0113 , 0x0A } ,
{ 0x0114 , 0x03 } ,
{ 0x0342 , 0x14 } ,
{ 0x0343 , 0xE8 } ,
{ 0x0340 , 0x0C } ,
{ 0x0341 , 0x50 } ,
{ 0x0344 , 0x00 } ,
{ 0x0345 , 0x00 } ,
{ 0x0346 , 0x00 } ,
{ 0x0347 , 0x00 } ,
{ 0x0348 , 0x10 } ,
{ 0x0349 , 0x6F } ,
{ 0x034A , 0x0C } ,
{ 0x034B , 0x2E } ,
{ 0x0381 , 0x01 } ,
{ 0x0383 , 0x01 } ,
{ 0x0385 , 0x01 } ,
{ 0x0387 , 0x01 } ,
{ 0x0900 , 0x00 } ,
{ 0x0901 , 0x11 } ,
{ 0x0401 , 0x00 } ,
{ 0x0404 , 0x00 } ,
{ 0x0405 , 0x10 } ,
{ 0x0408 , 0x00 } ,
{ 0x0409 , 0x00 } ,
{ 0x040A , 0x00 } ,
{ 0x040B , 0x00 } ,
{ 0x040C , 0x10 } ,
{ 0x040D , 0x70 } ,
{ 0x040E , 0x0C } ,
{ 0x040F , 0x30 } ,
{ 0x3038 , 0x00 } ,
{ 0x303A , 0x00 } ,
{ 0x303B , 0x10 } ,
{ 0x300D , 0x00 } ,
{ 0x034C , 0x10 } ,
{ 0x034D , 0x70 } ,
{ 0x034E , 0x0C } ,
{ 0x034F , 0x30 } ,
{ 0x0350 , 0x01 } ,
{ 0x0202 , 0x0C } ,
{ 0x0203 , 0x46 } ,
{ 0x0204 , 0x00 } ,
{ 0x0205 , 0x00 } ,
{ 0x020E , 0x01 } ,
{ 0x020F , 0x00 } ,
{ 0x0210 , 0x01 } ,
{ 0x0211 , 0x00 } ,
{ 0x0212 , 0x01 } ,
{ 0x0213 , 0x00 } ,
{ 0x0214 , 0x01 } ,
{ 0x0215 , 0x00 } ,
{ 0x7BCD , 0x00 } ,
{ 0x94DC , 0x20 } ,
{ 0x94DD , 0x20 } ,
{ 0x94DE , 0x20 } ,
{ 0x95DC , 0x20 } ,
{ 0x95DD , 0x20 } ,
{ 0x95DE , 0x20 } ,
{ 0x7FB0 , 0x00 } ,
{ 0x9010 , 0x3E } ,
{ 0x9419 , 0x50 } ,
{ 0x941B , 0x50 } ,
{ 0x9519 , 0x50 } ,
{ 0x951B , 0x50 } ,
{ 0x3030 , 0x00 } ,
{ 0x3032 , 0x00 } ,
{ 0x0220 , 0x00 } ,
} ;
static const struct imx258_reg mode_2104_1560_regs [ ] = {
{ 0x0136 , 0x13 } ,
{ 0x0137 , 0x33 } ,
{ 0x3051 , 0x00 } ,
{ 0x3052 , 0x00 } ,
{ 0x4E21 , 0x14 } ,
{ 0x6B11 , 0xCF } ,
{ 0x7FF0 , 0x08 } ,
{ 0x7FF1 , 0x0F } ,
{ 0x7FF2 , 0x08 } ,
{ 0x7FF3 , 0x1B } ,
{ 0x7FF4 , 0x23 } ,
{ 0x7FF5 , 0x60 } ,
{ 0x7FF6 , 0x00 } ,
{ 0x7FF7 , 0x01 } ,
{ 0x7FF8 , 0x00 } ,
{ 0x7FF9 , 0x78 } ,
{ 0x7FFA , 0x00 } ,
{ 0x7FFB , 0x00 } ,
{ 0x7FFC , 0x00 } ,
{ 0x7FFD , 0x00 } ,
{ 0x7FFE , 0x00 } ,
{ 0x7FFF , 0x03 } ,
{ 0x7F76 , 0x03 } ,
{ 0x7F77 , 0xFE } ,
{ 0x7FA8 , 0x03 } ,
{ 0x7FA9 , 0xFE } ,
{ 0x7B24 , 0x81 } ,
{ 0x7B25 , 0x00 } ,
{ 0x6564 , 0x07 } ,
{ 0x6B0D , 0x41 } ,
{ 0x653D , 0x04 } ,
{ 0x6B05 , 0x8C } ,
{ 0x6B06 , 0xF9 } ,
{ 0x6B08 , 0x65 } ,
{ 0x6B09 , 0xFC } ,
{ 0x6B0A , 0xCF } ,
{ 0x6B0B , 0xD2 } ,
{ 0x6700 , 0x0E } ,
{ 0x6707 , 0x0E } ,
{ 0x9104 , 0x00 } ,
{ 0x4648 , 0x7F } ,
{ 0x7420 , 0x00 } ,
{ 0x7421 , 0x1C } ,
{ 0x7422 , 0x00 } ,
{ 0x7423 , 0xD7 } ,
{ 0x5F04 , 0x00 } ,
{ 0x5F05 , 0xED } ,
{ 0x0112 , 0x0A } ,
{ 0x0113 , 0x0A } ,
{ 0x0114 , 0x03 } ,
{ 0x0342 , 0x14 } ,
{ 0x0343 , 0xE8 } ,
{ 0x0340 , 0x06 } ,
{ 0x0341 , 0x38 } ,
{ 0x0344 , 0x00 } ,
{ 0x0345 , 0x00 } ,
{ 0x0346 , 0x00 } ,
{ 0x0347 , 0x00 } ,
{ 0x0348 , 0x10 } ,
{ 0x0349 , 0x6F } ,
{ 0x034A , 0x0C } ,
{ 0x034B , 0x2E } ,
{ 0x0381 , 0x01 } ,
{ 0x0383 , 0x01 } ,
{ 0x0385 , 0x01 } ,
{ 0x0387 , 0x01 } ,
{ 0x0900 , 0x01 } ,
{ 0x0901 , 0x12 } ,
{ 0x0401 , 0x01 } ,
{ 0x0404 , 0x00 } ,
{ 0x0405 , 0x20 } ,
{ 0x0408 , 0x00 } ,
{ 0x0409 , 0x02 } ,
{ 0x040A , 0x00 } ,
{ 0x040B , 0x00 } ,
{ 0x040C , 0x10 } ,
{ 0x040D , 0x6A } ,
{ 0x040E , 0x06 } ,
{ 0x040F , 0x18 } ,
{ 0x3038 , 0x00 } ,
{ 0x303A , 0x00 } ,
{ 0x303B , 0x10 } ,
{ 0x300D , 0x00 } ,
{ 0x034C , 0x08 } ,
{ 0x034D , 0x38 } ,
{ 0x034E , 0x06 } ,
{ 0x034F , 0x18 } ,
{ 0x0350 , 0x01 } ,
{ 0x0202 , 0x06 } ,
{ 0x0203 , 0x2E } ,
{ 0x0204 , 0x00 } ,
{ 0x0205 , 0x00 } ,
{ 0x020E , 0x01 } ,
{ 0x020F , 0x00 } ,
{ 0x0210 , 0x01 } ,
{ 0x0211 , 0x00 } ,
{ 0x0212 , 0x01 } ,
{ 0x0213 , 0x00 } ,
{ 0x0214 , 0x01 } ,
{ 0x0215 , 0x00 } ,
{ 0x7BCD , 0x01 } ,
{ 0x94DC , 0x20 } ,
{ 0x94DD , 0x20 } ,
{ 0x94DE , 0x20 } ,
{ 0x95DC , 0x20 } ,
{ 0x95DD , 0x20 } ,
{ 0x95DE , 0x20 } ,
{ 0x7FB0 , 0x00 } ,
{ 0x9010 , 0x3E } ,
{ 0x9419 , 0x50 } ,
{ 0x941B , 0x50 } ,
{ 0x9519 , 0x50 } ,
{ 0x951B , 0x50 } ,
{ 0x3030 , 0x00 } ,
{ 0x3032 , 0x00 } ,
{ 0x0220 , 0x00 } ,
} ;
static const struct imx258_reg mode_1048_780_regs [ ] = {
{ 0x0136 , 0x13 } ,
{ 0x0137 , 0x33 } ,
{ 0x3051 , 0x00 } ,
{ 0x3052 , 0x00 } ,
{ 0x4E21 , 0x14 } ,
{ 0x6B11 , 0xCF } ,
{ 0x7FF0 , 0x08 } ,
{ 0x7FF1 , 0x0F } ,
{ 0x7FF2 , 0x08 } ,
{ 0x7FF3 , 0x1B } ,
{ 0x7FF4 , 0x23 } ,
{ 0x7FF5 , 0x60 } ,
{ 0x7FF6 , 0x00 } ,
{ 0x7FF7 , 0x01 } ,
{ 0x7FF8 , 0x00 } ,
{ 0x7FF9 , 0x78 } ,
{ 0x7FFA , 0x00 } ,
{ 0x7FFB , 0x00 } ,
{ 0x7FFC , 0x00 } ,
{ 0x7FFD , 0x00 } ,
{ 0x7FFE , 0x00 } ,
{ 0x7FFF , 0x03 } ,
{ 0x7F76 , 0x03 } ,
{ 0x7F77 , 0xFE } ,
{ 0x7FA8 , 0x03 } ,
{ 0x7FA9 , 0xFE } ,
{ 0x7B24 , 0x81 } ,
{ 0x7B25 , 0x00 } ,
{ 0x6564 , 0x07 } ,
{ 0x6B0D , 0x41 } ,
{ 0x653D , 0x04 } ,
{ 0x6B05 , 0x8C } ,
{ 0x6B06 , 0xF9 } ,
{ 0x6B08 , 0x65 } ,
{ 0x6B09 , 0xFC } ,
{ 0x6B0A , 0xCF } ,
{ 0x6B0B , 0xD2 } ,
{ 0x6700 , 0x0E } ,
{ 0x6707 , 0x0E } ,
{ 0x9104 , 0x00 } ,
{ 0x4648 , 0x7F } ,
{ 0x7420 , 0x00 } ,
{ 0x7421 , 0x1C } ,
{ 0x7422 , 0x00 } ,
{ 0x7423 , 0xD7 } ,
{ 0x5F04 , 0x00 } ,
{ 0x5F05 , 0xED } ,
{ 0x0112 , 0x0A } ,
{ 0x0113 , 0x0A } ,
{ 0x0114 , 0x03 } ,
{ 0x0342 , 0x14 } ,
{ 0x0343 , 0xE8 } ,
{ 0x0340 , 0x03 } ,
{ 0x0341 , 0x4C } ,
{ 0x0344 , 0x00 } ,
{ 0x0345 , 0x00 } ,
{ 0x0346 , 0x00 } ,
{ 0x0347 , 0x00 } ,
{ 0x0348 , 0x10 } ,
{ 0x0349 , 0x6F } ,
{ 0x034A , 0x0C } ,
{ 0x034B , 0x2E } ,
{ 0x0381 , 0x01 } ,
{ 0x0383 , 0x01 } ,
{ 0x0385 , 0x01 } ,
{ 0x0387 , 0x01 } ,
{ 0x0900 , 0x01 } ,
{ 0x0901 , 0x14 } ,
{ 0x0401 , 0x01 } ,
{ 0x0404 , 0x00 } ,
{ 0x0405 , 0x40 } ,
{ 0x0408 , 0x00 } ,
{ 0x0409 , 0x06 } ,
{ 0x040A , 0x00 } ,
{ 0x040B , 0x00 } ,
{ 0x040C , 0x10 } ,
{ 0x040D , 0x64 } ,
{ 0x040E , 0x03 } ,
{ 0x040F , 0x0C } ,
{ 0x3038 , 0x00 } ,
{ 0x303A , 0x00 } ,
{ 0x303B , 0x10 } ,
{ 0x300D , 0x00 } ,
{ 0x034C , 0x04 } ,
{ 0x034D , 0x18 } ,
{ 0x034E , 0x03 } ,
{ 0x034F , 0x0C } ,
{ 0x0350 , 0x01 } ,
{ 0x0202 , 0x03 } ,
{ 0x0203 , 0x42 } ,
{ 0x0204 , 0x00 } ,
{ 0x0205 , 0x00 } ,
{ 0x020E , 0x01 } ,
{ 0x020F , 0x00 } ,
{ 0x0210 , 0x01 } ,
{ 0x0211 , 0x00 } ,
{ 0x0212 , 0x01 } ,
{ 0x0213 , 0x00 } ,
{ 0x0214 , 0x01 } ,
{ 0x0215 , 0x00 } ,
{ 0x7BCD , 0x00 } ,
{ 0x94DC , 0x20 } ,
{ 0x94DD , 0x20 } ,
{ 0x94DE , 0x20 } ,
{ 0x95DC , 0x20 } ,
{ 0x95DD , 0x20 } ,
{ 0x95DE , 0x20 } ,
{ 0x7FB0 , 0x00 } ,
{ 0x9010 , 0x3E } ,
{ 0x9419 , 0x50 } ,
{ 0x941B , 0x50 } ,
{ 0x9519 , 0x50 } ,
{ 0x951B , 0x50 } ,
{ 0x3030 , 0x00 } ,
{ 0x3032 , 0x00 } ,
{ 0x0220 , 0x00 } ,
} ;
static const char * const imx258_test_pattern_menu [ ] = {
" Disabled " ,
2018-11-26 23:01:01 -05:00
" Solid Colour " ,
" Eight Vertical Colour Bars " ,
" Colour Bars With Fade to Grey " ,
" Pseudorandom Sequence (PN9) " ,
2018-05-02 11:46:08 -04:00
} ;
/* Configurations for supported link frequencies */
# define IMX258_LINK_FREQ_634MHZ 633600000ULL
# define IMX258_LINK_FREQ_320MHZ 320000000ULL
enum {
IMX258_LINK_FREQ_1267MBPS ,
IMX258_LINK_FREQ_640MBPS ,
} ;
/*
* 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
*/
static u64 link_freq_to_pixel_rate ( u64 f )
{
f * = 2 * 4 ;
do_div ( f , 10 ) ;
return f ;
}
/* Menu items for LINK_FREQ V4L2 control */
static const s64 link_freq_menu_items [ ] = {
IMX258_LINK_FREQ_634MHZ ,
IMX258_LINK_FREQ_320MHZ ,
} ;
/* Link frequency configs */
static const struct imx258_link_freq_config link_freq_configs [ ] = {
[ IMX258_LINK_FREQ_1267MBPS ] = {
. pixels_per_line = IMX258_PPL_DEFAULT ,
. reg_list = {
. num_of_regs = ARRAY_SIZE ( mipi_data_rate_1267mbps ) ,
. regs = mipi_data_rate_1267mbps ,
}
} ,
[ IMX258_LINK_FREQ_640MBPS ] = {
. pixels_per_line = IMX258_PPL_DEFAULT ,
. reg_list = {
. num_of_regs = ARRAY_SIZE ( mipi_data_rate_640mbps ) ,
. regs = mipi_data_rate_640mbps ,
}
} ,
} ;
/* Mode configs */
static const struct imx258_mode supported_modes [ ] = {
{
. width = 4208 ,
. height = 3118 ,
. vts_def = IMX258_VTS_30FPS ,
. vts_min = IMX258_VTS_30FPS ,
. reg_list = {
. num_of_regs = ARRAY_SIZE ( mode_4208x3118_regs ) ,
. regs = mode_4208x3118_regs ,
} ,
. link_freq_index = IMX258_LINK_FREQ_1267MBPS ,
} ,
{
. width = 2104 ,
. height = 1560 ,
. vts_def = IMX258_VTS_30FPS_2K ,
. vts_min = IMX258_VTS_30FPS_2K ,
. reg_list = {
. num_of_regs = ARRAY_SIZE ( mode_2104_1560_regs ) ,
. regs = mode_2104_1560_regs ,
} ,
. link_freq_index = IMX258_LINK_FREQ_640MBPS ,
} ,
{
. width = 1048 ,
. height = 780 ,
. vts_def = IMX258_VTS_30FPS_VGA ,
. vts_min = IMX258_VTS_30FPS_VGA ,
. reg_list = {
. num_of_regs = ARRAY_SIZE ( mode_1048_780_regs ) ,
. regs = mode_1048_780_regs ,
} ,
. link_freq_index = IMX258_LINK_FREQ_640MBPS ,
} ,
} ;
struct imx258 {
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 imx258_mode * cur_mode ;
/*
* Mutex for serialized access :
* Protect sensor module set pad format and start / stop streaming safely .
*/
struct mutex mutex ;
2021-01-27 18:46:35 +01:00
struct clk * clk ;
2018-05-02 11:46:08 -04:00
} ;
static inline struct imx258 * to_imx258 ( struct v4l2_subdev * _sd )
{
return container_of ( _sd , struct imx258 , sd ) ;
}
/* Read registers up to 2 at a time */
static int imx258_read_reg ( struct imx258 * imx258 , u16 reg , u32 len , u32 * val )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
struct i2c_msg msgs [ 2 ] ;
u8 addr_buf [ 2 ] = { reg > > 8 , reg & 0xff } ;
u8 data_buf [ 4 ] = { 0 , } ;
int ret ;
if ( len > 4 )
return - EINVAL ;
/* Write register address */
msgs [ 0 ] . addr = client - > addr ;
msgs [ 0 ] . flags = 0 ;
msgs [ 0 ] . len = ARRAY_SIZE ( addr_buf ) ;
msgs [ 0 ] . buf = addr_buf ;
/* Read data from register */
msgs [ 1 ] . addr = client - > addr ;
msgs [ 1 ] . flags = I2C_M_RD ;
msgs [ 1 ] . len = len ;
msgs [ 1 ] . buf = & data_buf [ 4 - len ] ;
ret = i2c_transfer ( client - > adapter , msgs , ARRAY_SIZE ( msgs ) ) ;
if ( ret ! = ARRAY_SIZE ( msgs ) )
return - EIO ;
* val = get_unaligned_be32 ( data_buf ) ;
return 0 ;
}
/* Write registers up to 2 at a time */
static int imx258_write_reg ( struct imx258 * imx258 , u16 reg , u32 len , u32 val )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
u8 buf [ 6 ] ;
if ( len > 4 )
return - EINVAL ;
put_unaligned_be16 ( reg , buf ) ;
put_unaligned_be32 ( val < < ( 8 * ( 4 - len ) ) , buf + 2 ) ;
if ( i2c_master_send ( client , buf , len + 2 ) ! = len + 2 )
return - EIO ;
return 0 ;
}
/* Write a list of registers */
static int imx258_write_regs ( struct imx258 * imx258 ,
const struct imx258_reg * regs , u32 len )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
unsigned int i ;
int ret ;
for ( i = 0 ; i < len ; i + + ) {
ret = imx258_write_reg ( imx258 , 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 ;
}
/* Open sub-device */
static int imx258_open ( struct v4l2_subdev * sd , struct v4l2_subdev_fh * fh )
{
struct v4l2_mbus_framefmt * try_fmt =
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 17:55:58 +03:00
v4l2_subdev_get_try_format ( sd , fh - > state , 0 ) ;
2018-05-02 11:46:08 -04:00
/* Initialize try_fmt */
try_fmt - > width = supported_modes [ 0 ] . width ;
try_fmt - > height = supported_modes [ 0 ] . height ;
try_fmt - > code = MEDIA_BUS_FMT_SGRBG10_1X10 ;
try_fmt - > field = V4L2_FIELD_NONE ;
return 0 ;
}
static int imx258_update_digital_gain ( struct imx258 * imx258 , u32 len , u32 val )
{
int ret ;
ret = imx258_write_reg ( imx258 , IMX258_REG_GR_DIGITAL_GAIN ,
IMX258_REG_VALUE_16BIT ,
val ) ;
if ( ret )
return ret ;
ret = imx258_write_reg ( imx258 , IMX258_REG_GB_DIGITAL_GAIN ,
IMX258_REG_VALUE_16BIT ,
val ) ;
if ( ret )
return ret ;
ret = imx258_write_reg ( imx258 , IMX258_REG_R_DIGITAL_GAIN ,
IMX258_REG_VALUE_16BIT ,
val ) ;
if ( ret )
return ret ;
ret = imx258_write_reg ( imx258 , IMX258_REG_B_DIGITAL_GAIN ,
IMX258_REG_VALUE_16BIT ,
val ) ;
if ( ret )
return ret ;
return 0 ;
}
static int imx258_set_ctrl ( struct v4l2_ctrl * ctrl )
{
struct imx258 * imx258 =
container_of ( ctrl - > handler , struct imx258 , ctrl_handler ) ;
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
int ret = 0 ;
/*
* Applying V4L2 control value only happens
* when power is up for streaming
*/
if ( pm_runtime_get_if_in_use ( & client - > dev ) = = 0 )
return 0 ;
switch ( ctrl - > id ) {
case V4L2_CID_ANALOGUE_GAIN :
ret = imx258_write_reg ( imx258 , IMX258_REG_ANALOG_GAIN ,
IMX258_REG_VALUE_16BIT ,
ctrl - > val ) ;
break ;
case V4L2_CID_EXPOSURE :
ret = imx258_write_reg ( imx258 , IMX258_REG_EXPOSURE ,
IMX258_REG_VALUE_16BIT ,
ctrl - > val ) ;
break ;
case V4L2_CID_DIGITAL_GAIN :
ret = imx258_update_digital_gain ( imx258 , IMX258_REG_VALUE_16BIT ,
ctrl - > val ) ;
break ;
case V4L2_CID_TEST_PATTERN :
ret = imx258_write_reg ( imx258 , IMX258_REG_TEST_PATTERN ,
IMX258_REG_VALUE_16BIT ,
2018-11-07 21:47:34 -05:00
ctrl - > val ) ;
2018-05-02 11:46:08 -04:00
ret = imx258_write_reg ( imx258 , REG_MIRROR_FLIP_CONTROL ,
IMX258_REG_VALUE_08BIT ,
2018-11-07 21:47:34 -05:00
! ctrl - > val ? REG_CONFIG_MIRROR_FLIP :
2018-05-02 11:46:08 -04:00
REG_CONFIG_FLIP_TEST_PATTERN ) ;
break ;
2020-10-05 17:15:58 +02:00
case V4L2_CID_WIDE_DYNAMIC_RANGE :
if ( ! ctrl - > val ) {
ret = imx258_write_reg ( imx258 , IMX258_REG_HDR ,
IMX258_REG_VALUE_08BIT ,
IMX258_HDR_RATIO_MIN ) ;
} else {
ret = imx258_write_reg ( imx258 , IMX258_REG_HDR ,
IMX258_REG_VALUE_08BIT ,
IMX258_HDR_ON ) ;
if ( ret )
break ;
ret = imx258_write_reg ( imx258 , IMX258_REG_HDR_RATIO ,
IMX258_REG_VALUE_08BIT ,
BIT ( IMX258_HDR_RATIO_MAX ) ) ;
}
break ;
2018-05-02 11:46:08 -04:00
default :
dev_info ( & client - > dev ,
" ctrl(id:0x%x,val:0x%x) is not handled \n " ,
ctrl - > id , ctrl - > val ) ;
ret = - EINVAL ;
break ;
}
pm_runtime_put ( & client - > dev ) ;
return ret ;
}
static const struct v4l2_ctrl_ops imx258_ctrl_ops = {
. s_ctrl = imx258_set_ctrl ,
} ;
static int imx258_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 17:55:58 +03:00
struct v4l2_subdev_state * sd_state ,
2018-05-02 11:46:08 -04: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 imx258_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 17:55:58 +03:00
struct v4l2_subdev_state * sd_state ,
2018-05-02 11:46:08 -04: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 imx258_update_pad_format ( const struct imx258_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 __imx258_get_pad_format ( struct imx258 * imx258 ,
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 17:55:58 +03:00
struct v4l2_subdev_state * sd_state ,
2018-05-02 11:46:08 -04:00
struct v4l2_subdev_format * fmt )
{
if ( fmt - > which = = V4L2_SUBDEV_FORMAT_TRY )
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
fmt - > format = * v4l2_subdev_get_try_format ( & imx258 - > sd ,
sd_state ,
2018-05-02 11:46:08 -04:00
fmt - > pad ) ;
else
imx258_update_pad_format ( imx258 - > cur_mode , fmt ) ;
return 0 ;
}
static int imx258_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 17:55:58 +03:00
struct v4l2_subdev_state * sd_state ,
2018-05-02 11:46:08 -04:00
struct v4l2_subdev_format * fmt )
{
struct imx258 * imx258 = to_imx258 ( sd ) ;
int ret ;
mutex_lock ( & imx258 - > 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 17:55:58 +03:00
ret = __imx258_get_pad_format ( imx258 , sd_state , fmt ) ;
2018-05-02 11:46:08 -04:00
mutex_unlock ( & imx258 - > mutex ) ;
return ret ;
}
static int imx258_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 17:55:58 +03:00
struct v4l2_subdev_state * sd_state ,
2018-05-02 11:46:08 -04:00
struct v4l2_subdev_format * fmt )
{
struct imx258 * imx258 = to_imx258 ( sd ) ;
const struct imx258_mode * mode ;
struct v4l2_mbus_framefmt * framefmt ;
s32 vblank_def ;
s32 vblank_min ;
s64 h_blank ;
s64 pixel_rate ;
s64 link_freq ;
mutex_lock ( & imx258 - > mutex ) ;
/* Only one raw bayer(GBRG) order is supported */
fmt - > format . code = MEDIA_BUS_FMT_SGRBG10_1X10 ;
mode = v4l2_find_nearest_size ( supported_modes ,
ARRAY_SIZE ( supported_modes ) , width , height ,
fmt - > format . width , fmt - > format . height ) ;
imx258_update_pad_format ( mode , fmt ) ;
if ( fmt - > which = = V4L2_SUBDEV_FORMAT_TRY ) {
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
framefmt = v4l2_subdev_get_try_format ( sd , sd_state , fmt - > pad ) ;
2018-05-02 11:46:08 -04:00
* framefmt = fmt - > format ;
} else {
imx258 - > cur_mode = mode ;
__v4l2_ctrl_s_ctrl ( imx258 - > link_freq , mode - > link_freq_index ) ;
link_freq = link_freq_menu_items [ mode - > link_freq_index ] ;
pixel_rate = link_freq_to_pixel_rate ( link_freq ) ;
__v4l2_ctrl_s_ctrl_int64 ( imx258 - > pixel_rate , pixel_rate ) ;
/* Update limits and set FPS to default */
vblank_def = imx258 - > cur_mode - > vts_def -
imx258 - > cur_mode - > height ;
vblank_min = imx258 - > cur_mode - > vts_min -
imx258 - > cur_mode - > height ;
__v4l2_ctrl_modify_range (
imx258 - > vblank , vblank_min ,
IMX258_VTS_MAX - imx258 - > cur_mode - > height , 1 ,
vblank_def ) ;
__v4l2_ctrl_s_ctrl ( imx258 - > vblank , vblank_def ) ;
h_blank =
link_freq_configs [ mode - > link_freq_index ] . pixels_per_line
- imx258 - > cur_mode - > width ;
__v4l2_ctrl_modify_range ( imx258 - > hblank , h_blank ,
h_blank , 1 , h_blank ) ;
}
mutex_unlock ( & imx258 - > mutex ) ;
return 0 ;
}
/* Start streaming */
static int imx258_start_streaming ( struct imx258 * imx258 )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
const struct imx258_reg_list * reg_list ;
int ret , link_freq_index ;
/* Setup PLL */
link_freq_index = imx258 - > cur_mode - > link_freq_index ;
reg_list = & link_freq_configs [ link_freq_index ] . reg_list ;
ret = imx258_write_regs ( imx258 , reg_list - > regs , reg_list - > num_of_regs ) ;
if ( ret ) {
dev_err ( & client - > dev , " %s failed to set plls \n " , __func__ ) ;
return ret ;
}
/* Apply default values of current mode */
reg_list = & imx258 - > cur_mode - > reg_list ;
ret = imx258_write_regs ( imx258 , reg_list - > regs , reg_list - > num_of_regs ) ;
if ( ret ) {
dev_err ( & client - > dev , " %s failed to set mode \n " , __func__ ) ;
return ret ;
}
/* Set Orientation be 180 degree */
ret = imx258_write_reg ( imx258 , REG_MIRROR_FLIP_CONTROL ,
IMX258_REG_VALUE_08BIT , REG_CONFIG_MIRROR_FLIP ) ;
if ( ret ) {
dev_err ( & client - > dev , " %s failed to set orientation \n " ,
__func__ ) ;
return ret ;
}
/* Apply customized values from user */
ret = __v4l2_ctrl_handler_setup ( imx258 - > sd . ctrl_handler ) ;
if ( ret )
return ret ;
/* set stream on register */
return imx258_write_reg ( imx258 , IMX258_REG_MODE_SELECT ,
IMX258_REG_VALUE_08BIT ,
IMX258_MODE_STREAMING ) ;
}
/* Stop streaming */
static int imx258_stop_streaming ( struct imx258 * imx258 )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
int ret ;
/* set stream off register */
ret = imx258_write_reg ( imx258 , IMX258_REG_MODE_SELECT ,
IMX258_REG_VALUE_08BIT , IMX258_MODE_STANDBY ) ;
if ( ret )
dev_err ( & client - > dev , " %s failed to set stream \n " , __func__ ) ;
/*
* Return success even if it was an error , as there is nothing the
* caller can do about it .
*/
return 0 ;
}
2021-01-27 18:46:35 +01:00
static int imx258_power_on ( struct device * dev )
{
struct v4l2_subdev * sd = dev_get_drvdata ( dev ) ;
struct imx258 * imx258 = to_imx258 ( sd ) ;
int ret ;
ret = clk_prepare_enable ( imx258 - > clk ) ;
if ( ret )
dev_err ( dev , " failed to enable clock \n " ) ;
return ret ;
}
static int imx258_power_off ( struct device * dev )
{
struct v4l2_subdev * sd = dev_get_drvdata ( dev ) ;
struct imx258 * imx258 = to_imx258 ( sd ) ;
clk_disable_unprepare ( imx258 - > clk ) ;
return 0 ;
}
2018-05-02 11:46:08 -04:00
static int imx258_set_stream ( struct v4l2_subdev * sd , int enable )
{
struct imx258 * imx258 = to_imx258 ( sd ) ;
struct i2c_client * client = v4l2_get_subdevdata ( sd ) ;
int ret = 0 ;
mutex_lock ( & imx258 - > mutex ) ;
if ( enable ) {
2021-04-23 17:19:13 +02:00
ret = pm_runtime_resume_and_get ( & client - > dev ) ;
if ( ret < 0 )
2018-05-02 11:46:08 -04:00
goto err_unlock ;
/*
* Apply default & customized values
* and then start streaming .
*/
ret = imx258_start_streaming ( imx258 ) ;
if ( ret )
goto err_rpm_put ;
} else {
imx258_stop_streaming ( imx258 ) ;
pm_runtime_put ( & client - > dev ) ;
}
mutex_unlock ( & imx258 - > mutex ) ;
return ret ;
err_rpm_put :
pm_runtime_put ( & client - > dev ) ;
err_unlock :
mutex_unlock ( & imx258 - > mutex ) ;
return ret ;
}
/* Verify chip ID */
static int imx258_identify_module ( struct imx258 * imx258 )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
int ret ;
u32 val ;
ret = imx258_read_reg ( imx258 , IMX258_REG_CHIP_ID ,
IMX258_REG_VALUE_16BIT , & val ) ;
if ( ret ) {
dev_err ( & client - > dev , " failed to read chip id %x \n " ,
IMX258_CHIP_ID ) ;
return ret ;
}
if ( val ! = IMX258_CHIP_ID ) {
dev_err ( & client - > dev , " chip id mismatch: %x!=%x \n " ,
IMX258_CHIP_ID , val ) ;
return - EIO ;
}
return 0 ;
}
static const struct v4l2_subdev_video_ops imx258_video_ops = {
. s_stream = imx258_set_stream ,
} ;
static const struct v4l2_subdev_pad_ops imx258_pad_ops = {
. enum_mbus_code = imx258_enum_mbus_code ,
. get_fmt = imx258_get_pad_format ,
. set_fmt = imx258_set_pad_format ,
. enum_frame_size = imx258_enum_frame_size ,
} ;
static const struct v4l2_subdev_ops imx258_subdev_ops = {
. video = & imx258_video_ops ,
. pad = & imx258_pad_ops ,
} ;
static const struct v4l2_subdev_internal_ops imx258_internal_ops = {
. open = imx258_open ,
} ;
/* Initialize control handlers */
static int imx258_init_controls ( struct imx258 * imx258 )
{
struct i2c_client * client = v4l2_get_subdevdata ( & imx258 - > sd ) ;
2023-01-04 13:23:37 +01:00
struct v4l2_fwnode_device_properties props ;
2018-05-02 11:46:08 -04:00
struct v4l2_ctrl_handler * ctrl_hdlr ;
2023-01-17 11:06:02 +01:00
struct v4l2_ctrl * vflip , * hflip ;
2018-05-02 11:46:08 -04:00
s64 vblank_def ;
s64 vblank_min ;
s64 pixel_rate_min ;
s64 pixel_rate_max ;
int ret ;
ctrl_hdlr = & imx258 - > ctrl_handler ;
2023-01-17 11:06:02 +01:00
ret = v4l2_ctrl_handler_init ( ctrl_hdlr , 13 ) ;
2018-05-02 11:46:08 -04:00
if ( ret )
return ret ;
mutex_init ( & imx258 - > mutex ) ;
ctrl_hdlr - > lock = & imx258 - > mutex ;
imx258 - > link_freq = v4l2_ctrl_new_int_menu ( ctrl_hdlr ,
& imx258_ctrl_ops ,
V4L2_CID_LINK_FREQ ,
ARRAY_SIZE ( link_freq_menu_items ) - 1 ,
0 ,
link_freq_menu_items ) ;
if ( imx258 - > link_freq )
imx258 - > link_freq - > flags | = V4L2_CTRL_FLAG_READ_ONLY ;
2023-01-17 11:06:02 +01:00
/* The driver only supports one bayer order and flips by default. */
hflip = v4l2_ctrl_new_std ( ctrl_hdlr , & imx258_ctrl_ops ,
V4L2_CID_HFLIP , 1 , 1 , 1 , 1 ) ;
if ( hflip )
hflip - > flags | = V4L2_CTRL_FLAG_READ_ONLY ;
vflip = v4l2_ctrl_new_std ( ctrl_hdlr , & imx258_ctrl_ops ,
V4L2_CID_VFLIP , 1 , 1 , 1 , 1 ) ;
if ( vflip )
vflip - > flags | = V4L2_CTRL_FLAG_READ_ONLY ;
2018-05-02 11:46:08 -04: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 ] ) ;
/* By default, PIXEL_RATE is read only */
imx258 - > pixel_rate = v4l2_ctrl_new_std ( ctrl_hdlr , & imx258_ctrl_ops ,
V4L2_CID_PIXEL_RATE ,
pixel_rate_min , pixel_rate_max ,
1 , pixel_rate_max ) ;
vblank_def = imx258 - > cur_mode - > vts_def - imx258 - > cur_mode - > height ;
vblank_min = imx258 - > cur_mode - > vts_min - imx258 - > cur_mode - > height ;
imx258 - > vblank = v4l2_ctrl_new_std (
ctrl_hdlr , & imx258_ctrl_ops , V4L2_CID_VBLANK ,
vblank_min ,
IMX258_VTS_MAX - imx258 - > cur_mode - > height , 1 ,
vblank_def ) ;
if ( imx258 - > vblank )
imx258 - > vblank - > flags | = V4L2_CTRL_FLAG_READ_ONLY ;
imx258 - > hblank = v4l2_ctrl_new_std (
ctrl_hdlr , & imx258_ctrl_ops , V4L2_CID_HBLANK ,
IMX258_PPL_DEFAULT - imx258 - > cur_mode - > width ,
IMX258_PPL_DEFAULT - imx258 - > cur_mode - > width ,
1 ,
IMX258_PPL_DEFAULT - imx258 - > cur_mode - > width ) ;
if ( imx258 - > hblank )
imx258 - > hblank - > flags | = V4L2_CTRL_FLAG_READ_ONLY ;
imx258 - > exposure = v4l2_ctrl_new_std (
ctrl_hdlr , & imx258_ctrl_ops ,
V4L2_CID_EXPOSURE , IMX258_EXPOSURE_MIN ,
IMX258_EXPOSURE_MAX , IMX258_EXPOSURE_STEP ,
IMX258_EXPOSURE_DEFAULT ) ;
v4l2_ctrl_new_std ( ctrl_hdlr , & imx258_ctrl_ops , V4L2_CID_ANALOGUE_GAIN ,
IMX258_ANA_GAIN_MIN , IMX258_ANA_GAIN_MAX ,
IMX258_ANA_GAIN_STEP , IMX258_ANA_GAIN_DEFAULT ) ;
v4l2_ctrl_new_std ( ctrl_hdlr , & imx258_ctrl_ops , V4L2_CID_DIGITAL_GAIN ,
IMX258_DGTL_GAIN_MIN , IMX258_DGTL_GAIN_MAX ,
IMX258_DGTL_GAIN_STEP ,
IMX258_DGTL_GAIN_DEFAULT ) ;
2020-10-05 17:15:58 +02:00
v4l2_ctrl_new_std ( ctrl_hdlr , & imx258_ctrl_ops , V4L2_CID_WIDE_DYNAMIC_RANGE ,
0 , 1 , 1 , IMX258_HDR_RATIO_DEFAULT ) ;
2018-05-02 11:46:08 -04:00
v4l2_ctrl_new_std_menu_items ( ctrl_hdlr , & imx258_ctrl_ops ,
V4L2_CID_TEST_PATTERN ,
ARRAY_SIZE ( imx258_test_pattern_menu ) - 1 ,
0 , 0 , imx258_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 ;
}
2023-01-04 13:23:37 +01:00
ret = v4l2_fwnode_device_parse ( & client - > dev , & props ) ;
if ( ret )
goto error ;
ret = v4l2_ctrl_new_fwnode_properties ( ctrl_hdlr , & imx258_ctrl_ops ,
& props ) ;
if ( ret )
goto error ;
2018-05-02 11:46:08 -04:00
imx258 - > sd . ctrl_handler = ctrl_hdlr ;
return 0 ;
error :
v4l2_ctrl_handler_free ( ctrl_hdlr ) ;
mutex_destroy ( & imx258 - > mutex ) ;
return ret ;
}
static void imx258_free_controls ( struct imx258 * imx258 )
{
v4l2_ctrl_handler_free ( imx258 - > sd . ctrl_handler ) ;
mutex_destroy ( & imx258 - > mutex ) ;
}
static int imx258_probe ( struct i2c_client * client )
{
struct imx258 * imx258 ;
int ret ;
u32 val = 0 ;
2021-01-27 18:46:35 +01:00
imx258 = devm_kzalloc ( & client - > dev , sizeof ( * imx258 ) , GFP_KERNEL ) ;
if ( ! imx258 )
return - ENOMEM ;
imx258 - > clk = devm_clk_get_optional ( & client - > dev , NULL ) ;
2021-08-16 15:08:59 +02:00
if ( IS_ERR ( imx258 - > clk ) )
return dev_err_probe ( & client - > dev , PTR_ERR ( imx258 - > clk ) ,
" error getting clock \n " ) ;
2021-01-27 18:46:35 +01:00
if ( ! imx258 - > clk ) {
dev_dbg ( & client - > dev ,
" no clock provided, using clock-frequency property \n " ) ;
device_property_read_u32 ( & client - > dev , " clock-frequency " , & val ) ;
2021-08-16 15:08:59 +02:00
} else {
val = clk_get_rate ( imx258 - > clk ) ;
2021-01-27 18:46:35 +01:00
}
2021-08-16 15:08:59 +02:00
if ( val ! = IMX258_INPUT_CLOCK_FREQ ) {
2021-01-27 18:46:35 +01:00
dev_err ( & client - > dev , " input clock frequency not supported \n " ) ;
2018-05-02 11:46:08 -04:00
return - EINVAL ;
2021-01-27 18:46:35 +01:00
}
2018-05-02 11:46:08 -04:00
/* Initialize subdev */
v4l2_i2c_subdev_init ( & imx258 - > sd , client , & imx258_subdev_ops ) ;
2021-01-27 18:46:35 +01:00
/* Will be powered off via pm_runtime_idle */
ret = imx258_power_on ( & client - > dev ) ;
if ( ret )
return ret ;
2018-05-02 11:46:08 -04:00
/* Check module identity */
ret = imx258_identify_module ( imx258 ) ;
if ( ret )
2021-01-27 18:46:35 +01:00
goto error_identify ;
2018-05-02 11:46:08 -04:00
/* Set default mode to max resolution */
imx258 - > cur_mode = & supported_modes [ 0 ] ;
ret = imx258_init_controls ( imx258 ) ;
if ( ret )
2021-01-27 18:46:35 +01:00
goto error_identify ;
2018-05-02 11:46:08 -04:00
/* Initialize subdev */
imx258 - > sd . internal_ops = & imx258_internal_ops ;
imx258 - > sd . flags | = V4L2_SUBDEV_FL_HAS_DEVNODE ;
imx258 - > sd . entity . function = MEDIA_ENT_F_CAM_SENSOR ;
/* Initialize source pad */
imx258 - > pad . flags = MEDIA_PAD_FL_SOURCE ;
ret = media_entity_pads_init ( & imx258 - > sd . entity , 1 , & imx258 - > pad ) ;
if ( ret )
goto error_handler_free ;
2021-03-05 17:42:34 +01:00
ret = v4l2_async_register_subdev_sensor ( & imx258 - > sd ) ;
2018-05-02 11:46:08 -04:00
if ( ret < 0 )
goto error_media_entity ;
pm_runtime_set_active ( & client - > dev ) ;
pm_runtime_enable ( & client - > dev ) ;
pm_runtime_idle ( & client - > dev ) ;
return 0 ;
error_media_entity :
media_entity_cleanup ( & imx258 - > sd . entity ) ;
error_handler_free :
imx258_free_controls ( imx258 ) ;
2021-01-27 18:46:35 +01:00
error_identify :
imx258_power_off ( & client - > dev ) ;
2018-05-02 11:46:08 -04:00
return ret ;
}
2022-08-15 10:02:30 +02:00
static void imx258_remove ( struct i2c_client * client )
2018-05-02 11:46:08 -04:00
{
struct v4l2_subdev * sd = i2c_get_clientdata ( client ) ;
struct imx258 * imx258 = to_imx258 ( sd ) ;
v4l2_async_unregister_subdev ( sd ) ;
media_entity_cleanup ( & sd - > entity ) ;
imx258_free_controls ( imx258 ) ;
pm_runtime_disable ( & client - > dev ) ;
2021-01-27 18:46:35 +01:00
if ( ! pm_runtime_status_suspended ( & client - > dev ) )
imx258_power_off ( & client - > dev ) ;
2018-05-02 11:46:08 -04:00
pm_runtime_set_suspended ( & client - > dev ) ;
}
static const struct dev_pm_ops imx258_pm_ops = {
2021-01-27 18:46:35 +01:00
SET_RUNTIME_PM_OPS ( imx258_power_off , imx258_power_on , NULL )
2018-05-02 11:46:08 -04:00
} ;
# ifdef CONFIG_ACPI
static const struct acpi_device_id imx258_acpi_ids [ ] = {
{ " SONY258A " } ,
{ /* sentinel */ }
} ;
MODULE_DEVICE_TABLE ( acpi , imx258_acpi_ids ) ;
# endif
2021-01-27 18:46:33 +01:00
static const struct of_device_id imx258_dt_ids [ ] = {
{ . compatible = " sony,imx258 " } ,
{ /* sentinel */ }
} ;
MODULE_DEVICE_TABLE ( of , imx258_dt_ids ) ;
2018-05-02 11:46:08 -04:00
static struct i2c_driver imx258_i2c_driver = {
. driver = {
. name = " imx258 " ,
. pm = & imx258_pm_ops ,
. acpi_match_table = ACPI_PTR ( imx258_acpi_ids ) ,
2021-01-27 18:46:33 +01:00
. of_match_table = imx258_dt_ids ,
2018-05-02 11:46:08 -04:00
} ,
2023-05-14 14:04:07 +02:00
. probe = imx258_probe ,
2018-05-02 11:46:08 -04:00
. remove = imx258_remove ,
} ;
module_i2c_driver ( imx258_i2c_driver ) ;
MODULE_AUTHOR ( " Yeh, Andy <andy.yeh@intel.com> " ) ;
2020-09-02 08:23:57 +02:00
MODULE_AUTHOR ( " Chiang, Alan " ) ;
2020-10-28 11:03:57 +01:00
MODULE_AUTHOR ( " Chen, Jason " ) ;
2018-05-02 11:46:08 -04:00
MODULE_DESCRIPTION ( " Sony IMX258 sensor driver " ) ;
MODULE_LICENSE ( " GPL v2 " ) ;