Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework
Subsystems (4)
v5 cover Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework
This new version is an offspring from the big "Allwinner A31/A83T MIPI CSI-2 Support and A31 ISP Support" series, which was split into individual series for better clarity and handling.
This part only concerns the rework of the CSI driver to support the MIPI CSI-2 and ISP workflows.
Changes since v4:
- Removed the v4l2 controls handler from the driver;
- Removed the info message about video device registration;
- Fixed "literature" typos;
- Moved patches dependent on the ISP driver to its dedicated series;
- Rebased on the latest media tree;
- Added collected tags;
Changes since v3:
- Updated Kconfig to follow the latest media-wide changes;
- Rebased on latest changes to the driver (JPEG/sRGB colorspaces);
- Added helper to get a single enabled link for an entity's pad, to replace source selection at link_validate time and select the remote source at stream on time instead;
- Kept clock-managed regmap mmio;
- Added collected review tags;
- Various cosmetic cleanups;
Changes since all-in-one v2:
- Reworked capture video device registration, which stays in the main path.
- Reworked async subdev handling with a dedicated structure holding the corresponding source to avoid matching in the driver;
- Added mutex for mbus format serialization;
- Remove useless else in link_validate;
- Reworked commit logs to include missing information;
- Cleaned up Kconfig, added PM dependency;
- Moved platform-specific clock rate to of match data;
- Added collected Reviewed-by tags;
- Updated copyright years;
Paul Kocialkowski (44):
media: sun6i-csi: Define and use driver name and (reworked)
description
media: sun6i-csi: Refactor main driver data structures
media: sun6i-csi: Tidy up platform code
media: sun6i-csi: Always set exclusive module clock rate
media: sun6i-csi: Define and use variant to get module clock rate
media: sun6i-csi: Use runtime pm for clocks and reset
media: sun6i-csi: Tidy up Kconfig
media: sun6i-csi: Tidy up v4l2 code
media: sun6i-csi: Tidy up video code
media: sun6i-csi: Pass and store csi device directly in video code
media: sun6i-csi: Register the media device after creation
media: sun6i-csi: Remove controls handler from the driver
media: sun6i-csi: Add media ops with link notify callback
media: sun6i-csi: Introduce and use video helper functions
media: sun6i-csi: Move csi buffer definition to main header file
media: media-entity: Add helper to get a single enabled link
media: sun6i-csi: Add bridge v4l2 subdev with port management
media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture
media: sun6i-csi: Add capture state using vsync for page flip
media: sun6i-csi: Rework register definitions, invert misleading
fields
media: sun6i-csi: Add dimensions and format helpers to capture
media: sun6i-csi: Implement address configuration without indirection
media: sun6i-csi: Split stream sequences and irq code in capture
media: sun6i-csi: Move power management to runtime pm in capture
media: sun6i-csi: Move register configuration to capture
media: sun6i-csi: Rework capture format management with helper
media: sun6i-csi: Remove custom format helper and rework configure
media: sun6i-csi: Add bridge dimensions and format helpers
media: sun6i-csi: Get mbus code from bridge instead of storing it
media: sun6i-csi: Tidy capture configure code
media: sun6i-csi: Introduce bridge format structure, list and helper
media: sun6i-csi: Introduce capture format structure, list and helper
media: sun6i-csi: Configure registers from format tables
media: sun6i-csi: Introduce format match structure, list and helper
media: sun6i-csi: Implement capture link validation with logic
media: sun6i-csi: Get bridge subdev directly in capture stream ops
media: sun6i-csi: Move hardware control to the bridge
media: sun6i-csi: Rename the capture video device to sun6i-csi-capture
media: sun6i-csi: Cleanup headers and includes, update copyright lines
media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code
media: sun6i-csi: Only configure capture when streaming
media: sun6i-csi: Add extra checks to the interrupt routine
media: sun6i-csi: Request a shared interrupt
MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry
MAINTAINERS | 17 +- drivers/media/mc/mc-entity.c | 26 + .../media/platform/sunxi/sun6i-csi/Kconfig | 12 +- .../media/platform/sunxi/sun6i-csi/Makefile | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 1027 ++++------------ .../platform/sunxi/sun6i-csi/sun6i_csi.h | 149 +-- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 845 +++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 69 ++ .../sunxi/sun6i-csi/sun6i_csi_capture.c | 1089 +++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.h | 88 ++ .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 362 +++--- .../platform/sunxi/sun6i-csi/sun6i_video.c | 685 ----------- .../platform/sunxi/sun6i-csi/sun6i_video.h | 38 - include/media/media-entity.h | 13 + 14 files changed, 2591 insertions(+), 1831 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h delete mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c delete mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h
Signature · 1 line
2.36.1
PATCH v5 1/44 media: sun6i-csi: Define and use driver name and (reworked) description
Add proper defines for driver name and description instead of MODULE_NAME and hardcoding (cosmetics).
Also rework the description while at it to mention the hardware generation that the driver supports and remove the video capture mentions since it applies to the whole media device.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 14 ++++++-------- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 3 +++ 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +6 -8
@@ -27,8 +27,6 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" -#define MODULE_NAME "sun6i-csi" -struct sun6i_csi_dev {struct sun6i_csi csi;struct device *dev;
@@ -730,7 +728,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)int ret; csi->media_dev.dev = csi->dev; -strscpy (csi->media_dev.model,"Allwinner Video Capture Device" , +strscpy (csi->media_dev.model,SUN6I_CSI_DESCRIPTION ,sizeof (csi->media_dev.model)); csi->media_dev.hw_revision =0 ;
@@ -753,7 +751,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) goto free_ctrl; } - ret =sun6i_video_init (&csi->video, csi,"sun6i-csi" ); + ret =sun6i_video_init (&csi->video, csi,SUN6I_CSI_NAME );if (ret) goto unreg_v4l2;
@@ -868,8 +866,8 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,if (irq <0 )return -ENXIO ; - ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 ,MODULE_NAME , - sdev); + ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 , +SUN6I_CSI_NAME , sdev);if (ret) {dev_err (&pdev->dev,"Cannot request csi IRQ\n" );return ret;
@@ -922,12 +920,12 @@ static struct platform_driver sun6i_csi_platform_driver = { .probe = sun6i_csi_probe, .remove = sun6i_csi_remove, .driver = { - .name = MODULE_NAME, + .name = SUN6I_CSI_NAME, .of_match_table = of_match_ptr(sun6i_csi_of_match), }, };module_platform_driver (sun6i_csi_platform_driver); -MODULE_DESCRIPTION ("Allwinner V3s Camera Sensor Interface driver" ); +MODULE_DESCRIPTION ("Allwinner A31 Camera Sensor Interface driver" );MODULE_AUTHOR ("Yong Deng <[email protected]>" );MODULE_LICENSE ("GPL" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +3 -0
@@ -14,6 +14,9 @@#include "sun6i_video.h" +#define SUN6I_CSI_NAME "sun6i-csi" +#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +struct sun6i_csi ;/**
Signature · 1 line
2.36.1
PATCH v5 2/44 media: sun6i-csi: Refactor main driver data structures
In reply to Paul KocialkowskiMerge contents of structs sun6i_csi and sun6i_csi_dev into a main sun6i_csi_device structure holding a sun6i_csi_v4l2 struct for things related to v4l2, as well as the already-existing sun6i_csi_video and sun6i_csi_config which are left unchanged.
This mostly simplifies accessing stuff by having a single main structure accessible to every part of the code instead of a private definition.
No functional change is intended in this commit, variables are just moved around (cosmetics).
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 346 +++++++++--------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 34 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 52 +-- .../platform/sunxi/sun6i-csi/sun6i_video.h | 8 +- 4 files changed, 218 insertions(+), 222 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +166 -180
@@ -27,37 +27,20 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" -struct sun6i_csi_dev { -struct sun6i_csi csi; -struct device *dev; - -struct regmap *regmap; -struct clk *clk_mod; -struct clk *clk_ram; -struct reset_control *rstc_bus; - -int planar_offset[3 ]; -}; - -static inline struct sun6i_csi_dev *sun6i_csi_to_dev (struct sun6i_csi *csi) -{ - return container_of(csi, struct sun6i_csi_dev, csi); -} -/* TODO add 10&12 bit YUV, RGB support */ -bool sun6i_csi_is_format_supported (struct sun6i_csi *csi, +bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2;/* * Some video receivers have the ability to be compatible with * 8bit and 16bit bus width. * Identify the media bus format from device tree. */ -if ((sdev->csi.v4l2_ep.bus_type ==V4L2_MBUS_PARALLEL - || sdev->csi.v4l2_ep.bus_type ==V4L2_MBUS_BT656 ) - && sdev->csi.v4l2_ep.bus.parallel.bus_width ==16 ) { +if ((v4l2->v4l2_ep.bus_type ==V4L2_MBUS_PARALLEL + || v4l2->v4l2_ep.bus_type ==V4L2_MBUS_BT656 ) + && v4l2->v4l2_ep.bus.parallel.bus_width ==16 ) {switch (pixformat) {case V4L2_PIX_FMT_NV12_16L16 :case V4L2_PIX_FMT_NV12 :
@@ -74,13 +57,14 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,case MEDIA_BUS_FMT_YVYU8_1X16 :return true;default : -dev_dbg (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_dbg (csi_dev->dev, +"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }break ;default : -dev_dbg (sdev->dev,"Unsupported pixformat: 0x%x\n" , +dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat);break ; }
@@ -137,7 +121,7 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,case MEDIA_BUS_FMT_YVYU8_2X8 :return true;default : -dev_dbg (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_dbg (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }
@@ -152,50 +136,50 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,return (mbus_code ==MEDIA_BUS_FMT_JPEG_1X8 );default : -dev_dbg (sdev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); +dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , + pixformat);break ; }return false; } -int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable) +int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); -struct device *dev = sdev->dev; -struct regmap *regmap = sdev->regmap; +struct device *dev = csi_dev->dev; +struct regmap *regmap = csi_dev->regmap;int ret;if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); -clk_disable_unprepare (sdev->clk_ram); +clk_disable_unprepare (csi_dev->clk_ram);if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (sdev->clk_mod); -clk_disable_unprepare (sdev->clk_mod); -reset_control_assert (sdev->rstc_bus); +clk_rate_exclusive_put (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_mod); +reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (sdev->clk_mod); + ret =clk_prepare_enable (csi_dev->clk_mod);if (ret) { -dev_err (sdev->dev,"Enable csi clk err %d\n" , ret); +dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret);return ret; }if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (sdev->clk_mod,300000000 ); +clk_set_rate_exclusive (csi_dev->clk_mod,300000000 ); - ret =clk_prepare_enable (sdev->clk_ram); + ret =clk_prepare_enable (csi_dev->clk_ram);if (ret) { -dev_err (sdev->dev,"Enable clk_dram_csi clk err %d\n" , ret); +dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); goto clk_mod_disable; } - ret =reset_control_deassert (sdev->rstc_bus); + ret =reset_control_deassert (csi_dev->reset);if (ret) { -dev_err (sdev->dev,"reset err %d\n" , ret); +dev_err (csi_dev->dev,"reset err %d\n" , ret); goto clk_ram_disable; }
@@ -204,15 +188,15 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)return 0 ; clk_ram_disable: -clk_disable_unprepare (sdev->clk_ram); +clk_disable_unprepare (csi_dev->clk_ram); clk_mod_disable:if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (sdev->clk_mod); -clk_disable_unprepare (sdev->clk_mod); +clk_rate_exclusive_put (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_mod);return ret; } -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_dev *sdev, +static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev,u32 mbus_code,u32 pixformat) {/* non-YUV */
@@ -230,12 +214,13 @@ static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_dev *sdev, }/* not support YUV420 input format yet */ -dev_dbg (sdev->dev,"Select YUV422 as default input format of CSI.\n" ); +dev_dbg (csi_dev->dev,"Select YUV422 as default input format of CSI.\n" );return CSI_INPUT_FORMAT_YUV422 ; } -static enum csi_output_fmt get_csi_output_format (struct sun6i_csi_dev *sdev, -u32 pixformat,u32 field) +static enum csi_output_fmt +get_csi_output_format (struct sun6i_csi_device *csi_dev,u32 pixformat, +u32 field) {bool buf_interlaced = false;
@@ -294,14 +279,14 @@ static enum csi_output_fmt get_csi_output_format(struct sun6i_csi_dev *sdev,return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ;default : -dev_warn (sdev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); +dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat);break ; }return CSI_FIELD_RAW_8 ; } -static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_dev *sdev, +static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_device *csi_dev,u32 mbus_code,u32 pixformat) {/* Input sequence does not apply to non-YUV formats */
@@ -328,7 +313,7 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,case MEDIA_BUS_FMT_YVYU8_2X8 :return CSI_INPUT_SEQ_YVYU ;default : -dev_warn (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }
@@ -350,7 +335,7 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,case MEDIA_BUS_FMT_YVYU8_2X8 :return CSI_INPUT_SEQ_YUYV ;default : -dev_warn (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }
@@ -360,7 +345,7 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,return CSI_INPUT_SEQ_YUYV ;default : -dev_warn (sdev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , +dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , pixformat);break ; }
@@ -368,23 +353,23 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,return CSI_INPUT_SEQ_YUYV ; } -static void sun6i_csi_setup_bus (struct sun6i_csi_dev *sdev) +static void sun6i_csi_setup_bus (struct sun6i_csi_device *csi_dev) { -struct v4l2_fwnode_endpoint *endpoint = &sdev->csi.v4l2_ep; -struct sun6i_csi *csi = &sdev->csi; +struct v4l2_fwnode_endpoint *endpoint = &csi_dev->v4l2.v4l2_ep; +struct sun6i_csi_config *config = &csi_dev->config;unsigned char bus_width;u32 flags;u32 cfg;bool input_interlaced = false; -if (csi->config.field ==V4L2_FIELD_INTERLACED - || csi->config.field ==V4L2_FIELD_INTERLACED_TB - || csi->config.field ==V4L2_FIELD_INTERLACED_BT ) +if (config->field ==V4L2_FIELD_INTERLACED + || config->field ==V4L2_FIELD_INTERLACED_TB + || config->field ==V4L2_FIELD_INTERLACED_BT ) input_interlaced = true; bus_width = endpoint->bus.parallel.bus_width; -regmap_read (sdev->regmap,CSI_IF_CFG_REG , &cfg); +regmap_read (csi_dev->regmap,CSI_IF_CFG_REG , &cfg); cfg &= ~(CSI_IF_CFG_CSI_IF_MASK | CSI_IF_CFG_MIPI_IF_MASK | CSI_IF_CFG_IF_DATA_WIDTH_MASK |
@@ -432,7 +417,7 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_dev *sdev) cfg |=CSI_IF_CFG_CLK_POL_FALLING_EDGE ;break ;default : -dev_warn (sdev->dev,"Unsupported bus type: %d\n" , +dev_warn (csi_dev->dev,"Unsupported bus type: %d\n" , endpoint->bus_type);break ; }
@@ -450,54 +435,54 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_dev *sdev)case 16 :/* No need to configure DATA_WIDTH for 16bit */ break ;default : -dev_warn (sdev->dev,"Unsupported bus width: %u\n" , bus_width); +dev_warn (csi_dev->dev,"Unsupported bus width: %u\n" , bus_width);break ; } -regmap_write (sdev->regmap,CSI_IF_CFG_REG , cfg); +regmap_write (csi_dev->regmap,CSI_IF_CFG_REG , cfg); } -static void sun6i_csi_set_format (struct sun6i_csi_dev *sdev) +static void sun6i_csi_set_format (struct sun6i_csi_device *csi_dev) { -struct sun6i_csi *csi = &sdev->csi; +struct sun6i_csi_config *config = &csi_dev->config;u32 cfg;u32 val; -regmap_read (sdev->regmap,CSI_CH_CFG_REG , &cfg); +regmap_read (csi_dev->regmap,CSI_CH_CFG_REG , &cfg); cfg &= ~(CSI_CH_CFG_INPUT_FMT_MASK |CSI_CH_CFG_OUTPUT_FMT_MASK |CSI_CH_CFG_VFLIP_EN |CSI_CH_CFG_HFLIP_EN |CSI_CH_CFG_FIELD_SEL_MASK |CSI_CH_CFG_INPUT_SEQ_MASK ); - val =get_csi_input_format (sdev, csi->config.code, - csi->config.pixelformat); + val =get_csi_input_format (csi_dev, config->code, + config->pixelformat); cfg |=CSI_CH_CFG_INPUT_FMT (val); - val =get_csi_output_format (sdev, csi->config.pixelformat, - csi->config.field); + val =get_csi_output_format (csi_dev, config->pixelformat, + config->field); cfg |=CSI_CH_CFG_OUTPUT_FMT (val); - val =get_csi_input_seq (sdev, csi->config.code, - csi->config.pixelformat); + val =get_csi_input_seq (csi_dev, config->code, + config->pixelformat); cfg |=CSI_CH_CFG_INPUT_SEQ (val); -if (csi->config.field ==V4L2_FIELD_TOP ) +if (config->field ==V4L2_FIELD_TOP ) cfg |=CSI_CH_CFG_FIELD_SEL_FIELD0 ; -else if (csi->config.field ==V4L2_FIELD_BOTTOM ) +else if (config->field ==V4L2_FIELD_BOTTOM ) cfg |=CSI_CH_CFG_FIELD_SEL_FIELD1 ;else cfg |=CSI_CH_CFG_FIELD_SEL_BOTH ; -regmap_write (sdev->regmap,CSI_CH_CFG_REG , cfg); +regmap_write (csi_dev->regmap,CSI_CH_CFG_REG , cfg); } -static void sun6i_csi_set_window (struct sun6i_csi_dev *sdev) +static void sun6i_csi_set_window (struct sun6i_csi_device *csi_dev) { -struct sun6i_csi_config *config = &sdev->csi.config; +struct sun6i_csi_config *config = &csi_dev->config;u32 bytesperline_y;u32 bytesperline_c; -int *planar_offset = sdev->planar_offset; +int *planar_offset = csi_dev->planar_offset;u32 width = config->width;u32 height = config->height;u32 hor_len = width;
@@ -507,7 +492,7 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)case V4L2_PIX_FMT_YVYU :case V4L2_PIX_FMT_UYVY :case V4L2_PIX_FMT_VYUY : -dev_dbg (sdev->dev, +dev_dbg (csi_dev->dev,"Horizontal length should be 2 times of width for packed YUV formats!\n" ); hor_len = width *2 ;break ;
@@ -515,10 +500,10 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)break ; } -regmap_write (sdev->regmap,CSI_CH_HSIZE_REG , +regmap_write (csi_dev->regmap,CSI_CH_HSIZE_REG ,CSI_CH_HSIZE_HOR_LEN (hor_len) |CSI_CH_HSIZE_HOR_START (0 )); -regmap_write (sdev->regmap,CSI_CH_VSIZE_REG , +regmap_write (csi_dev->regmap,CSI_CH_VSIZE_REG ,CSI_CH_VSIZE_VER_LEN (height) |CSI_CH_VSIZE_VER_START (0 ));
@@ -550,7 +535,7 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)bytesperline_c * height;break ;default :/* raw */ -dev_dbg (sdev->dev, +dev_dbg (csi_dev->dev,"Calculating pixelformat(0x%x)'s bytesperline as a packed format\n" , config->pixelformat); bytesperline_y = (sun6i_csi_get_bpp(config->pixelformat) *
@@ -561,46 +546,42 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)break ; } -regmap_write (sdev->regmap,CSI_CH_BUF_LEN_REG , +regmap_write (csi_dev->regmap,CSI_CH_BUF_LEN_REG ,CSI_CH_BUF_LEN_BUF_LEN_C (bytesperline_c) |CSI_CH_BUF_LEN_BUF_LEN_Y (bytesperline_y)); } -int sun6i_csi_update_config (struct sun6i_csi *csi, +int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); -if (!config)return -EINVAL ; -memcpy (&csi->config, config,sizeof (csi->config)); +memcpy (&csi_dev->config, config,sizeof (csi_dev->config)); -sun6i_csi_setup_bus (sdev); -sun6i_csi_set_format (sdev); -sun6i_csi_set_window (sdev); +sun6i_csi_setup_bus (csi_dev); +sun6i_csi_set_format (csi_dev); +sun6i_csi_set_window (csi_dev);return 0 ; } -void sun6i_csi_update_buf_addr (struct sun6i_csi *csi,dma_addr_t addr) +void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, +dma_addr_t addr) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); - -regmap_write (sdev->regmap,CSI_CH_F0_BUFA_REG , - (addr + sdev->planar_offset[0 ]) >>2 ); -if (sdev->planar_offset[1 ] !=-1 ) -regmap_write (sdev->regmap,CSI_CH_F1_BUFA_REG , - (addr + sdev->planar_offset[1 ]) >>2 ); -if (sdev->planar_offset[2 ] !=-1 ) -regmap_write (sdev->regmap,CSI_CH_F2_BUFA_REG , - (addr + sdev->planar_offset[2 ]) >>2 ); +regmap_write (csi_dev->regmap,CSI_CH_F0_BUFA_REG , + (addr + csi_dev->planar_offset[0 ]) >>2 ); +if (csi_dev->planar_offset[1 ] !=-1 ) +regmap_write (csi_dev->regmap,CSI_CH_F1_BUFA_REG , + (addr + csi_dev->planar_offset[1 ]) >>2 ); +if (csi_dev->planar_offset[2 ] !=-1 ) +regmap_write (csi_dev->regmap,CSI_CH_F2_BUFA_REG , + (addr + csi_dev->planar_offset[2 ]) >>2 ); } -void sun6i_csi_set_stream (struct sun6i_csi *csi,bool enable) +void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); -struct regmap *regmap = sdev->regmap; +struct regmap *regmap = csi_dev->regmap;if (!enable) {regmap_update_bits (regmap,CSI_CAP_REG ,CSI_CAP_CH0_VCAP_ON ,0 );
@@ -624,7 +605,7 @@ void sun6i_csi_set_stream(struct sun6i_csi *csi, bool enable)/* ----------------------------------------------------------------------------- * Media Controller and V4L2 */ -static int sun6i_csi_link_entity (struct sun6i_csi *csi, +static int sun6i_csi_link_entity (struct sun6i_csi_device *csi_dev,struct media_entity *entity,struct fwnode_handle *fwnode) {
@@ -635,24 +616,25 @@ static int sun6i_csi_link_entity(struct sun6i_csi *csi, ret =media_entity_get_fwnode_pad (entity, fwnode,MEDIA_PAD_FL_SOURCE );if (ret <0 ) { -dev_err (csi->dev,"%s: no source pad in external entity %s\n" , - __func__, entity->name); +dev_err (csi_dev->dev, +"%s: no source pad in external entity %s\n" , __func__, + entity->name);return -EINVAL ; } src_pad_index = ret; - sink = &csi->video.vdev.entity; - sink_pad = &csi->video.pad; + sink = &csi_dev->video.vdev.entity; + sink_pad = &csi_dev->video.pad; -dev_dbg (csi->dev,"creating %s:%u -> %s:%u link\n" , +dev_dbg (csi_dev->dev,"creating %s:%u -> %s:%u link\n" , entity->name, src_pad_index, sink->name, sink_pad->index); ret =media_create_pad_link (entity, src_pad_index, sink, sink_pad->index,MEDIA_LNK_FL_ENABLED |MEDIA_LNK_FL_IMMUTABLE );if (ret <0 ) { -dev_err (csi->dev,"failed to create %s:%u -> %s:%u link\n" , +dev_err (csi_dev->dev,"failed to create %s:%u -> %s:%u link\n" , entity->name, src_pad_index, sink->name, sink_pad->index);return ret;
@@ -663,27 +645,29 @@ static int sun6i_csi_link_entity(struct sun6i_csi *csi,static int sun6i_subdev_notify_complete (struct v4l2_async_notifier *notifier) { - struct sun6i_csi *csi = container_of(notifier, struct sun6i_csi, - notifier); -struct v4l2_device *v4l2_dev = &csi->v4l2_dev; +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + v4l2.notifier); +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; +struct v4l2_device *v4l2_dev = &v4l2->v4l2_dev;struct v4l2_subdev *sd;int ret; -dev_dbg (csi->dev,"notify complete, all subdevs registered\n" ); +dev_dbg (csi_dev->dev,"notify complete, all subdevs registered\n" ); sd = list_first_entry(&v4l2_dev->subdevs, struct v4l2_subdev, list);if (!sd)return -EINVAL ; - ret =sun6i_csi_link_entity (csi, &sd->entity, sd->fwnode); + ret =sun6i_csi_link_entity (csi_dev, &sd->entity, sd->fwnode);if (ret <0 )return ret; - ret =v4l2_device_register_subdev_nodes (&csi->v4l2_dev); + ret =v4l2_device_register_subdev_nodes (v4l2_dev);if (ret <0 )return ret; -return media_device_register (&csi->media_dev); +return media_device_register (&v4l2->media_dev); }static const struct v4l2_async_notifier_operations sun6i_csi_async_ops = {
@@ -694,7 +678,7 @@ static int sun6i_csi_fwnode_parse(struct device *dev,struct v4l2_fwnode_endpoint *vep, struct v4l2_async_subdev *asd) { - struct sun6i_csi *csi = dev_get_drvdata(dev); + struct sun6i_csi_device *csi_dev = dev_get_drvdata(dev);if (vep->base.port || vep->base.id) {dev_warn (dev,"Only support a single port with one endpoint\n" );
@@ -704,7 +688,7 @@ static int sun6i_csi_fwnode_parse(struct device *dev,switch (vep->bus_type) {case V4L2_MBUS_PARALLEL :case V4L2_MBUS_BT656 : - csi->v4l2_ep = *vep; + csi_dev->v4l2.v4l2_ep = *vep;return 0 ;default :dev_err (dev,"Unsupported media bus type\n" );
@@ -712,76 +696,79 @@ static int sun6i_csi_fwnode_parse(struct device *dev, } } -static void sun6i_csi_v4l2_cleanup (struct sun6i_csi *csi) +static void sun6i_csi_v4l2_cleanup (struct sun6i_csi_device *csi_dev) { -media_device_unregister (&csi->media_dev); -v4l2_async_nf_unregister (&csi->notifier); -v4l2_async_nf_cleanup (&csi->notifier); -sun6i_video_cleanup (&csi->video); -v4l2_device_unregister (&csi->v4l2_dev); -v4l2_ctrl_handler_free (&csi->ctrl_handler); -media_device_cleanup (&csi->media_dev); +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; + +media_device_unregister (&v4l2->media_dev); +v4l2_async_nf_unregister (&v4l2->notifier); +v4l2_async_nf_cleanup (&v4l2->notifier); +sun6i_video_cleanup (&csi_dev->video); +v4l2_device_unregister (&v4l2->v4l2_dev); +v4l2_ctrl_handler_free (&v4l2->ctrl_handler); +media_device_cleanup (&v4l2->media_dev); } -static int sun6i_csi_v4l2_init (struct sun6i_csi *csi) +static int sun6i_csi_v4l2_init (struct sun6i_csi_device *csi_dev) { +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2;int ret; - csi->media_dev.dev = csi->dev; -strscpy (csi->media_dev.model,SUN6I_CSI_DESCRIPTION , -sizeof (csi->media_dev.model)); - csi->media_dev.hw_revision =0 ; + v4l2->media_dev.dev = csi_dev->dev; +strscpy (v4l2->media_dev.model,SUN6I_CSI_DESCRIPTION , +sizeof (v4l2->media_dev.model)); + v4l2->media_dev.hw_revision =0 ; -media_device_init (&csi->media_dev); -v4l2_async_nf_init (&csi->notifier); +media_device_init (&v4l2->media_dev); +v4l2_async_nf_init (&v4l2->notifier); - ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,0 ); + ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 );if (ret) { -dev_err (csi->dev,"V4L2 controls handler init failed (%d)\n" , +dev_err (csi_dev->dev,"V4L2 controls handler init failed (%d)\n" , ret); goto clean_media; } - csi->v4l2_dev.mdev = &csi->media_dev; - csi->v4l2_dev.ctrl_handler = &csi->ctrl_handler; - ret =v4l2_device_register (csi->dev, &csi->v4l2_dev); + v4l2->v4l2_dev.mdev = &v4l2->media_dev; + v4l2->v4l2_dev.ctrl_handler = &v4l2->ctrl_handler; + ret =v4l2_device_register (csi_dev->dev, &v4l2->v4l2_dev);if (ret) { -dev_err (csi->dev,"V4L2 device registration failed (%d)\n" , +dev_err (csi_dev->dev,"V4L2 device registration failed (%d)\n" , ret); goto free_ctrl; } - ret =sun6i_video_init (&csi->video, csi,SUN6I_CSI_NAME ); + ret =sun6i_video_init (&csi_dev->video, csi_dev,SUN6I_CSI_NAME );if (ret) goto unreg_v4l2; - ret =v4l2_async_nf_parse_fwnode_endpoints (csi->dev, - &csi->notifier, + ret =v4l2_async_nf_parse_fwnode_endpoints (csi_dev->dev, + &v4l2->notifier,sizeof (struct v4l2_async_subdev ), sun6i_csi_fwnode_parse);if (ret) goto clean_video; - csi->notifier.ops = &sun6i_csi_async_ops; + v4l2->notifier.ops = &sun6i_csi_async_ops; - ret =v4l2_async_nf_register (&csi->v4l2_dev, &csi->notifier); + ret =v4l2_async_nf_register (&v4l2->v4l2_dev, &v4l2->notifier);if (ret) { -dev_err (csi->dev,"notifier registration failed\n" ); +dev_err (csi_dev->dev,"notifier registration failed\n" ); goto clean_video; }return 0 ; clean_video: -sun6i_video_cleanup (&csi->video); +sun6i_video_cleanup (&csi_dev->video); unreg_v4l2: -v4l2_device_unregister (&csi->v4l2_dev); +v4l2_device_unregister (&v4l2->v4l2_dev); free_ctrl: -v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_ctrl_handler_free (&v4l2->ctrl_handler); clean_media: -v4l2_async_nf_cleanup (&csi->notifier); -media_device_cleanup (&csi->media_dev); +v4l2_async_nf_cleanup (&v4l2->notifier); +media_device_cleanup (&v4l2->media_dev);return ret; }
@@ -791,8 +778,8 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)*/ static irqreturn_t sun6i_csi_isr (int irq,void *dev_id) { -struct sun6i_csi_dev *sdev = (struct sun6i_csi_dev *)dev_id; -struct regmap *regmap = sdev->regmap; +struct sun6i_csi_device *csi_dev = (struct sun6i_csi_device *)dev_id; +struct regmap *regmap = csi_dev->regmap;u32 status;regmap_read (regmap,CSI_CH_INT_STA_REG , &status);
@@ -812,7 +799,7 @@ static irqreturn_t sun6i_csi_isr(int irq, void *dev_id) }if (status &CSI_CH_INT_STA_FD_PD ) -sun6i_video_frame_done (&sdev->csi.video); +sun6i_video_frame_done (&csi_dev->video);regmap_write (regmap,CSI_CH_INT_STA_REG , status);
@@ -826,7 +813,7 @@ static const struct regmap_config sun6i_csi_regmap_config = { .max_register = 0x9c, }; -static int sun6i_csi_resource_request (struct sun6i_csi_dev *sdev, +static int sun6i_csi_resource_request (struct sun6i_csi_device *csi_dev,struct platform_device *pdev) {void __iomem *io_base;
@@ -837,29 +824,29 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,if (IS_ERR (io_base))return PTR_ERR (io_base); - sdev->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"bus" , io_base, - &sun6i_csi_regmap_config); -if (IS_ERR (sdev->regmap)) { + csi_dev->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"bus" , io_base, + &sun6i_csi_regmap_config); +if (IS_ERR (csi_dev->regmap)) {dev_err (&pdev->dev,"Failed to init register map\n" ); -return PTR_ERR (sdev->regmap); +return PTR_ERR (csi_dev->regmap); } - sdev->clk_mod =devm_clk_get (&pdev->dev,"mod" ); -if (IS_ERR (sdev->clk_mod)) { + csi_dev->clk_mod =devm_clk_get (&pdev->dev,"mod" ); +if (IS_ERR (csi_dev->clk_mod)) {dev_err (&pdev->dev,"Unable to acquire csi clock\n" ); -return PTR_ERR (sdev->clk_mod); +return PTR_ERR (csi_dev->clk_mod); } - sdev->clk_ram =devm_clk_get (&pdev->dev,"ram" ); -if (IS_ERR (sdev->clk_ram)) { + csi_dev->clk_ram =devm_clk_get (&pdev->dev,"ram" ); +if (IS_ERR (csi_dev->clk_ram)) {dev_err (&pdev->dev,"Unable to acquire dram-csi clock\n" ); -return PTR_ERR (sdev->clk_ram); +return PTR_ERR (csi_dev->clk_ram); } - sdev->rstc_bus =devm_reset_control_get_shared (&pdev->dev,NULL ); -if (IS_ERR (sdev->rstc_bus)) { + csi_dev->reset =devm_reset_control_get_shared (&pdev->dev,NULL ); +if (IS_ERR (csi_dev->reset)) {dev_err (&pdev->dev,"Cannot get reset controller\n" ); -return PTR_ERR (sdev->rstc_bus); +return PTR_ERR (csi_dev->reset); } irq =platform_get_irq (pdev,0 );
@@ -867,7 +854,7 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,return -ENXIO ; ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 , -SUN6I_CSI_NAME , sdev); +SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (&pdev->dev,"Cannot request csi IRQ\n" );return ret;
@@ -878,30 +865,29 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,static int sun6i_csi_probe (struct platform_device *pdev) { -struct sun6i_csi_dev *sdev; +struct sun6i_csi_device *csi_dev;int ret; - sdev =devm_kzalloc (&pdev->dev,sizeof (*sdev),GFP_KERNEL ); -if (!sdev) + csi_dev =devm_kzalloc (&pdev->dev,sizeof (*csi_dev),GFP_KERNEL ); +if (!csi_dev)return -ENOMEM ; - sdev->dev = &pdev->dev; + csi_dev->dev = &pdev->dev; - ret =sun6i_csi_resource_request (sdev, pdev); + ret =sun6i_csi_resource_request (csi_dev, pdev);if (ret)return ret; -platform_set_drvdata (pdev, sdev); +platform_set_drvdata (pdev, csi_dev); - sdev->csi.dev = &pdev->dev; -return sun6i_csi_v4l2_init (&sdev->csi); +return sun6i_csi_v4l2_init (csi_dev); }static int sun6i_csi_remove (struct platform_device *pdev) { -struct sun6i_csi_dev *sdev =platform_get_drvdata (pdev); +struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev); -sun6i_csi_v4l2_cleanup (&sdev->csi); +sun6i_csi_v4l2_cleanup (csi_dev);return 0 ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +21 -13
@@ -17,8 +17,6 @@#define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" -struct sun6i_csi ; -/** * struct sun6i_csi_config - configs for sun6i csi * @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*)
@@ -35,20 +33,29 @@ struct sun6i_csi_config {u32 height; }; -struct sun6i_csi { -struct device *dev; -struct v4l2_ctrl_handler ctrl_handler; +struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev; +struct v4l2_ctrl_handler ctrl_handler;struct media_device media_dev;struct v4l2_async_notifier notifier; -/* video port settings */ struct v4l2_fwnode_endpoint v4l2_ep; +}; -struct sun6i_csi_config config; +struct sun6i_csi_device { +struct device *dev; +struct sun6i_csi_config config; +struct sun6i_csi_v4l2 v4l2;struct sun6i_video video; + +struct regmap *regmap; +struct clk *clk_mod; +struct clk *clk_ram; +struct reset_control *reset; + +int planar_offset[3 ]; };/**
@@ -57,22 +64,22 @@ struct sun6i_csi {* @pixformat: v4l2 pixel format (V4L2_PIX_FMT_*) * @mbus_code: media bus format code (MEDIA_BUS_FMT_*) */ -bool sun6i_csi_is_format_supported (struct sun6i_csi *csi,u32 pixformat, -u32 mbus_code); +bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev, +u32 pixformat,u32 mbus_code);/** * sun6i_csi_set_power() - power on/off the csi * @csi: pointer to the csi * @enable: on/off */ -int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable); +int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable);/** * sun6i_csi_update_config() - update the csi register settings * @csi: pointer to the csi * @config: see struct sun6i_csi_config */ -int sun6i_csi_update_config (struct sun6i_csi *csi, +int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config);/**
@@ -80,14 +87,15 @@ int sun6i_csi_update_config(struct sun6i_csi *csi,* @csi: pointer to the csi * @addr: frame buffer's physical address */ -void sun6i_csi_update_buf_addr (struct sun6i_csi *csi,dma_addr_t addr); +void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, +dma_addr_t addr);/** * sun6i_csi_set_stream() - start/stop csi streaming * @csi: pointer to the csi * @enable: start/stop */ -void sun6i_csi_set_stream (struct sun6i_csi *csi,bool enable); +void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable);/* get bpp form v4l2 pixformat */ static inline int sun6i_csi_get_bpp (unsigned int pixformat)
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +27 -25
173 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +4 -4
@@ -11,12 +11,12 @@#include <media/v4l2-dev.h> #include <media/videobuf2-core.h> -struct sun6i_csi ; +struct sun6i_csi_device ;struct sun6i_video { +struct sun6i_csi_device *csi_dev;struct video_device vdev;struct media_pad pad; -struct sun6i_csi *csi;struct mutex lock;
@@ -29,8 +29,8 @@ struct sun6i_video {u32 mbus_code; }; -int sun6i_video_init (struct sun6i_video *video,struct sun6i_csi *csi, -const char *name); +int sun6i_video_init (struct sun6i_video *video, +struct sun6i_csi_device *csi_dev,const char *name);void sun6i_video_cleanup (struct sun6i_video *video);void sun6i_video_frame_done (struct sun6i_video *video);
Signature · 1 line
2.36.1
PATCH v5 3/44 media: sun6i-csi: Tidy up platform code
In reply to Paul KocialkowskiVarious renames, variables lowering and other cosmetic changes in the platform-support code. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 98 ++++++++++--------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 +- 2 files changed, 56 insertions(+), 46 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +54 -44
@@ -153,25 +153,25 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); -clk_disable_unprepare (csi_dev->clk_ram); +clk_disable_unprepare (csi_dev->clock_ram);if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod); -clk_disable_unprepare (csi_dev->clk_mod); +clk_rate_exclusive_put (csi_dev->clock_mod); +clk_disable_unprepare (csi_dev->clock_mod);reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (csi_dev->clk_mod); + ret =clk_prepare_enable (csi_dev->clock_mod);if (ret) {dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret);return ret; }if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (csi_dev->clk_mod,300000000 ); +clk_set_rate_exclusive (csi_dev->clock_mod,300000000 ); - ret =clk_prepare_enable (csi_dev->clk_ram); + ret =clk_prepare_enable (csi_dev->clock_ram);if (ret) {dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); goto clk_mod_disable;
@@ -188,11 +188,11 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)return 0 ; clk_ram_disable: -clk_disable_unprepare (csi_dev->clk_ram); +clk_disable_unprepare (csi_dev->clock_ram); clk_mod_disable:if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod); -clk_disable_unprepare (csi_dev->clk_mod); +clk_rate_exclusive_put (csi_dev->clock_mod); +clk_disable_unprepare (csi_dev->clock_mod);return ret; }
@@ -773,12 +773,11 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi_device *csi_dev)return ret; } -/* ----------------------------------------------------------------------------- -* Resources and IRQ -*/ -static irqreturn_t sun6i_csi_isr (int irq,void *dev_id) +/* Platform */ + +static irqreturn_t sun6i_csi_interrupt (int irq,void *private) { -struct sun6i_csi_device *csi_dev = (struct sun6i_csi_device *)dev_id; +struct sun6i_csi_device *csi_dev = private;struct regmap *regmap = csi_dev->regmap;u32 status;
@@ -813,73 +812,82 @@ static const struct regmap_config sun6i_csi_regmap_config = { .max_register = 0x9c, }; -static int sun6i_csi_resource_request (struct sun6i_csi_device *csi_dev, -struct platform_device *pdev) +static int sun6i_csi_resources_setup (struct sun6i_csi_device *csi_dev, +struct platform_device *platform_dev) { +struct device *dev = csi_dev->dev;void __iomem *io_base;int ret;int irq; - io_base =devm_platform_ioremap_resource (pdev,0 ); +/* Registers */ + + io_base =devm_platform_ioremap_resource (platform_dev,0 );if (IS_ERR (io_base))return PTR_ERR (io_base); - csi_dev->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"bus" , io_base, + csi_dev->regmap =devm_regmap_init_mmio_clk (dev,"bus" , io_base, &sun6i_csi_regmap_config);if (IS_ERR (csi_dev->regmap)) { -dev_err (&pdev->dev,"Failed to init register map\n" ); +dev_err (dev,"failed to init register map\n" );return PTR_ERR (csi_dev->regmap); } - csi_dev->clk_mod =devm_clk_get (&pdev->dev,"mod" ); -if (IS_ERR (csi_dev->clk_mod)) { -dev_err (&pdev->dev,"Unable to acquire csi clock\n" ); -return PTR_ERR (csi_dev->clk_mod); +/* Clocks */ + + csi_dev->clock_mod =devm_clk_get (dev,"mod" ); +if (IS_ERR (csi_dev->clock_mod)) { +dev_err (dev,"failed to acquire module clock\n" ); +return PTR_ERR (csi_dev->clock_mod); } - csi_dev->clk_ram =devm_clk_get (&pdev->dev,"ram" ); -if (IS_ERR (csi_dev->clk_ram)) { -dev_err (&pdev->dev,"Unable to acquire dram-csi clock\n" ); -return PTR_ERR (csi_dev->clk_ram); + csi_dev->clock_ram =devm_clk_get (dev,"ram" ); +if (IS_ERR (csi_dev->clock_ram)) { +dev_err (dev,"failed to acquire ram clock\n" ); +return PTR_ERR (csi_dev->clock_ram); } - csi_dev->reset =devm_reset_control_get_shared (&pdev->dev,NULL ); +/* Reset */ + + csi_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi_dev->reset)) { -dev_err (&pdev->dev,"Cannot get reset controller\n" ); +dev_err (dev,"failed to acquire reset\n" );return PTR_ERR (csi_dev->reset); } - irq =platform_get_irq (pdev,0 ); +/* Interrupt */ + + irq =platform_get_irq (platform_dev,0 );if (irq <0 )return -ENXIO ; - ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 , -SUN6I_CSI_NAME , csi_dev); + ret =devm_request_irq (dev, irq, sun6i_csi_interrupt,0 ,SUN6I_CSI_NAME , + csi_dev);if (ret) { -dev_err (&pdev->dev,"Cannot request csi IRQ\n" ); +dev_err (dev,"failed to request interrupt\n" );return ret; }return 0 ; } -static int sun6i_csi_probe (struct platform_device *pdev) +static int sun6i_csi_probe (struct platform_device *platform_dev) {struct sun6i_csi_device *csi_dev; +struct device *dev = &platform_dev->dev;int ret; - csi_dev =devm_kzalloc (&pdev->dev,sizeof (*csi_dev),GFP_KERNEL ); + csi_dev =devm_kzalloc (dev,sizeof (*csi_dev),GFP_KERNEL );if (!csi_dev)return -ENOMEM ; - csi_dev->dev = &pdev->dev; + csi_dev->dev = &platform_dev->dev; +platform_set_drvdata (platform_dev, csi_dev); - ret =sun6i_csi_resource_request (csi_dev, pdev); + ret =sun6i_csi_resources_setup (csi_dev, platform_dev);if (ret)return ret; -platform_set_drvdata (pdev, csi_dev); -return sun6i_csi_v4l2_init (csi_dev); }
@@ -900,16 +908,18 @@ static const struct of_device_id sun6i_csi_of_match[] = { { .compatible = "allwinner,sun50i-a64-csi", }, {}, }; +MODULE_DEVICE_TABLE (of, sun6i_csi_of_match);static struct platform_driver sun6i_csi_platform_driver = { - .probe = sun6i_csi_probe, - .remove = sun6i_csi_remove, - .driver = { - .name =SUN6I_CSI_NAME , - .of_match_table =of_match_ptr (sun6i_csi_of_match), + .probe = sun6i_csi_probe, + .remove = sun6i_csi_remove, + .driver = { + .name =SUN6I_CSI_NAME , + .of_match_table =of_match_ptr (sun6i_csi_of_match), }, }; +module_platform_driver (sun6i_csi_platform_driver);MODULE_DESCRIPTION ("Allwinner A31 Camera Sensor Interface driver" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +2 -2
@@ -51,8 +51,8 @@ struct sun6i_csi_device {struct sun6i_video video;struct regmap *regmap; -struct clk *clk_mod; -struct clk *clk_ram; +struct clk *clock_mod; +struct clk *clock_ram;struct reset_control *reset;int planar_offset[3 ];
Signature · 1 line
2.36.1
PATCH v5 4/44 media: sun6i-csi: Always set exclusive module clock rate
In reply to Paul KocialkowskiIn some situations the default rate of the module clock is not the required one for operation (for example when reconfiguring the clock tree to use a different parent). As a result, always set the correct rate for the clock (and take care of cleanup).
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +41 -13
@@ -154,9 +154,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (csi_dev->clock_ram); -if (of_device_is_compatible (dev->of_node, -"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clock_mod);clk_disable_unprepare (csi_dev->clock_mod);reset_control_assert (csi_dev->reset);return 0 ;
@@ -168,9 +165,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)return ret; } -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (csi_dev->clock_mod,300000000 ); - ret =clk_prepare_enable (csi_dev->clock_ram);if (ret) {dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret);
@@ -190,8 +184,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) clk_ram_disable:clk_disable_unprepare (csi_dev->clock_ram); clk_mod_disable: -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clock_mod);clk_disable_unprepare (csi_dev->clock_mod);return ret; }
@@ -816,6 +808,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, struct platform_device *platform_dev) {struct device *dev = csi_dev->dev; +unsigned long clock_mod_rate;void __iomem *io_base;int ret;int irq;
@@ -847,28 +840,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clock_ram); } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) + clock_mod_rate =300000000 ; +else + clock_mod_rate =297000000 ; + + ret =clk_set_rate_exclusive (csi_dev->clock_mod, clock_mod_rate); +if (ret) { +dev_err (dev,"failed to set mod clock rate\n" ); +return ret; + } +/* Reset */ csi_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi_dev->reset)) {dev_err (dev,"failed to acquire reset\n" ); -return PTR_ERR (csi_dev->reset); + ret =PTR_ERR (csi_dev->reset); + goto error_clock_rate_exclusive; }/* Interrupt */ irq =platform_get_irq (platform_dev,0 ); -if (irq <0 ) -return -ENXIO ; +if (irq <0 ) { +dev_err (dev,"failed to get interrupt\n" ); + ret = -ENXIO ; + goto error_clock_rate_exclusive; + } ret =devm_request_irq (dev, irq, sun6i_csi_interrupt,0 ,SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (dev,"failed to request interrupt\n" ); -return ret; + goto error_clock_rate_exclusive; }return 0 ; + +error_clock_rate_exclusive: +clk_rate_exclusive_put (csi_dev->clock_mod); + +return ret; +} + +static void sun6i_csi_resources_cleanup (struct sun6i_csi_device *csi_dev) +{ +clk_rate_exclusive_put (csi_dev->clock_mod); }static int sun6i_csi_probe (struct platform_device *platform_dev)
@@ -888,7 +906,16 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret)return ret; -return sun6i_csi_v4l2_init (csi_dev); + ret =sun6i_csi_v4l2_init (csi_dev); +if (ret) + goto error_resources; + +return 0 ; + +error_resources: +sun6i_csi_resources_cleanup (csi_dev); + +return ret; }static int sun6i_csi_remove (struct platform_device *pdev)
@@ -896,6 +923,7 @@ static int sun6i_csi_remove(struct platform_device *pdev)struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev);sun6i_csi_v4l2_cleanup (csi_dev); +sun6i_csi_resources_cleanup (csi_dev);return 0 ; }
Signature · 1 line
2.36.1
PATCH v5 5/44 media: sun6i-csi: Define and use variant to get module clock rate
In reply to Paul KocialkowskiIntroduce a proper variant structure with the module clock rate instead of hardcoding it with a manual check on the compatible.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 47 ++++++++++++++----- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 ++ 2 files changed, 39 insertions(+), 12 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +35 -12
@@ -808,11 +808,15 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, struct platform_device *platform_dev) {struct device *dev = csi_dev->dev; -unsigned long clock_mod_rate; +const struct sun6i_csi_variant *variant;void __iomem *io_base;int ret;int irq; + variant =of_device_get_match_data (dev); +if (!variant) +return -EINVAL ; +/* Registers */ io_base =devm_platform_ioremap_resource (platform_dev,0 );
@@ -840,12 +844,8 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clock_ram); } -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) - clock_mod_rate =300000000 ; -else - clock_mod_rate =297000000 ; - - ret =clk_set_rate_exclusive (csi_dev->clock_mod, clock_mod_rate); + ret =clk_set_rate_exclusive (csi_dev->clock_mod, + variant->clock_mod_rate);if (ret) {dev_err (dev,"failed to set mod clock rate\n" );return ret;
@@ -928,12 +928,35 @@ static int sun6i_csi_remove(struct platform_device *pdev)return 0 ; } +static const struct sun6i_csi_variant sun6i_a31_csi_variant = { + .clock_mod_rate =297000000 , +}; + +static const struct sun6i_csi_variant sun50i_a64_csi_variant = { + .clock_mod_rate =300000000 , +}; +static const struct of_device_id sun6i_csi_of_match[] = { - { .compatible ="allwinner,sun6i-a31-csi" , }, - { .compatible ="allwinner,sun8i-a83t-csi" , }, - { .compatible ="allwinner,sun8i-h3-csi" , }, - { .compatible ="allwinner,sun8i-v3s-csi" , }, - { .compatible ="allwinner,sun50i-a64-csi" , }, + { + .compatible ="allwinner,sun6i-a31-csi" , + .data = &sun6i_a31_csi_variant, + }, + { + .compatible ="allwinner,sun8i-a83t-csi" , + .data = &sun6i_a31_csi_variant, + }, + { + .compatible ="allwinner,sun8i-h3-csi" , + .data = &sun6i_a31_csi_variant, + }, + { + .compatible ="allwinner,sun8i-v3s-csi" , + .data = &sun6i_a31_csi_variant, + }, + { + .compatible ="allwinner,sun50i-a64-csi" , + .data = &sun50i_a64_csi_variant, + }, {}, };
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +4 -0
@@ -58,6 +58,10 @@ struct sun6i_csi_device {int planar_offset[3 ]; }; +struct sun6i_csi_variant { +unsigned long clock_mod_rate; +}; +/** * sun6i_csi_is_format_supported() - check if the format supported by csi * @csi: pointer to the csi
Signature · 1 line
2.36.1
PATCH v5 6/44 media: sun6i-csi: Use runtime pm for clocks and reset
In reply to Paul KocialkowskiWrap the clock and reset preparation into runtime pm functions for better organization of the code. Also fix the clock and reset enable order to first deassert reset, as recommended in Allwinner literature.
Make the driver depend on PM while at it since runtime pm is mandatory for the driver to work.
--- .../media/platform/sunxi/sun6i-csi/Kconfig | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 84 +++++++++++++------ 2 files changed, 60 insertions(+), 26 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/Kconfig +1 -1
@@ -2,7 +2,7 @@ config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && HAS_DMA && PM depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +59 -25
123 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 7/44 media: sun6i-csi: Tidy up Kconfig
In reply to Paul KocialkowskiUpdate the option title and help, group related options together, add dependency on VIDEO_DEV since the driver uses it and update the description.
--- drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/Kconfig +7 -5
@@ -1,13 +1,15 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_SUN6I_CSI - tristate "Allwinner V3s Camera Sensor Interface driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA && PM + tristate "Allwinner A31 Camera Sensor Interface (CSI) Driver" + depends on V4L_PLATFORM_DRIVERS && VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST + depends on PM && COMMON_CLK && HAS_DMA select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEOBUF2_DMA_CONTIG - select REGMAP_MMIO select V4L2_FWNODE + select REGMAP_MMIO help - Support for the Allwinner Camera Sensor Interface Controller on V3s. + Support for the Allwinner A31 Camera Sensor Interface (CSI) + controller, also found on other platforms such as the A83T, H3, + V3/V3s or A64.
Signature · 1 line
2.36.1
PATCH v5 8/44 media: sun6i-csi: Tidy up v4l2 code
In reply to Paul KocialkowskiVarious cosmetic improvements to the v4l2 registration code, with renames, lowerings, etc. The cleanup function is moved down after setup. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 113 ++++++++++-------- 1 file changed, 66 insertions(+), 47 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +66 -47
@@ -27,6 +27,8 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" +/* Helpers */ +/* TODO add 10&12 bit YUV, RGB support */ bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code)
@@ -572,9 +574,8 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) CSI_CAP_CH0_VCAP_ON); } -/* ----------------------------------------------------------------------------- -* Media Controller and V4L2 -*/ +/* V4L2 */ +static int sun6i_csi_link_entity (struct sun6i_csi_device *csi_dev,struct media_entity *entity,struct fwnode_handle *fwnode)
@@ -666,83 +667,101 @@ static int sun6i_csi_fwnode_parse(struct device *dev, } } -static void sun6i_csi_v4l2_cleanup (struct sun6i_csi_device *csi_dev) +static int sun6i_csi_v4l2_setup (struct sun6i_csi_device *csi_dev) {struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; +struct media_device *media_dev = &v4l2->media_dev; +struct v4l2_device *v4l2_dev = &v4l2->v4l2_dev; +struct v4l2_async_notifier *notifier = &v4l2->notifier; +struct device *dev = csi_dev->dev; +int ret; -media_device_unregister (&v4l2->media_dev); -v4l2_async_nf_unregister (&v4l2->notifier); -v4l2_async_nf_cleanup (&v4l2->notifier); -sun6i_video_cleanup (&csi_dev->video); -v4l2_device_unregister (&v4l2->v4l2_dev); -v4l2_ctrl_handler_free (&v4l2->ctrl_handler); -media_device_cleanup (&v4l2->media_dev); -} +/* Media Device */ -static int sun6i_csi_v4l2_init (struct sun6i_csi_device *csi_dev) -{ -struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; -int ret; +strscpy (media_dev->model,SUN6I_CSI_DESCRIPTION , +sizeof (media_dev->model)); + media_dev->hw_revision =0 ; + media_dev->dev = dev; - v4l2->media_dev.dev = csi_dev->dev; -strscpy (v4l2->media_dev.model,SUN6I_CSI_DESCRIPTION , -sizeof (v4l2->media_dev.model)); - v4l2->media_dev.hw_revision =0 ; +media_device_init (media_dev); -media_device_init (&v4l2->media_dev); -v4l2_async_nf_init (&v4l2->notifier); +/* V4L2 Control Handler */ ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 );if (ret) { -dev_err (csi_dev->dev,"V4L2 controls handler init failed (%d)\n" , - ret); - goto clean_media; +dev_err (dev,"failed to init v4l2 control handler: %d\n" , ret); + goto error_media; } - v4l2->v4l2_dev.mdev = &v4l2->media_dev; - v4l2->v4l2_dev.ctrl_handler = &v4l2->ctrl_handler; - ret =v4l2_device_register (csi_dev->dev, &v4l2->v4l2_dev); +/* V4L2 Device */ + + v4l2_dev->mdev = media_dev; + v4l2_dev->ctrl_handler = &v4l2->ctrl_handler; + + ret =v4l2_device_register (dev, v4l2_dev);if (ret) { -dev_err (csi_dev->dev,"V4L2 device registration failed (%d)\n" , - ret); - goto free_ctrl; +dev_err (dev,"failed to register v4l2 device: %d\n" , ret); + goto error_v4l2_ctrl; } +/* Video */ + ret =sun6i_video_init (&csi_dev->video, csi_dev,SUN6I_CSI_NAME );if (ret) - goto unreg_v4l2; + goto error_v4l2_device; - ret =v4l2_async_nf_parse_fwnode_endpoints (csi_dev->dev, - &v4l2->notifier, +/* V4L2 Async */ + +v4l2_async_nf_init (notifier); + notifier->ops = &sun6i_csi_async_ops; + + ret =v4l2_async_nf_parse_fwnode_endpoints (dev, notifier,sizeof (struct v4l2_async_subdev ), sun6i_csi_fwnode_parse);if (ret) - goto clean_video; - - v4l2->notifier.ops = &sun6i_csi_async_ops; + goto error_video; - ret =v4l2_async_nf_register (&v4l2->v4l2_dev, &v4l2->notifier); + ret =v4l2_async_nf_register (v4l2_dev, notifier);if (ret) { -dev_err (csi_dev->dev,"notifier registration failed\n" ); - goto clean_video; +dev_err (dev,"failed to register v4l2 async notifier: %d\n" , + ret); + goto error_v4l2_async_notifier; }return 0 ; -clean_video: +error_v4l2_async_notifier: +v4l2_async_nf_cleanup (notifier); + +error_video:sun6i_video_cleanup (&csi_dev->video); -unreg_v4l2: + +error_v4l2_device:v4l2_device_unregister (&v4l2->v4l2_dev); -free_ctrl: + +error_v4l2_ctrl:v4l2_ctrl_handler_free (&v4l2->ctrl_handler); -clean_media: -v4l2_async_nf_cleanup (&v4l2->notifier); -media_device_cleanup (&v4l2->media_dev); + +error_media: +media_device_cleanup (media_dev);return ret; } +static void sun6i_csi_v4l2_cleanup (struct sun6i_csi_device *csi_dev) +{ +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; + +media_device_unregister (&v4l2->media_dev); +v4l2_async_nf_unregister (&v4l2->notifier); +v4l2_async_nf_cleanup (&v4l2->notifier); +sun6i_video_cleanup (&csi_dev->video); +v4l2_device_unregister (&v4l2->v4l2_dev); +v4l2_ctrl_handler_free (&v4l2->ctrl_handler); +media_device_cleanup (&v4l2->media_dev); +} +/* Platform */ static irqreturn_t sun6i_csi_interrupt (int irq,void *private)
@@ -939,7 +958,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret)return ret; - ret =sun6i_csi_v4l2_init (csi_dev); + ret =sun6i_csi_v4l2_setup (csi_dev);if (ret) goto error_resources;
Signature · 1 line
2.36.1
PATCH v5 9/44 media: sun6i-csi: Tidy up video code
In reply to Paul KocialkowskiSome code cleanups, renames, variable lowerings and moving things around for better organization. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 509 ++++++++++-------- .../platform/sunxi/sun6i-csi/sun6i_video.h | 18 +- 3 files changed, 285 insertions(+), 246 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +2 -2
@@ -595,7 +595,7 @@ static int sun6i_csi_link_entity(struct sun6i_csi_device *csi_dev, src_pad_index = ret; - sink = &csi_dev->video.vdev.entity; + sink = &csi_dev->video.video_dev.entity; sink_pad = &csi_dev->video.pad; dev_dbg(csi_dev->dev, "creating %s:%u -> %s:%u link\n",
@@ -706,7 +706,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)/* Video */ - ret =sun6i_video_init (&csi_dev->video, csi_dev,SUN6I_CSI_NAME ); + ret =sun6i_video_setup (&csi_dev->video, csi_dev);if (ret) goto error_v4l2_device;
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +274 -235
815 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +9 -9
@@ -15,22 +15,22 @@ struct sun6i_csi_device;struct sun6i_video {struct sun6i_csi_device *csi_dev; -struct video_device vdev; -struct media_pad pad; -struct mutex lock; +struct video_device video_dev; +struct vb2_queue queue; +struct mutex lock;/* Queue lock. */ +struct media_pad pad; -struct vb2_queue vb2_vidq; -spinlock_t dma_queue_lock;struct list_head dma_queue; +spinlock_t dma_queue_lock;/* DMA queue lock. */ -unsigned int sequence; -struct v4l2_format fmt; +struct v4l2_format format;u32 mbus_code; +unsigned int sequence; }; -int sun6i_video_init (struct sun6i_video *video, -struct sun6i_csi_device *csi_dev,const char *name); +int sun6i_video_setup (struct sun6i_video *video, +struct sun6i_csi_device *csi_dev);void sun6i_video_cleanup (struct sun6i_video *video);void sun6i_video_frame_done (struct sun6i_video *video);
Signature · 1 line
2.36.1
PATCH v5 10/44 media: sun6i-csi: Pass and store csi device directly in video code
In reply to Paul KocialkowskiThe video structure is part of the main csi device structure, so pass pointers to that top-level structure directly. This makes it easier to navigate and access other elements. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 8 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 91 ++++++++++--------- .../platform/sunxi/sun6i-csi/sun6i_video.h | 9 +- 3 files changed, 57 insertions(+), 51 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4 -4
@@ -706,7 +706,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)/* Video */ - ret =sun6i_video_setup (&csi_dev->video, csi_dev); + ret =sun6i_video_setup (csi_dev);if (ret) goto error_v4l2_device;
@@ -735,7 +735,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)v4l2_async_nf_cleanup (notifier); error_video: -sun6i_video_cleanup (&csi_dev->video); +sun6i_video_cleanup (csi_dev); error_v4l2_device:v4l2_device_unregister (&v4l2->v4l2_dev);
@@ -756,7 +756,7 @@ static void sun6i_csi_v4l2_cleanup(struct sun6i_csi_device *csi_dev)media_device_unregister (&v4l2->media_dev);v4l2_async_nf_unregister (&v4l2->notifier);v4l2_async_nf_cleanup (&v4l2->notifier); -sun6i_video_cleanup (&csi_dev->video); +sun6i_video_cleanup (csi_dev);v4l2_device_unregister (&v4l2->v4l2_dev);v4l2_ctrl_handler_free (&v4l2->ctrl_handler);media_device_cleanup (&v4l2->media_dev);
@@ -787,7 +787,7 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private) }if (status &CSI_CH_INT_STA_FD_PD ) -sun6i_video_frame_done (&csi_dev->video); +sun6i_video_frame_done (csi_dev);regmap_write (regmap,CSI_CH_INT_STA_REG , status);
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +50 -41
284 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +3 -6
@@ -14,8 +14,6 @@struct sun6i_csi_device ;struct sun6i_video { -struct sun6i_csi_device *csi_dev; -struct video_device video_dev;struct vb2_queue queue;struct mutex lock;/* Queue lock. */
@@ -29,10 +27,9 @@ struct sun6i_video { unsigned int sequence; }; -int sun6i_video_setup (struct sun6i_video *video, -struct sun6i_csi_device *csi_dev); -void sun6i_video_cleanup (struct sun6i_video *video); +int sun6i_video_setup (struct sun6i_csi_device *csi_dev); +void sun6i_video_cleanup (struct sun6i_csi_device *csi_dev); -void sun6i_video_frame_done (struct sun6i_video *video); +void sun6i_video_frame_done (struct sun6i_csi_device *csi_dev);#endif /* __SUN6I_VIDEO_H__ */
Signature · 1 line
2.36.1
PATCH v5 11/44 media: sun6i-csi: Register the media device after creation
In reply to Paul KocialkowskiThere is no particular need to register the media device in the subdev notify complete callback.
Register it in the v4l2 code instead where it's more in-context.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8 -1
@@ -638,7 +638,7 @@ static int sun6i_subdev_notify_complete(struct v4l2_async_notifier *notifier)if (ret <0 )return ret; -return media_device_register (&v4l2->media_dev); +return 0 ; }static const struct v4l2_async_notifier_operations sun6i_csi_async_ops = {
@@ -685,6 +685,12 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)media_device_init (media_dev); + ret =media_device_register (media_dev); +if (ret) { +dev_err (dev,"failed to register media device: %d\n" , ret); + goto error_media; + } +/* V4L2 Control Handler */ ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 );
@@ -744,6 +750,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)v4l2_ctrl_handler_free (&v4l2->ctrl_handler); error_media: +media_device_unregister (media_dev);media_device_cleanup (media_dev);return ret;
Signature · 1 line
2.36.1
PATCH v5 12/44 media: sun6i-csi: Remove controls handler from the driver
In reply to Paul KocialkowskiThe driver does not expose controls directly and thus does not need a controls handler for its own use.
Controls attached to subdevs used to be exposed that way, however this can easily lead to issue when multiple subdevs attached to the same v4l2 device expose the same controls. Subdev controls should be set through each individual subdev node instead.
--- .../media/platform/sunxi/sun6i-csi/sun6i_csi.c | 15 +-------------- .../media/platform/sunxi/sun6i-csi/sun6i_csi.h | 2 -- .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 ---- 3 files changed, 1 insertion(+), 20 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +1 -14
@@ -691,23 +691,14 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev) goto error_media; } -/* V4L2 Control Handler */ - - ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 ); -if (ret) { -dev_err (dev,"failed to init v4l2 control handler: %d\n" , ret); - goto error_media; - } -/* V4L2 Device */ v4l2_dev->mdev = media_dev; - v4l2_dev->ctrl_handler = &v4l2->ctrl_handler; ret =v4l2_device_register (dev, v4l2_dev);if (ret) {dev_err (dev,"failed to register v4l2 device: %d\n" , ret); - goto error_v4l2_ctrl; + goto error_media; }/* Video */
@@ -746,9 +737,6 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev) error_v4l2_device:v4l2_device_unregister (&v4l2->v4l2_dev); -error_v4l2_ctrl: -v4l2_ctrl_handler_free (&v4l2->ctrl_handler); - error_media:media_device_unregister (media_dev);media_device_cleanup (media_dev);
@@ -765,7 +753,6 @@ static void sun6i_csi_v4l2_cleanup(struct sun6i_csi_device *csi_dev)v4l2_async_nf_cleanup (&v4l2->notifier);sun6i_video_cleanup (csi_dev);v4l2_device_unregister (&v4l2->v4l2_dev); -v4l2_ctrl_handler_free (&v4l2->ctrl_handler);media_device_cleanup (&v4l2->media_dev); }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -2
@@ -8,7 +8,6 @@#ifndef __SUN6I_CSI_H__#define __SUN6I_CSI_H__ -#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-fwnode.h>
@@ -35,7 +34,6 @@ struct sun6i_csi_config {struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev; -struct v4l2_ctrl_handler ctrl_handler;struct media_device media_dev;struct v4l2_async_notifier notifier;
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +0 -4
@@ -486,10 +486,6 @@ static const struct v4l2_ioctl_ops sun6i_video_ioctl_ops = { .vidioc_dqbuf = vb2_ioctl_dqbuf, .vidioc_streamon = vb2_ioctl_streamon, .vidioc_streamoff = vb2_ioctl_streamoff, - - .vidioc_log_status = v4l2_ctrl_log_status, - .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, - .vidioc_unsubscribe_event = v4l2_event_unsubscribe, };/* V4L2 File */
Signature · 1 line
2.36.1
PATCH v5 13/44 media: sun6i-csi: Add media ops with link notify callback
In reply to Paul KocialkowskiIn order to keep the power use count fields balanced when link changes happen between v4l2_pipeline_pm_get/set calls (in open/close), the link_notify media operation callback needs to be registered.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8 -0
@@ -23,6 +23,7 @@#include <linux/sched.h> #include <linux/sizes.h> #include <linux/slab.h> +#include <media/v4l2-mc.h> #include "sun6i_csi.h" #include "sun6i_csi_reg.h"
@@ -574,6 +575,12 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) CSI_CAP_CH0_VCAP_ON); } +/* Media */ + +static const struct media_device_ops sun6i_csi_media_ops = { + .link_notify = v4l2_pipeline_link_notify, +}; +/* V4L2 */ static int sun6i_csi_link_entity(struct sun6i_csi_device *csi_dev,
@@ -681,6 +688,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)strscpy (media_dev->model,SUN6I_CSI_DESCRIPTION ,sizeof (media_dev->model)); media_dev->hw_revision =0 ; + media_dev->ops = &sun6i_csi_media_ops; media_dev->dev = dev;media_device_init (media_dev);
Signature · 1 line
2.36.1
PATCH v5 14/44 media: sun6i-csi: Introduce and use video helper functions
In reply to Paul KocialkowskiIntroduce some helpers for buffer and general video configuration.
--- .../platform/sunxi/sun6i-csi/sun6i_video.c | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +28 -18
@@ -92,6 +92,29 @@ static bool sun6i_video_format_check(u32 format)return false; } +/* Video */ + +static void sun6i_video_buffer_configure (struct sun6i_csi_device *csi_dev, +struct sun6i_csi_buffer *csi_buffer) +{ + csi_buffer->queued_to_csi = true; +sun6i_csi_update_buf_addr (csi_dev, csi_buffer->dma_addr); +} + +static void sun6i_video_configure (struct sun6i_csi_device *csi_dev) +{ +struct sun6i_video *video = &csi_dev->video; +struct sun6i_csi_config config = {0 }; + + config.pixelformat = video->format.fmt.pix.pixelformat; + config.code = video->mbus_code; + config.field = video->format.fmt.pix.field; + config.width = video->format.fmt.pix.width; + config.height = video->format.fmt.pix.height; + +sun6i_csi_update_config (csi_dev, &config); +} +/* Queue */ static int sun6i_video_queue_setup(struct vb2_queue *queue,
@@ -160,7 +183,6 @@ static int sun6i_video_start_streaming(struct vb2_queue *queue,struct video_device *video_dev = &video->video_dev;struct sun6i_csi_buffer *buf;struct sun6i_csi_buffer *next_buf; -struct sun6i_csi_config config;struct v4l2_subdev *subdev;unsigned long flags;int ret;
@@ -182,22 +204,13 @@ static int sun6i_video_start_streaming(struct vb2_queue *queue, goto error_media_pipeline; } - config.pixelformat = video->format.fmt.pix.pixelformat; - config.code = video->mbus_code; - config.field = video->format.fmt.pix.field; - config.width = video->format.fmt.pix.width; - config.height = video->format.fmt.pix.height; - - ret =sun6i_csi_update_config (csi_dev, &config); -if (ret <0 ) - goto error_media_pipeline; +sun6i_video_configure (csi_dev);spin_lock_irqsave (&video->dma_queue_lock, flags); buf =list_first_entry (&video->dma_queue, struct sun6i_csi_buffer, list); - buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, buf);sun6i_csi_set_stream (csi_dev, true);
@@ -219,8 +232,7 @@ static int sun6i_video_start_streaming(struct vb2_queue *queue,* would also drop frame when lacking of queued buffer. */ next_buf =list_next_entry (buf, list); - next_buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, next_buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, next_buf);spin_unlock_irqrestore (&video->dma_queue_lock, flags);
@@ -294,8 +306,7 @@ void sun6i_video_frame_done(struct sun6i_csi_device *csi_dev)* for next ISR call. */ if (!next_buf->queued_to_csi) { - next_buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, next_buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, next_buf);dev_dbg (csi_dev->dev,"Frame dropped!\n" ); goto complete; }
@@ -309,8 +320,7 @@ void sun6i_video_frame_done(struct sun6i_csi_device *csi_dev)/* Prepare buffer for next frame but one. */ if (!list_is_last (&next_buf->list, &video->dma_queue)) { next_buf =list_next_entry (next_buf, list); - next_buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, next_buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, next_buf); }else {dev_dbg (csi_dev->dev,"Next frame will be dropped!\n" ); }
Signature · 1 line
2.36.1
PATCH v5 15/44 media: sun6i-csi: Move csi buffer definition to main header file
In reply to Paul KocialkowskiThe buffer structure is a top-level definition, put it in the main header to keep things tidy. No functional change intended.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 9 +++++++++ drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +9 -0
@@ -10,12 +10,21 @@#include <media/v4l2-device.h> #include <media/v4l2-fwnode.h> +#include <media/videobuf2-v4l2.h> #include "sun6i_video.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +struct sun6i_csi_buffer { +struct vb2_v4l2_buffer v4l2_buffer; +struct list_head list; + +dma_addr_t dma_addr; +bool queued_to_csi; +}; +/** * struct sun6i_csi_config - configs for sun6i csi * @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*)
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +0 -8
@@ -23,14 +23,6 @@#define MAX_WIDTH (4800)#define MAX_HEIGHT (4800) -struct sun6i_csi_buffer { -struct vb2_v4l2_buffer v4l2_buffer; -struct list_head list; - -dma_addr_t dma_addr; -bool queued_to_csi; -}; -/* Helpers */ static struct v4l2_subdev *
Signature · 1 line
2.36.1
PATCH v5 16/44 media: media-entity: Add helper to get a single enabled link
In reply to Paul KocialkowskiIn a situation where multiple links can be connected to the same pad of an entity, drivers might need to ensure that only a single link is enabled to apply appropriate routing (when the hardware can only use one at a time).
Add a helper to return the single enabled link of an entity given a specific pad index, which errors out when zero or more than one link candidates are found.
--- drivers/media/mc/mc-entity.c | 26 ++++++++++++++++++++++++++ include/media/media-entity.h | 13 +++++++++++++ 2 files changed, 39 insertions(+)
drivers/media/mc/mc-entity.c +26 -0
@@ -900,6 +900,32 @@ media_entity_find_link(struct media_pad *source, struct media_pad *sink) }EXPORT_SYMBOL_GPL (media_entity_find_link); +struct media_link * +media_entity_get_single_enabled_link (struct media_entity *entity, +u16 pad_index) +{ +struct media_link *candidate =ERR_PTR (-ENODEV ); +struct media_link *link; + +list_for_each_entry (link, &entity->links, list) { +struct media_pad *pad = link->sink->entity == entity ? + link->sink : link->source; + +if (pad->index != pad_index || + !(link->flags &MEDIA_LNK_FL_ENABLED )) +continue ; + +/* Error out with more than a single candidate. */ +if (candidate !=ERR_PTR (-ENODEV )) +return ERR_PTR (-ENXIO ); + + candidate = link; + } + +return candidate; +} +EXPORT_SYMBOL_GPL (media_entity_get_single_enabled_link); +struct media_pad *media_entity_remote_pad (const struct media_pad *pad) {struct media_link *link;
include/media/media-entity.h +13 -0
@@ -847,6 +847,19 @@ int media_entity_setup_link(struct media_link *link, u32 flags);struct media_link *media_entity_find_link (struct media_pad *source,struct media_pad *sink); +/** +* media_entity_get_single_enabled_link - Get a single link for an entity pad +* @entity: The entity +* @pad_index: The index of the entity's pad expected to take part in link +* +* Return: returns a pointer to the single enabled link with the entity's pad. +* If no such link exists, returns a pointer error with %-ENODEV. +* If more than a single link exist, returns a pointer error with %-ENXIO. +*/ +struct media_link * +media_entity_get_single_enabled_link (struct media_entity *entity, +u16 pad_index); +/** * media_entity_remote_pad - Find the pad at the remote end of a link * @pad: Pad at the local end of the link
Signature · 1 line
2.36.1
PATCH v5 17/44 media: sun6i-csi: Add bridge v4l2 subdev with port management
In reply to Paul KocialkowskiIntroduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The s_stream video op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).
The video capture device is now registered after the bridge and attaches to it with a media link.
--- .../media/platform/sunxi/sun6i-csi/Makefile | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 157 +----- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 451 ++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 49 ++ .../platform/sunxi/sun6i-csi/sun6i_video.c | 19 + 6 files changed, 549 insertions(+), 139 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
drivers/media/platform/sunxi/sun6i-csi/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -sun6i-csi-y += sun6i_video.o sun6i_csi.o +sun6i-csi-y += sun6i_video.o sun6i_csi.o sun6i_csi_bridge.o obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.o
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +23 -134
214 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +6 -4
@@ -12,11 +12,16 @@#include <media/v4l2-fwnode.h> #include <media/videobuf2-v4l2.h> +#include "sun6i_csi_bridge.h" #include "sun6i_video.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +enum sun6i_csi_port { +SUN6I_CSI_PORT_PARALLEL =0 , +}; +struct sun6i_csi_buffer {struct vb2_v4l2_buffer v4l2_buffer;struct list_head list;
@@ -44,10 +49,6 @@ struct sun6i_csi_config {struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev;struct media_device media_dev; - -struct v4l2_async_notifier notifier; -/* video port settings */ -struct v4l2_fwnode_endpoint v4l2_ep; };struct sun6i_csi_device {
@@ -55,6 +56,7 @@ struct sun6i_csi_device {struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2; +struct sun6i_csi_bridge bridge;struct sun6i_video video;struct regmap *regmap;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +451 -0
451 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +49 -0
49 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +19 -0
@@ -632,6 +632,7 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev) {struct sun6i_video *video = &csi_dev->video;struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_subdev *bridge_subdev = &csi_dev->bridge.subdev;struct video_device *video_dev = &video->video_dev;struct vb2_queue *queue = &video->queue;struct media_pad *pad = &video->pad;
@@ -712,8 +713,26 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev) goto error_media_entity; } +/* Media Pad Link */ + + ret =media_create_pad_link (&bridge_subdev->entity, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + &video_dev->entity,0 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +if (ret <0 ) { +v4l2_err (v4l2_dev,"failed to create %s:%u -> %s:%u link\n" , + bridge_subdev->entity.name, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + video_dev->entity.name,0 ); + goto error_video_device; + } +return 0 ; +error_video_device: +vb2_video_unregister_device (video_dev); + error_media_entity:media_entity_cleanup (&video_dev->entity);
Signature · 1 line
2.36.1
PATCH v5 18/44 media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture
In reply to Paul KocialkowskiIn an effort to distinguish between the core csi engine (to be represented as the bridge) and the dma engine (the capture video device), rename the video component to capture, with the appropriate prefix. No functional change intended.
---
.../media/platform/sunxi/sun6i-csi/Makefile | 2 +-
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 6 +-
.../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 +-
.../{sun6i_video.c => sun6i_csi_capture.c} | 344 +++++++++---------
.../{sun6i_video.h => sun6i_csi_capture.h} | 14 +-
5 files changed, 187 insertions(+), 183 deletions(-)
rename drivers/media/platform/sunxi/sun6i-csi/{sun6i_video.c => sun6i_csi_capture.c} (58%)
rename drivers/media/platform/sunxi/sun6i-csi/{sun6i_video.h => sun6i_csi_capture.h} (64%)drivers/media/platform/sunxi/sun6i-csi/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -sun6i-csi-y += sun6i_video.o sun6i_csi.o sun6i_csi_bridge.o +sun6i-csi-y += sun6i_csi.o sun6i_csi_bridge.o sun6i_csi_capture.o obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.o
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3 -3
@@ -662,7 +662,7 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private) }if (status &CSI_CH_INT_STA_FD_PD ) -sun6i_video_frame_done (csi_dev); +sun6i_csi_capture_frame_done (csi_dev);regmap_write (regmap,CSI_CH_INT_STA_REG , status);
@@ -841,7 +841,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret) goto error_v4l2; - ret =sun6i_video_setup (csi_dev); + ret =sun6i_csi_capture_setup (csi_dev);if (ret) goto error_bridge;
@@ -863,7 +863,7 @@ static int sun6i_csi_remove(struct platform_device *pdev) {struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev); -sun6i_video_cleanup (csi_dev); +sun6i_csi_capture_cleanup (csi_dev);sun6i_csi_bridge_cleanup (csi_dev);sun6i_csi_v4l2_cleanup (csi_dev);sun6i_csi_resources_cleanup (csi_dev);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +2 -2
@@ -13,7 +13,7 @@#include <media/videobuf2-v4l2.h> #include "sun6i_csi_bridge.h" -#include "sun6i_video.h" +#include "sun6i_csi_capture.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device"
@@ -57,7 +57,7 @@ struct sun6i_csi_device {struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2;struct sun6i_csi_bridge bridge; -struct sun6i_video video; +struct sun6i_csi_capture capture;struct regmap *regmap;struct clk *clock_mod;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +174 -170
754 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +7 -7
@@ -5,15 +5,15 @@* Author: Yong Deng <[email protected]> */ -#ifndef __SUN6I_VIDEO_H__ -#define __SUN6I_VIDEO_H__ +#ifndef __SUN6I_CAPTURE_H__ +#define __SUN6I_CAPTURE_H__ #include <media/v4l2-dev.h> #include <media/videobuf2-core.h> struct sun6i_csi_device; -struct sun6i_video { +struct sun6i_csi_capture { struct video_device video_dev; struct vb2_queue queue; struct mutex lock; /* Queue lock. */
@@ -27,9 +27,9 @@ struct sun6i_video { unsigned int sequence; }; -int sun6i_video_setup (struct sun6i_csi_device *csi_dev); -void sun6i_video_cleanup (struct sun6i_csi_device *csi_dev); +int sun6i_csi_capture_setup (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_cleanup (struct sun6i_csi_device *csi_dev); -void sun6i_video_frame_done (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_VIDEO_H__ */ +#endif /* __SUN6I_CAPTURE_H__ */
Signature · 1 line
2.36.1
PATCH v5 19/44 media: sun6i-csi: Add capture state using vsync for page flip
In reply to Paul KocialkowskiThe current implementation requires up to 3 buffers to properly implement page flipping without losing frames: one is configured before the video stream is started, one just after that and page flipping is synchronized to the frame done interrupt. The comment in the code mentions that "CSI will lookup the next dma buffer for next frame before the current frame done IRQ triggered".
Based on observations of the CSI unit behavior, it seems that the buffer DMA address is sampled when the frame scan begins (in addition to starting the stream), which corresponds to the vblank interrupt that hits just before the frame-done interrupt of the previous frame.
As a result, the address configured at the frame done interrupt is not actually used for the next frame but for the one after that.
This proposal changes the page flipping sync point to the vsync interrupt, which allows the DMA address to be sampled for the next frame instead and allows operating with only two buffers.
In addition to the change in the sync point, the code is refactored to introduce a notion of state that clarifies tracking of the buffers with tidy functions.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 + .../platform/sunxi/sun6i-csi/sun6i_csi.h | 3 - .../sunxi/sun6i-csi/sun6i_csi_capture.c | 259 ++++++++++-------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 23 +- 4 files changed, 165 insertions(+), 124 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4 -0
@@ -566,6 +566,7 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable)regmap_write (regmap,CSI_CH_INT_STA_REG ,0xFF ); regmap_write(regmap, CSI_CH_INT_EN_REG, + CSI_CH_INT_EN_VS_INT_EN | CSI_CH_INT_EN_HB_OF_INT_EN | CSI_CH_INT_EN_FIFO2_OF_INT_EN | CSI_CH_INT_EN_FIFO1_OF_INT_EN |
@@ -664,6 +665,9 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private)if (status &CSI_CH_INT_STA_FD_PD )sun6i_csi_capture_frame_done (csi_dev); +if (status &CSI_CH_INT_STA_VS_PD ) +sun6i_csi_capture_sync (csi_dev); +regmap_write (regmap,CSI_CH_INT_STA_REG , status);return IRQ_HANDLED ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -3
@@ -25,9 +25,6 @@ enum sun6i_csi_port {struct sun6i_csi_buffer {struct vb2_v4l2_buffer v4l2_buffer;struct list_head list; - -dma_addr_t dma_addr; -bool queued_to_csi; };/**
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +144 -115
371 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +17 -6
@@ -13,23 +13,34 @@struct sun6i_csi_device ; +#undef current +struct sun6i_csi_capture_state { +struct list_head queue; +spinlock_t lock;/* Queue and buffers lock. */ + +struct sun6i_csi_buffer *pending; +struct sun6i_csi_buffer *current; +struct sun6i_csi_buffer *complete; + +unsigned int sequence; +}; +struct sun6i_csi_capture { +struct sun6i_csi_capture_state state; +struct video_device video_dev;struct vb2_queue queue;struct mutex lock;/* Queue lock. */ struct media_pad pad; -struct list_head dma_queue; -spinlock_t dma_queue_lock;/* DMA queue lock. */ -struct v4l2_format format;u32 mbus_code; -unsigned int sequence; }; +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); +int sun6i_csi_capture_setup (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_cleanup (struct sun6i_csi_device *csi_dev); -void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_CAPTURE_H__ */
Signature · 1 line
2.36.1
PATCH v5 20/44 media: sun6i-csi: Rework register definitions, invert misleading fields
In reply to Paul KocialkowskiThis cleans up the register definitions a bit, adds a prefix, remove masks. Registers are now fully defined, some additional fields were added when needed. New format definitions are added for future use.
Some fields are wrongly defined (inverted) in Allwinner literature (e.g. field vs frame prefixes), which is quite misleading. They are now corrected to reflect their actual behavior.
This should only be a cosmetic commit. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 182 ++++++----- .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 296 ++++++++++-------- 2 files changed, 266 insertions(+), 212 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +97 -85
@@ -155,7 +155,8 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)int ret;if (!enable) { -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG , +SUN6I_CSI_EN_CSI_EN ,0 );pm_runtime_put (dev);return 0 ;
@@ -165,7 +166,8 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (ret <0 )return ret; -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,CSI_EN_CSI_EN ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN , +SUN6I_CSI_EN_CSI_EN );return 0 ; }
@@ -334,7 +336,7 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev)struct sun6i_csi_config *config = &csi_dev->config;unsigned char bus_width;u32 flags; -u32 cfg; +u32 cfg =0 ;bool input_interlaced = false; if (config->field == V4L2_FIELD_INTERLACED
@@ -344,52 +346,63 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev) bus_width = endpoint->bus.parallel.bus_width; -regmap_read (csi_dev->regmap,CSI_IF_CFG_REG , &cfg); - - cfg &= ~(CSI_IF_CFG_CSI_IF_MASK |CSI_IF_CFG_MIPI_IF_MASK | -CSI_IF_CFG_IF_DATA_WIDTH_MASK | -CSI_IF_CFG_CLK_POL_MASK |CSI_IF_CFG_VREF_POL_MASK | -CSI_IF_CFG_HREF_POL_MASK |CSI_IF_CFG_FIELD_MASK | -CSI_IF_CFG_SRC_TYPE_MASK ); -if (input_interlaced) - cfg |=CSI_IF_CFG_SRC_TYPE_INTERLACED ; + cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | +SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | +SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ;else - cfg |=CSI_IF_CFG_SRC_TYPE_PROGRESSED ; + cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ;switch (endpoint->bus_type) {case V4L2_MBUS_PARALLEL : - cfg |=CSI_IF_CFG_MIPI_IF_CSI ; + cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; flags = endpoint->bus.parallel.flags; - cfg |= (bus_width ==16 ) ?CSI_IF_CFG_CSI_IF_YUV422_16BIT : -CSI_IF_CFG_CSI_IF_YUV422_INTLV ; +if (bus_width ==16 ) + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; +else + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=CSI_IF_CFG_FIELD_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - cfg |=CSI_IF_CFG_VREF_POL_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; +if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) - cfg |=CSI_IF_CFG_HREF_POL_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - cfg |=CSI_IF_CFG_CLK_POL_FALLING_EDGE ; + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;case V4L2_MBUS_BT656 : - cfg |=CSI_IF_CFG_MIPI_IF_CSI ; + cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; flags = endpoint->bus.parallel.flags; - cfg |= (bus_width ==16 ) ?CSI_IF_CFG_CSI_IF_BT1120 : -CSI_IF_CFG_CSI_IF_BT656 ; +if (bus_width ==16 ) + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; +else + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=CSI_IF_CFG_FIELD_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) - cfg |=CSI_IF_CFG_CLK_POL_FALLING_EDGE ; + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;default : dev_warn(csi_dev->dev, "Unsupported bus type: %d\n",
@@ -399,13 +412,13 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev)switch (bus_width) {case 8 : - cfg |=CSI_IF_CFG_IF_DATA_WIDTH_8BIT ; + cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ;break ;case 10 : - cfg |=CSI_IF_CFG_IF_DATA_WIDTH_10BIT ; + cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ;break ;case 12 : - cfg |=CSI_IF_CFG_IF_DATA_WIDTH_12BIT ; + cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ;break ;case 16 :/* No need to configure DATA_WIDTH for 16bit */ break ;
@@ -414,42 +427,35 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev)break ; } -regmap_write (csi_dev->regmap,CSI_IF_CFG_REG , cfg); +regmap_write (csi_dev->regmap,SUN6I_CSI_IF_CFG_REG , cfg); }static void sun6i_csi_set_format (struct sun6i_csi_device *csi_dev) {struct sun6i_csi_config *config = &csi_dev->config; -u32 cfg; +u32 cfg =0 ;u32 val; -regmap_read (csi_dev->regmap,CSI_CH_CFG_REG , &cfg); - - cfg &= ~(CSI_CH_CFG_INPUT_FMT_MASK | -CSI_CH_CFG_OUTPUT_FMT_MASK |CSI_CH_CFG_VFLIP_EN | -CSI_CH_CFG_HFLIP_EN |CSI_CH_CFG_FIELD_SEL_MASK | -CSI_CH_CFG_INPUT_SEQ_MASK ); - val =get_csi_input_format (csi_dev, config->code, config->pixelformat); - cfg |=CSI_CH_CFG_INPUT_FMT (val); + cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); val =get_csi_output_format (csi_dev, config->pixelformat, config->field); - cfg |=CSI_CH_CFG_OUTPUT_FMT (val); + cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); val =get_csi_input_seq (csi_dev, config->code, config->pixelformat); - cfg |=CSI_CH_CFG_INPUT_SEQ (val); + cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val);if (config->field ==V4L2_FIELD_TOP ) - cfg |=CSI_CH_CFG_FIELD_SEL_FIELD0 ; + cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ;else if (config->field ==V4L2_FIELD_BOTTOM ) - cfg |=CSI_CH_CFG_FIELD_SEL_FIELD1 ; + cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ;else - cfg |=CSI_CH_CFG_FIELD_SEL_BOTH ; + cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; -regmap_write (csi_dev->regmap,CSI_CH_CFG_REG , cfg); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_CFG_REG , cfg); }static void sun6i_csi_set_window (struct sun6i_csi_device *csi_dev)
@@ -475,12 +481,12 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)break ; } -regmap_write (csi_dev->regmap,CSI_CH_HSIZE_REG , -CSI_CH_HSIZE_HOR_LEN (hor_len) | -CSI_CH_HSIZE_HOR_START (0 )); -regmap_write (csi_dev->regmap,CSI_CH_VSIZE_REG , -CSI_CH_VSIZE_VER_LEN (height) | -CSI_CH_VSIZE_VER_START (0 )); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_HSIZE_REG , +SUN6I_CSI_CH_HSIZE_LEN (hor_len) | +SUN6I_CSI_CH_HSIZE_START (0 )); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_VSIZE_REG , +SUN6I_CSI_CH_VSIZE_LEN (height) | +SUN6I_CSI_CH_VSIZE_START (0 )); planar_offset[0 ] =0 ;switch (config->pixelformat) {
@@ -521,9 +527,9 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)break ; } -regmap_write (csi_dev->regmap,CSI_CH_BUF_LEN_REG , -CSI_CH_BUF_LEN_BUF_LEN_C (bytesperline_c) | -CSI_CH_BUF_LEN_BUF_LEN_Y (bytesperline_y)); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_BUF_LEN_REG , +SUN6I_CSI_CH_BUF_LEN_CHROMA_LINE (bytesperline_c) | +SUN6I_CSI_CH_BUF_LEN_LUMA_LINE (bytesperline_y)); } int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,
@@ -544,14 +550,16 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev,dma_addr_t addr) { -regmap_write (csi_dev->regmap,CSI_CH_F0_BUFA_REG , - (addr + csi_dev->planar_offset[0 ]) >>2 ); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO0_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (addr + csi_dev->planar_offset[0 ]));if (csi_dev->planar_offset[1 ] !=-1 ) -regmap_write (csi_dev->regmap,CSI_CH_F1_BUFA_REG , - (addr + csi_dev->planar_offset[1 ]) >>2 ); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO1_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (addr + + csi_dev->planar_offset[1 ]));if (csi_dev->planar_offset[2 ] !=-1 ) -regmap_write (csi_dev->regmap,CSI_CH_F2_BUFA_REG , - (addr + csi_dev->planar_offset[2 ]) >>2 ); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO2_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (addr + + csi_dev->planar_offset[2 ])); }void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable)
@@ -559,23 +567,25 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable)struct regmap *regmap = csi_dev->regmap;if (!enable) { -regmap_update_bits (regmap,CSI_CAP_REG ,CSI_CAP_CH0_VCAP_ON ,0 ); -regmap_write (regmap,CSI_CH_INT_EN_REG ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG , +SUN6I_CSI_CAP_VCAP_ON ,0 ); +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 );return ; } -regmap_write (regmap,CSI_CH_INT_STA_REG ,0xFF ); -regmap_write (regmap,CSI_CH_INT_EN_REG , -CSI_CH_INT_EN_VS_INT_EN | -CSI_CH_INT_EN_HB_OF_INT_EN | -CSI_CH_INT_EN_FIFO2_OF_INT_EN | -CSI_CH_INT_EN_FIFO1_OF_INT_EN | -CSI_CH_INT_EN_FIFO0_OF_INT_EN | -CSI_CH_INT_EN_FD_INT_EN | -CSI_CH_INT_EN_CD_INT_EN ); - -regmap_update_bits (regmap,CSI_CAP_REG ,CSI_CAP_CH0_VCAP_ON , -CSI_CAP_CH0_VCAP_ON ); +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , +SUN6I_CSI_CH_INT_STA_CLEAR ); +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG , +SUN6I_CSI_CH_INT_EN_VS | +SUN6I_CSI_CH_INT_EN_HB_OF | +SUN6I_CSI_CH_INT_EN_FIFO2_OF | +SUN6I_CSI_CH_INT_EN_FIFO1_OF | +SUN6I_CSI_CH_INT_EN_FIFO0_OF | +SUN6I_CSI_CH_INT_EN_FD | +SUN6I_CSI_CH_INT_EN_CD ); + +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON , +SUN6I_CSI_CAP_VCAP_ON ); }/* Media */
@@ -646,29 +656,31 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private)struct regmap *regmap = csi_dev->regmap;u32 status; -regmap_read (regmap,CSI_CH_INT_STA_REG , &status); +regmap_read (regmap,SUN6I_CSI_CH_INT_STA_REG , &status);if (!(status &0xFF ))return IRQ_NONE ; -if ((status &CSI_CH_INT_STA_FIFO0_OF_PD ) || - (status &CSI_CH_INT_STA_FIFO1_OF_PD ) || - (status &CSI_CH_INT_STA_FIFO2_OF_PD ) || - (status &CSI_CH_INT_STA_HB_OF_PD )) { -regmap_write (regmap,CSI_CH_INT_STA_REG , status); -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN , -CSI_EN_CSI_EN ); +if ((status &SUN6I_CSI_CH_INT_STA_FIFO0_OF ) || + (status &SUN6I_CSI_CH_INT_STA_FIFO1_OF ) || + (status &SUN6I_CSI_CH_INT_STA_FIFO2_OF ) || + (status &SUN6I_CSI_CH_INT_STA_HB_OF )) { +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , status); + +regmap_update_bits (regmap,SUN6I_CSI_EN_REG , +SUN6I_CSI_EN_CSI_EN ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG , +SUN6I_CSI_EN_CSI_EN ,SUN6I_CSI_EN_CSI_EN );return IRQ_HANDLED ; } -if (status &CSI_CH_INT_STA_FD_PD ) +if (status &SUN6I_CSI_CH_INT_STA_FD )sun6i_csi_capture_frame_done (csi_dev); -if (status &CSI_CH_INT_STA_VS_PD ) +if (status &SUN6I_CSI_CH_INT_STA_VS )sun6i_csi_capture_sync (csi_dev); -regmap_write (regmap,CSI_CH_INT_STA_REG , status); +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , status);return IRQ_HANDLED ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +169 -127
302 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 21/44 media: sun6i-csi: Add dimensions and format helpers to capture
In reply to Paul KocialkowskiDefine and export useful helpers to access dimensions and pixel format.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 19 +++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.h | 5 +++++ 2 files changed, 24 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +19 -0
@@ -25,6 +25,25 @@/* Helpers */ +void sun6i_csi_capture_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height) +{ +if (width) + *width = csi_dev->capture.format.fmt.pix.width; +if (height) + *height = csi_dev->capture.format.fmt.pix.height; +} + +void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev, +u32 *pixelformat,u32 *field) +{ +if (pixelformat) + *pixelformat = csi_dev->capture.format.fmt.pix.pixelformat; + +if (field) + *field = csi_dev->capture.format.fmt.pix.field; +} +static struct v4l2_subdev *sun6i_csi_capture_remote_subdev (struct sun6i_csi_capture *capture,u32 *pad) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +5 -0
@@ -37,6 +37,11 @@ struct sun6i_csi_capture {u32 mbus_code; }; +void sun6i_csi_capture_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height); +void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev, +u32 *pixelformat,u32 *field); +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.36.1
PATCH v5 22/44 media: sun6i-csi: Implement address configuration without indirection
In reply to Paul KocialkowskiInstead of calculating the planar_offset at one point and using it later in a dedicated function, reimplement address configuration with v4l2 format info in the buffer_configure function.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 27 ---------------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ------ .../sunxi/sun6i-csi/sun6i_csi_capture.c | 32 ++++++++++++++++++- 3 files changed, 31 insertions(+), 38 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -27
@@ -463,7 +463,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)struct sun6i_csi_config *config = &csi_dev->config;u32 bytesperline_y;u32 bytesperline_c; -int *planar_offset = csi_dev->planar_offset;u32 width = config->width;u32 height = config->height;u32 hor_len = width;
@@ -488,7 +487,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)SUN6I_CSI_CH_VSIZE_LEN (height) | SUN6I_CSI_CH_VSIZE_START(0)); - planar_offset[0 ] =0 ;switch (config->pixelformat) {case V4L2_PIX_FMT_NV12_16L16 :case V4L2_PIX_FMT_NV12 :
@@ -497,23 +495,15 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)case V4L2_PIX_FMT_NV61 : bytesperline_y = width; bytesperline_c = width; - planar_offset[1 ] = bytesperline_y * height; - planar_offset[2 ] =-1 ;break ;case V4L2_PIX_FMT_YUV420 :case V4L2_PIX_FMT_YVU420 : bytesperline_y = width; bytesperline_c = width /2 ; - planar_offset[1 ] = bytesperline_y * height; - planar_offset[2 ] = planar_offset[1 ] + - bytesperline_c * height /2 ;break ;case V4L2_PIX_FMT_YUV422P : bytesperline_y = width; bytesperline_c = width /2 ; - planar_offset[1 ] = bytesperline_y * height; - planar_offset[2 ] = planar_offset[1 ] + - bytesperline_c * height;break ;default :/* raw */ dev_dbg(csi_dev->dev,
@@ -522,8 +512,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev) bytesperline_y = (sun6i_csi_get_bpp (config->pixelformat) * config->width) /8 ; bytesperline_c =0 ; - planar_offset[1 ] =-1 ; - planar_offset[2 ] =-1 ;break ; }
@@ -547,21 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,return 0 ; } -void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, -dma_addr_t addr) -{ -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO0_ADDR_REG , -SUN6I_CSI_ADDR_VALUE (addr + csi_dev->planar_offset[0 ])); -if (csi_dev->planar_offset[1 ] !=-1 ) -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO1_ADDR_REG , -SUN6I_CSI_ADDR_VALUE (addr + - csi_dev->planar_offset[1 ])); -if (csi_dev->planar_offset[2 ] !=-1 ) -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO2_ADDR_REG , -SUN6I_CSI_ADDR_VALUE (addr + - csi_dev->planar_offset[2 ])); -} -void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable) {struct regmap *regmap = csi_dev->regmap;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -10
@@ -60,8 +60,6 @@ struct sun6i_csi_device {struct clk *clock_mod;struct clk *clock_ram;struct reset_control *reset; - -int planar_offset[3 ]; };struct sun6i_csi_variant {
@@ -92,14 +90,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable);int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config); -/** -* sun6i_csi_update_buf_addr() - update the csi frame buffer address -* @csi: pointer to the csi -* @addr: frame buffer's physical address -*/ -void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, -dma_addr_t addr); -/** * sun6i_csi_set_stream() - start/stop csi streaming * @csi: pointer to the csi
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +31 -1
@@ -6,6 +6,7 @@*/ #include <linux/of.h> +#include <linux/regmap.h> #include <media/v4l2-device.h> #include <media/v4l2-event.h>
@@ -16,6 +17,7 @@#include "sun6i_csi.h" #include "sun6i_csi_capture.h" +#include "sun6i_csi_reg.h" /* This is got from BSP sources. */ #define MIN_WIDTH (32)
@@ -109,13 +111,41 @@ static void sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev, struct sun6i_csi_buffer *csi_buffer) { + struct regmap *regmap = csi_dev->regmap; +const struct v4l2_format_info *info;struct vb2_buffer *vb2_buffer; +unsigned int width, height;dma_addr_t address; +u32 pixelformat; vb2_buffer = &csi_buffer->v4l2_buffer.vb2_buf; address =vb2_dma_contig_plane_dma_addr (vb2_buffer,0 ); -sun6i_csi_update_buf_addr (csi_dev, address); +regmap_write (regmap,SUN6I_CSI_CH_FIFO0_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (address)); + +sun6i_csi_capture_dimensions (csi_dev, &width, &height); +sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); + + info =v4l2_format_info (pixelformat); +/* Unsupported formats are single-plane, so we can stop here. */ +if (!info) +return ; + +if (info->comp_planes >1 ) { + address += info->bpp[0 ] * width * height; + +regmap_write (regmap,SUN6I_CSI_CH_FIFO1_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (address)); + } + +if (info->comp_planes >2 ) { + address += info->bpp[1 ] *DIV_ROUND_UP (width, info->hdiv) * +DIV_ROUND_UP (height, info->vdiv); + +regmap_write (regmap,SUN6I_CSI_CH_FIFO2_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (address)); + } }static void sun6i_csi_capture_configure (struct sun6i_csi_device *csi_dev)
Signature · 1 line
2.36.1
PATCH v5 23/44 media: sun6i-csi: Split stream sequences and irq code in capture
In reply to Paul KocialkowskiCreate minimal helpers that split the enable/disable flow, which will make it easier to move control over to the bridge later on.
Generally speaking the goal is to move register configuration to the capture code and later split it with the bridge code.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 26 --------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 7 --- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 58 ++++++++++++++++++- 3 files changed, 55 insertions(+), 36 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -26
@@ -535,32 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,return 0 ; } -void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable) -{ -struct regmap *regmap = csi_dev->regmap; - -if (!enable) { -regmap_update_bits (regmap,SUN6I_CSI_CAP_REG , -SUN6I_CSI_CAP_VCAP_ON ,0 ); -regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 ); -return ; - } - -regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , -SUN6I_CSI_CH_INT_STA_CLEAR ); -regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG , -SUN6I_CSI_CH_INT_EN_VS | -SUN6I_CSI_CH_INT_EN_HB_OF | -SUN6I_CSI_CH_INT_EN_FIFO2_OF | -SUN6I_CSI_CH_INT_EN_FIFO1_OF | -SUN6I_CSI_CH_INT_EN_FIFO0_OF | -SUN6I_CSI_CH_INT_EN_FD | -SUN6I_CSI_CH_INT_EN_CD ); - -regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON , -SUN6I_CSI_CAP_VCAP_ON ); -} -/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -7
@@ -90,13 +90,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable);int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config); -/** -* sun6i_csi_set_stream() - start/stop csi streaming -* @csi: pointer to the csi -* @enable: start/stop -*/ -void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable); -/* get bpp form v4l2 pixformat */ static inline int sun6i_csi_get_bpp (unsigned int pixformat) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +55 -3
88 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 24/44 media: sun6i-csi: Move power management to runtime pm in capture
In reply to Paul KocialkowskiLet's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to v4l2_pipeline_pm_get.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 24 ----------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 7 ---- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 41 ++++++++++--------- 3 files changed, 22 insertions(+), 50 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -24
@@ -148,30 +148,6 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi_device *csi_dev,return false; } -int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable) -{ -struct device *dev = csi_dev->dev; -struct regmap *regmap = csi_dev->regmap; -int ret; - -if (!enable) { -regmap_update_bits (regmap,SUN6I_CSI_EN_REG , -SUN6I_CSI_EN_CSI_EN ,0 ); -pm_runtime_put (dev); - -return 0 ; - } - - ret =pm_runtime_resume_and_get (dev); -if (ret <0 ) -return ret; - -regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN , -SUN6I_CSI_EN_CSI_EN ); - -return 0 ; -} -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev,u32 mbus_code,u32 pixformat) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -7
@@ -75,13 +75,6 @@ struct sun6i_csi_variant {bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code); -/** -* sun6i_csi_set_power() - power on/off the csi -* @csi: pointer to the csi -* @enable: on/off -*/ -int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable); -/** * sun6i_csi_update_config() - update the csi register settings * @csi: pointer to the csi
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +22 -19
116 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 25/44 media: sun6i-csi: Move register configuration to capture
In reply to Paul KocialkowskiContinue moving things over to capture in tidy helpers. Also take the occasion to remove the config struct, which is unwelcome redundancy and use the capture helpers instead.
The code is only adapted to reflect the removal of the config structure. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 363 ----------------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 25 -- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 364 +++++++++++++++++- 3 files changed, 356 insertions(+), 396 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -363
@@ -148,369 +148,6 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi_device *csi_dev,return false; } -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* non-YUV */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return CSI_INPUT_FORMAT_RAW ; - -switch (pixformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return CSI_INPUT_FORMAT_RAW ; -default : -break ; - } - -/* not support YUV420 input format yet */ -dev_dbg (csi_dev->dev,"Select YUV422 as default input format of CSI.\n" ); -return CSI_INPUT_FORMAT_YUV422 ; -} - -static enum csi_output_fmt -get_csi_output_format (struct sun6i_csi_device *csi_dev,u32 pixformat, -u32 field) -{ -bool buf_interlaced = false; - -if (field ==V4L2_FIELD_INTERLACED - || field ==V4L2_FIELD_INTERLACED_TB - || field ==V4L2_FIELD_INTERLACED_BT ) - buf_interlaced = true; - -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; -case V4L2_PIX_FMT_SBGGR10 : -case V4L2_PIX_FMT_SGBRG10 : -case V4L2_PIX_FMT_SGRBG10 : -case V4L2_PIX_FMT_SRGGB10 : -return buf_interlaced ?CSI_FRAME_RAW_10 :CSI_FIELD_RAW_10 ; -case V4L2_PIX_FMT_SBGGR12 : -case V4L2_PIX_FMT_SGBRG12 : -case V4L2_PIX_FMT_SGRBG12 : -case V4L2_PIX_FMT_SRGGB12 : -return buf_interlaced ?CSI_FRAME_RAW_12 :CSI_FIELD_RAW_12 ; - -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -case V4L2_PIX_FMT_NV12_16L16 : -return buf_interlaced ?CSI_FRAME_MB_YUV420 : -CSI_FIELD_MB_YUV420 ; -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV420 : -CSI_FIELD_UV_CB_YUV420 ; -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV420 : -CSI_FIELD_PLANAR_YUV420 ; -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV422 : -CSI_FIELD_UV_CB_YUV422 ; -case V4L2_PIX_FMT_YUV422P : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV422 : -CSI_FIELD_PLANAR_YUV422 ; - -case V4L2_PIX_FMT_RGB565 : -case V4L2_PIX_FMT_RGB565X : -return buf_interlaced ?CSI_FRAME_RGB565 :CSI_FIELD_RGB565 ; - -case V4L2_PIX_FMT_JPEG : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); -break ; - } - -return CSI_FIELD_RAW_8 ; -} - -static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* Input sequence does not apply to non-YUV formats */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return 0 ; - -switch (pixformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YUYV ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YVYU ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YVU420 : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YVYU ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YUYV ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; - -case V4L2_PIX_FMT_YUYV : -return CSI_INPUT_SEQ_YUYV ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , - pixformat); -break ; - } - -return CSI_INPUT_SEQ_YUYV ; -} - -static void sun6i_csi_setup_bus (struct sun6i_csi_device *csi_dev) -{ -struct v4l2_fwnode_endpoint *endpoint = - &csi_dev->bridge.source_parallel.endpoint; -struct sun6i_csi_config *config = &csi_dev->config; -unsigned char bus_width; -u32 flags; -u32 cfg =0 ; -bool input_interlaced = false; - -if (config->field ==V4L2_FIELD_INTERLACED - || config->field ==V4L2_FIELD_INTERLACED_TB - || config->field ==V4L2_FIELD_INTERLACED_BT ) - input_interlaced = true; - - bus_width = endpoint->bus.parallel.bus_width; - -if (input_interlaced) - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | -SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | -SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ; -else - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; - -switch (endpoint->bus_type) { -case V4L2_MBUS_PARALLEL : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; - -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; -else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ; - -if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; - -if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; - -if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ; - -if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; -else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; -break ; -case V4L2_MBUS_BT656 : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; - -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; -else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ; - -if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; - -if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; -else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; -break ; -default : -dev_warn (csi_dev->dev,"Unsupported bus type: %d\n" , - endpoint->bus_type); -break ; - } - -switch (bus_width) { -case 8 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ; -break ; -case 10 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ; -break ; -case 12 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ; -break ; -case 16 :/* No need to configure DATA_WIDTH for 16bit */ -break ; -default : -dev_warn (csi_dev->dev,"Unsupported bus width: %u\n" , bus_width); -break ; - } - -regmap_write (csi_dev->regmap,SUN6I_CSI_IF_CFG_REG , cfg); -} - -static void sun6i_csi_set_format (struct sun6i_csi_device *csi_dev) -{ -struct sun6i_csi_config *config = &csi_dev->config; -u32 cfg =0 ; -u32 val; - - val =get_csi_input_format (csi_dev, config->code, - config->pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); - - val =get_csi_output_format (csi_dev, config->pixelformat, - config->field); - cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); - - val =get_csi_input_seq (csi_dev, config->code, - config->pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val); - -if (config->field ==V4L2_FIELD_TOP ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ; -else if (config->field ==V4L2_FIELD_BOTTOM ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ; -else - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; - -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_CFG_REG , cfg); -} - -static void sun6i_csi_set_window (struct sun6i_csi_device *csi_dev) -{ -struct sun6i_csi_config *config = &csi_dev->config; -u32 bytesperline_y; -u32 bytesperline_c; -u32 width = config->width; -u32 height = config->height; -u32 hor_len = width; - -switch (config->pixelformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -dev_dbg (csi_dev->dev, -"Horizontal length should be 2 times of width for packed YUV formats!\n" ); - hor_len = width *2 ; -break ; -default : -break ; - } - -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_HSIZE_REG , -SUN6I_CSI_CH_HSIZE_LEN (hor_len) | -SUN6I_CSI_CH_HSIZE_START (0 )); -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_VSIZE_REG , -SUN6I_CSI_CH_VSIZE_LEN (height) | -SUN6I_CSI_CH_VSIZE_START (0 )); - -switch (config->pixelformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : - bytesperline_y = width; - bytesperline_c = width; -break ; -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : - bytesperline_y = width; - bytesperline_c = width /2 ; -break ; -case V4L2_PIX_FMT_YUV422P : - bytesperline_y = width; - bytesperline_c = width /2 ; -break ; -default :/* raw */ -dev_dbg (csi_dev->dev, -"Calculating pixelformat(0x%x)'s bytesperline as a packed format\n" , - config->pixelformat); - bytesperline_y = (sun6i_csi_get_bpp (config->pixelformat) * - config->width) /8 ; - bytesperline_c =0 ; -break ; - } - -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_BUF_LEN_REG , -SUN6I_CSI_CH_BUF_LEN_CHROMA_LINE (bytesperline_c) | -SUN6I_CSI_CH_BUF_LEN_LUMA_LINE (bytesperline_y)); -} - -int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev, -struct sun6i_csi_config *config) -{ -if (!config) -return -EINVAL ; - -memcpy (&csi_dev->config, config,sizeof (csi_dev->config)); - -sun6i_csi_setup_bus (csi_dev); -sun6i_csi_set_format (csi_dev); -sun6i_csi_set_window (csi_dev); - -return 0 ; -} -/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -25
@@ -27,22 +27,6 @@ struct sun6i_csi_buffer {struct list_head list; }; -/** -* struct sun6i_csi_config - configs for sun6i csi -* @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*) -* @code: media bus format code (MEDIA_BUS_FMT_*) -* @field: used interlacing type (enum v4l2_field) -* @width: frame width -* @height: frame height -*/ -struct sun6i_csi_config { -u32 pixelformat; -u32 code; -u32 field; -u32 width; -u32 height; -}; -struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev;struct media_device media_dev;
@@ -51,7 +35,6 @@ struct sun6i_csi_v4l2 {struct sun6i_csi_device {struct device *dev; -struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2;struct sun6i_csi_bridge bridge;struct sun6i_csi_capture capture;
@@ -75,14 +58,6 @@ struct sun6i_csi_variant {bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code); -/** -* sun6i_csi_update_config() - update the csi register settings -* @csi: pointer to the csi -* @config: see struct sun6i_csi_config -*/ -int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev, -struct sun6i_csi_config *config); -/* get bpp form v4l2 pixformat */ static inline int sun6i_csi_get_bpp (unsigned int pixformat) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +356 -8
374 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 26/44 media: sun6i-csi: Rework capture format management with helper
In reply to Paul KocialkowskiRemove the need for local copies of the v4l2 format and add a common helper to prepare a format compatible with the driver, using the relevant v4l2 helpers.
Report a raw colorspace for bayer-encoded pixel formats instead of SRGB. Also cleanup the size bound defines while at it.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 122 +++++++++--------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 5 + 2 files changed, 66 insertions(+), 61 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +61 -61
@@ -20,12 +20,6 @@#include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h" -/* This is got from BSP sources. */ -#define MIN_WIDTH (32) -#define MIN_HEIGHT (32) -#define MAX_WIDTH (4800) -#define MAX_HEIGHT (4800) -/* Helpers */ void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
@@ -833,6 +827,55 @@ static const struct vb2_ops sun6i_csi_capture_queue_ops = {/* V4L2 Device */ +static void sun6i_csi_capture_format_prepare (struct v4l2_format *format) +{ +struct v4l2_pix_format *pix_format = &format->fmt.pix; +const struct v4l2_format_info *info; +unsigned int width, height; + +v4l_bound_align_image (&pix_format->width,SUN6I_CSI_CAPTURE_WIDTH_MIN , +SUN6I_CSI_CAPTURE_WIDTH_MAX ,1 , + &pix_format->height,SUN6I_CSI_CAPTURE_HEIGHT_MIN , +SUN6I_CSI_CAPTURE_HEIGHT_MAX ,1 ,0 ); + +if (!sun6i_csi_capture_format_check (pix_format->pixelformat)) + pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; + + width = pix_format->width; + height = pix_format->height; + + info =v4l2_format_info (pix_format->pixelformat); + +switch (pix_format->pixelformat) { +case V4L2_PIX_FMT_NV12_16L16 : + pix_format->bytesperline = width *12 /8 ; + pix_format->sizeimage = pix_format->bytesperline * height; +break ; +case V4L2_PIX_FMT_JPEG : + pix_format->bytesperline = width; + pix_format->sizeimage = pix_format->bytesperline * height; +break ; +default : +v4l2_fill_pixfmt (pix_format, pix_format->pixelformat, + width, height); +break ; + } + +if (pix_format->field ==V4L2_FIELD_ANY ) + pix_format->field =V4L2_FIELD_NONE ; + +if (pix_format->pixelformat ==V4L2_PIX_FMT_JPEG ) + pix_format->colorspace =V4L2_COLORSPACE_JPEG ; +else if (info && info->pixel_enc ==V4L2_PIXEL_ENC_BAYER ) + pix_format->colorspace =V4L2_COLORSPACE_RAW ; +else + pix_format->colorspace =V4L2_COLORSPACE_SRGB ; + + pix_format->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + pix_format->quantization =V4L2_QUANTIZATION_DEFAULT ; + pix_format->xfer_func =V4L2_XFER_FUNC_DEFAULT ; +} +static int sun6i_csi_capture_querycap (struct file *file,void *private,struct v4l2_capability *capability) {
@@ -864,54 +907,8 @@ static int sun6i_csi_capture_g_fmt(struct file *file, void *private, struct v4l2_format *format) {struct sun6i_csi_device *csi_dev =video_drvdata (file); -struct sun6i_csi_capture *capture = &csi_dev->capture; - *format = capture->format; - -return 0 ; -} - -static int sun6i_csi_capture_format_try (struct sun6i_csi_capture *capture, -struct v4l2_format *format) -{ -struct v4l2_pix_format *pix_format = &format->fmt.pix; -int bpp; - -if (!sun6i_csi_capture_format_check (pix_format->pixelformat)) - pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; - -v4l_bound_align_image (&pix_format->width,MIN_WIDTH ,MAX_WIDTH ,1 , - &pix_format->height,MIN_HEIGHT ,MAX_WIDTH ,1 ,1 ); - - bpp =sun6i_csi_get_bpp (pix_format->pixelformat); - pix_format->bytesperline = (pix_format->width * bpp) >>3 ; - pix_format->sizeimage = pix_format->bytesperline * pix_format->height; - -if (pix_format->field ==V4L2_FIELD_ANY ) - pix_format->field =V4L2_FIELD_NONE ; - -if (pix_format->pixelformat ==V4L2_PIX_FMT_JPEG ) - pix_format->colorspace =V4L2_COLORSPACE_JPEG ; -else - pix_format->colorspace =V4L2_COLORSPACE_SRGB ; - - pix_format->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; - pix_format->quantization =V4L2_QUANTIZATION_DEFAULT ; - pix_format->xfer_func =V4L2_XFER_FUNC_DEFAULT ; - -return 0 ; -} - -static int sun6i_csi_capture_format_set (struct sun6i_csi_capture *capture, -struct v4l2_format *format) -{ -int ret; - - ret =sun6i_csi_capture_format_try (capture, format); -if (ret) -return ret; - - capture->format = *format; + *format = csi_dev->capture.format;return 0 ; }
@@ -925,16 +922,19 @@ static int sun6i_csi_capture_s_fmt(struct file *file, void *private,if (vb2_is_busy (&capture->queue))return -EBUSY ; -return sun6i_csi_capture_format_set (capture, format); +sun6i_csi_capture_format_prepare (format); + + csi_dev->capture.format = *format; + +return 0 ; }static int sun6i_csi_capture_try_fmt (struct file *file,void *private,struct v4l2_format *format) { -struct sun6i_csi_device *csi_dev =video_drvdata (file); -struct sun6i_csi_capture *capture = &csi_dev->capture; +sun6i_csi_capture_format_prepare (format); -return sun6i_csi_capture_format_try (capture, format); +return 0 ; } static int sun6i_csi_capture_enum_input(struct file *file, void *private,
@@ -1125,8 +1125,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)struct video_device *video_dev = &capture->video_dev;struct vb2_queue *queue = &capture->queue;struct media_pad *pad = &capture->pad; -struct v4l2_format format = {0 }; -struct v4l2_pix_format *pix_format = &format.fmt.pix; +struct v4l2_format *format = &csi_dev->capture.format; +struct v4l2_pix_format *pix_format = &format->fmt.pix;int ret;/* State */
@@ -1169,13 +1169,13 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)/* V4L2 Format */ - format.type = queue->type; + format->type = queue->type; pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; pix_format->width =1280 ; pix_format->height =720 ; pix_format->field =V4L2_FIELD_NONE ; -sun6i_csi_capture_format_set (capture, &format); +sun6i_csi_capture_format_prepare (format);/* Video Device */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +5 -0
@@ -11,6 +11,11 @@#include <media/v4l2-dev.h> #include <media/videobuf2-core.h> +#define SUN6I_CSI_CAPTURE_WIDTH_MIN 32 +#define SUN6I_CSI_CAPTURE_WIDTH_MAX 4800 +#define SUN6I_CSI_CAPTURE_HEIGHT_MIN 32 +#define SUN6I_CSI_CAPTURE_HEIGHT_MAX 4800 +struct sun6i_csi_device ;#undef current
Signature · 1 line
2.36.1
PATCH v5 27/44 media: sun6i-csi: Remove custom format helper and rework configure
In reply to Paul KocialkowskiRemove the custom sun6i_csi_get_bpp helper in favor of common v4l2 infrastructure and rework the related window configuration code.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 49 ------------- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 70 +++++++++---------- 2 files changed, 35 insertions(+), 84 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -49
@@ -58,53 +58,4 @@ struct sun6i_csi_variant {bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code); -/* get bpp form v4l2 pixformat */ -static inline int sun6i_csi_get_bpp (unsigned int pixformat) -{ -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -case V4L2_PIX_FMT_JPEG : -return 8 ; -case V4L2_PIX_FMT_SBGGR10 : -case V4L2_PIX_FMT_SGBRG10 : -case V4L2_PIX_FMT_SGRBG10 : -case V4L2_PIX_FMT_SRGGB10 : -return 10 ; -case V4L2_PIX_FMT_SBGGR12 : -case V4L2_PIX_FMT_SGBRG12 : -case V4L2_PIX_FMT_SGRBG12 : -case V4L2_PIX_FMT_SRGGB12 : -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -return 12 ; -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YUV422P : -case V4L2_PIX_FMT_RGB565 : -case V4L2_PIX_FMT_RGB565X : -return 16 ; -case V4L2_PIX_FMT_RGB24 : -case V4L2_PIX_FMT_BGR24 : -return 24 ; -case V4L2_PIX_FMT_RGB32 : -case V4L2_PIX_FMT_BGR32 : -return 32 ; -default : -WARN (1 ,"Unsupported pixformat: 0x%x\n" , pixformat); -break ; - } - -return 0 ; -} -#endif /* __SUN6I_CSI_H__ */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +35 -35
103 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 28/44 media: sun6i-csi: Add bridge dimensions and format helpers
In reply to Paul KocialkowskiIntroduce new helpers to ease getting information about the bridge.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 20 +++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 7 +++++++ 2 files changed, 27 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +20 -0
@@ -12,6 +12,26 @@#include "sun6i_csi.h" #include "sun6i_csi_bridge.h" +/* Helpers */ + +void sun6i_csi_bridge_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height) +{ +if (width) + *width = csi_dev->bridge.mbus_format.width; +if (height) + *height = csi_dev->bridge.mbus_format.height; +} + +void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev, +u32 *mbus_code,u32 *field) +{ +if (mbus_code) + *mbus_code = csi_dev->bridge.mbus_format.code; +if (field) + *field = csi_dev->bridge.mbus_format.field; +} +/* Format */ static const u32 sun6i_csi_bridge_mbus_codes[] = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +7 -0
@@ -41,6 +41,13 @@ struct sun6i_csi_bridge {struct sun6i_csi_bridge_source source_parallel; }; +/* Helpers */ + +void sun6i_csi_bridge_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height); +void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev, +u32 *mbus_code,u32 *field); +/* Bridge */ int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.36.1
PATCH v5 29/44 media: sun6i-csi: Get mbus code from bridge instead of storing it
In reply to Paul KocialkowskiAnother instance of removing a duplicated variable and using common helpers instead.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 18 +++++------------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 - 2 files changed, 5 insertions(+), 14 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +5 -13
@@ -17,6 +17,7 @@#include <media/videobuf2-v4l2.h> #include "sun6i_csi.h" +#include "sun6i_csi_bridge.h" #include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h"
@@ -455,20 +456,20 @@ sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev)static void sun6i_csi_capture_configure_format (struct sun6i_csi_device *csi_dev) { -struct sun6i_csi_capture *capture = &csi_dev->capture; -u32 pixelformat, field; +u32 mbus_code, pixelformat, field;u32 cfg =0 ;u32 val;sun6i_csi_capture_format (csi_dev, &pixelformat, &field); +sun6i_csi_bridge_format (csi_dev, &mbus_code,NULL ); - val =get_csi_input_format (csi_dev, capture->mbus_code, pixelformat); + val =get_csi_input_format (csi_dev, mbus_code, pixelformat); cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); val =get_csi_output_format (csi_dev, pixelformat, field); cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); - val =get_csi_input_seq (csi_dev, capture->mbus_code, pixelformat); + val =get_csi_input_seq (csi_dev, mbus_code, pixelformat); cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val);if (field ==V4L2_FIELD_TOP )
@@ -739,11 +740,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,if (ret <0 ) goto error_state; -if (capture->mbus_code ==0 ) { - ret = -EINVAL ; - goto error_media_pipeline; - } - subdev =sun6i_csi_capture_remote_subdev (capture,NULL );if (!subdev) { ret = -EINVAL ;
@@ -1072,8 +1068,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)struct v4l2_subdev_format source_fmt;int ret; - capture->mbus_code =0 ; -if (!media_entity_remote_pad (link->sink->entity->pads)) {dev_info (csi_dev->dev,"capture node %s pad not connected\n" , vdev->name);
@@ -1105,8 +1099,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)return -EPIPE ; } - capture->mbus_code = source_fmt.format.code; -return 0 ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +0 -1
@@ -39,7 +39,6 @@ struct sun6i_csi_capture {struct media_pad pad;struct v4l2_format format; -u32 mbus_code; }; void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
Signature · 1 line
2.36.1
PATCH v5 30/44 media: sun6i-csi: Tidy capture configure code
In reply to Paul KocialkowskiSome misc code cleanups and preparation for upcoming changes.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 105 ++++++++---------- 1 file changed, 46 insertions(+), 59 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +46 -59
@@ -353,133 +353,120 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_device *csi_dev,static void sun6i_csi_capture_configure_interface (struct sun6i_csi_device *csi_dev) { +struct device *dev = csi_dev->dev; +struct regmap *regmap = csi_dev->regmap;struct v4l2_fwnode_endpoint *endpoint = &csi_dev->bridge.source_parallel.endpoint; +unsigned char bus_width = endpoint->bus.parallel.bus_width; +unsigned int flags = endpoint->bus.parallel.flags;u32 pixelformat, field; -unsigned char bus_width; -u32 flags; -u32 cfg =0 ; -bool input_interlaced = false; +u32 value =SUN6I_CSI_IF_CFG_IF_CSI ;sun6i_csi_capture_format (csi_dev, &pixelformat, &field);if (field ==V4L2_FIELD_INTERLACED || field ==V4L2_FIELD_INTERLACED_TB || field ==V4L2_FIELD_INTERLACED_BT ) - input_interlaced = true; - - bus_width = endpoint->bus.parallel.bus_width; - -if (input_interlaced) - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | -SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | -SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ; + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | +SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | +SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ;else - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ;switch (endpoint->bus_type) {case V4L2_MBUS_PARALLEL : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ;else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ;if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ;else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;case V4L2_MBUS_BT656 : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ;else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ;else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;default : -dev_warn (csi_dev->dev,"Unsupported bus type: %d\n" , - endpoint->bus_type); +dev_warn (dev,"unsupported bus type: %d\n" , endpoint->bus_type);break ; }switch (bus_width) {case 8 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ; +/* 16-bit YUV formats use a doubled width in 8-bit mode. */ +case 16 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ;break ;case 10 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ; + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ;break ;case 12 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ; -break ; -case 16 :/* No need to configure DATA_WIDTH for 16bit */ + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ;break ;default : -dev_warn (csi_dev->dev,"Unsupported bus width: %u\n" , bus_width); +dev_warn (dev,"unsupported bus width: %u\n" , bus_width);break ; } -regmap_write (csi_dev->regmap,SUN6I_CSI_IF_CFG_REG , cfg); +regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); }static void sun6i_csi_capture_configure_format (struct sun6i_csi_device *csi_dev) { +struct regmap *regmap = csi_dev->regmap;u32 mbus_code, pixelformat, field; -u32 cfg =0 ; -u32 val; +u8 input_format, input_yuv_seq, output_format; +u32 value =0 ;sun6i_csi_capture_format (csi_dev, &pixelformat, &field);sun6i_csi_bridge_format (csi_dev, &mbus_code,NULL ); - val =get_csi_input_format (csi_dev, mbus_code, pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); - - val =get_csi_output_format (csi_dev, pixelformat, field); - cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); + input_format =get_csi_input_format (csi_dev, mbus_code, pixelformat); + input_yuv_seq =get_csi_input_seq (csi_dev, mbus_code, pixelformat); + output_format =get_csi_output_format (csi_dev, pixelformat, field); - val =get_csi_input_seq (csi_dev, mbus_code, pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val); + value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); + value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format); + value |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (input_yuv_seq);if (field ==V4L2_FIELD_TOP ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ; + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ;else if (field ==V4L2_FIELD_BOTTOM ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ; + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ;else - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_CFG_REG , cfg); +regmap_write (regmap,SUN6I_CSI_CH_CFG_REG , value); }static void sun6i_csi_capture_configure_window (struct sun6i_csi_device *csi_dev)
Signature · 1 line
2.36.1
PATCH v5 31/44 media: sun6i-csi: Introduce bridge format structure, list and helper
In reply to Paul KocialkowskiIntroduce a more informative format list for the bridge, with information about how to configure the input. This separation will later be useful when using the bridge standalone (without capture) for the isp workflow.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 169 ++++++++++++++---- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 12 ++ 2 files changed, 145 insertions(+), 36 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +133 -36
@@ -11,6 +11,7 @@#include "sun6i_csi.h" #include "sun6i_csi_bridge.h" +#include "sun6i_csi_reg.h" /* Helpers */
@@ -34,47 +35,143 @@ void sun6i_csi_bridge_format(struct sun6i_csi_device *csi_dev,/* Format */ -static const u32 sun6i_csi_bridge_mbus_codes[] = { +static const struct sun6i_csi_bridge_format sun6i_csi_bridge_formats[] = {/* Bayer */ -MEDIA_BUS_FMT_SBGGR8_1X8 , -MEDIA_BUS_FMT_SGBRG8_1X8 , -MEDIA_BUS_FMT_SGRBG8_1X8 , -MEDIA_BUS_FMT_SRGGB8_1X8 , -MEDIA_BUS_FMT_SBGGR10_1X10 , -MEDIA_BUS_FMT_SGBRG10_1X10 , -MEDIA_BUS_FMT_SGRBG10_1X10 , -MEDIA_BUS_FMT_SRGGB10_1X10 , -MEDIA_BUS_FMT_SBGGR12_1X12 , -MEDIA_BUS_FMT_SGBRG12_1X12 , -MEDIA_BUS_FMT_SGRBG12_1X12 , -MEDIA_BUS_FMT_SRGGB12_1X12 , + { + .mbus_code =MEDIA_BUS_FMT_SBGGR8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGBRG8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGRBG8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SRGGB8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SBGGR10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGBRG10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGRBG10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SRGGB10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SBGGR12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGBRG12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGRBG12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SRGGB12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + },/* RGB */ -MEDIA_BUS_FMT_RGB565_2X8_LE , -MEDIA_BUS_FMT_RGB565_2X8_BE , + { + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_LE , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_BE , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + },/* YUV422 */ -MEDIA_BUS_FMT_YUYV8_2X8 , -MEDIA_BUS_FMT_UYVY8_2X8 , -MEDIA_BUS_FMT_YVYU8_2X8 , -MEDIA_BUS_FMT_UYVY8_2X8 , -MEDIA_BUS_FMT_VYUY8_2X8 , -MEDIA_BUS_FMT_YUYV8_1X16 , -MEDIA_BUS_FMT_UYVY8_1X16 , -MEDIA_BUS_FMT_YVYU8_1X16 , -MEDIA_BUS_FMT_UYVY8_1X16 , -MEDIA_BUS_FMT_VYUY8_1X16 , + { + .mbus_code =MEDIA_BUS_FMT_YUYV8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_YVYU8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_VYUY8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + }, + { + .mbus_code =MEDIA_BUS_FMT_YUYV8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_YVYU8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_VYUY8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + },/* Compressed */ -MEDIA_BUS_FMT_JPEG_1X8 , + { + .mbus_code =MEDIA_BUS_FMT_JPEG_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, }; -static bool sun6i_csi_bridge_mbus_code_check (u32 mbus_code) +const struct sun6i_csi_bridge_format * +sun6i_csi_bridge_format_find (u32 mbus_code) {unsigned int i; -for (i =0 ; i <ARRAY_SIZE (sun6i_csi_bridge_mbus_codes); i++) -if (sun6i_csi_bridge_mbus_codes[i] == mbus_code) -return true; +for (i =0 ; i <ARRAY_SIZE (sun6i_csi_bridge_formats); i++) +if (sun6i_csi_bridge_formats[i].mbus_code == mbus_code) +return &sun6i_csi_bridge_formats[i]; -return false; +return NULL ; }/* V4L2 Subdev */
@@ -125,8 +222,8 @@ static const struct v4l2_subdev_video_ops sun6i_csi_bridge_video_ops = {static void sun6i_csi_bridge_mbus_format_prepare (struct v4l2_mbus_framefmt *mbus_format) { -if (!sun6i_csi_bridge_mbus_code_check (mbus_format->code)) - mbus_format->code = sun6i_csi_bridge_mbus_codes[0 ]; +if (!sun6i_csi_bridge_format_find (mbus_format->code)) + mbus_format->code = sun6i_csi_bridge_formats[0 ].mbus_code; mbus_format->field =V4L2_FIELD_NONE ; mbus_format->colorspace =V4L2_COLORSPACE_RAW ;
@@ -145,7 +242,7 @@ static int sun6i_csi_bridge_init_cfg(struct v4l2_subdev *subdev,mutex_lock (lock); - mbus_format->code = sun6i_csi_bridge_mbus_codes[0 ]; + mbus_format->code = sun6i_csi_bridge_formats[0 ].mbus_code; mbus_format->width =1280 ; mbus_format->height =720 ;
@@ -161,10 +258,10 @@ sun6i_csi_bridge_enum_mbus_code(struct v4l2_subdev *subdev, struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code_enum) { -if (code_enum->index >=ARRAY_SIZE (sun6i_csi_bridge_mbus_codes)) +if (code_enum->index >=ARRAY_SIZE (sun6i_csi_bridge_formats))return -EINVAL ; - code_enum->code = sun6i_csi_bridge_mbus_codes[code_enum->index]; + code_enum->code = sun6i_csi_bridge_formats[code_enum->index].mbus_code;return 0 ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +12 -0
@@ -20,6 +20,13 @@ enum sun6i_csi_bridge_pad {struct sun6i_csi_device ; +struct sun6i_csi_bridge_format { +u32 mbus_code; +u8 input_format; +u8 input_yuv_seq; +u8 input_yuv_seq_invert; +}; +struct sun6i_csi_bridge_source {struct v4l2_subdev *subdev;struct v4l2_fwnode_endpoint endpoint;
@@ -48,6 +55,11 @@ void sun6i_csi_bridge_dimensions(struct sun6i_csi_device *csi_dev,void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev,u32 *mbus_code,u32 *field); +/* Format */ + +const struct sun6i_csi_bridge_format * +sun6i_csi_bridge_format_find (u32 mbus_code); +/* Bridge */ int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.36.1
PATCH v5 32/44 media: sun6i-csi: Introduce capture format structure, list and helper
In reply to Paul KocialkowskiAdd a table that describes each pixel format and associated output register configuration with necessary tweaks. It will be used later on to configure the hardware.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 199 ++++++++++++++---- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 12 ++ 2 files changed, 175 insertions(+), 36 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +163 -36
@@ -60,45 +60,171 @@ sun6i_csi_capture_remote_subdev(struct sun6i_csi_capture *capture, u32 *pad)/* Format */ -static const u32 sun6i_csi_capture_formats[] = { -V4L2_PIX_FMT_SBGGR8 , -V4L2_PIX_FMT_SGBRG8 , -V4L2_PIX_FMT_SGRBG8 , -V4L2_PIX_FMT_SRGGB8 , -V4L2_PIX_FMT_SBGGR10 , -V4L2_PIX_FMT_SGBRG10 , -V4L2_PIX_FMT_SGRBG10 , -V4L2_PIX_FMT_SRGGB10 , -V4L2_PIX_FMT_SBGGR12 , -V4L2_PIX_FMT_SGBRG12 , -V4L2_PIX_FMT_SGRBG12 , -V4L2_PIX_FMT_SRGGB12 , -V4L2_PIX_FMT_YUYV , -V4L2_PIX_FMT_YVYU , -V4L2_PIX_FMT_UYVY , -V4L2_PIX_FMT_VYUY , -V4L2_PIX_FMT_NV12_16L16 , -V4L2_PIX_FMT_NV12 , -V4L2_PIX_FMT_NV21 , -V4L2_PIX_FMT_YUV420 , -V4L2_PIX_FMT_YVU420 , -V4L2_PIX_FMT_NV16 , -V4L2_PIX_FMT_NV61 , -V4L2_PIX_FMT_YUV422P , -V4L2_PIX_FMT_RGB565 , -V4L2_PIX_FMT_RGB565X , -V4L2_PIX_FMT_JPEG , +static const struct sun6i_csi_capture_format sun6i_csi_capture_formats[] = { +/* Bayer */ + { + .pixelformat =V4L2_PIX_FMT_SBGGR8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, +/* RGB */ + { + .pixelformat =V4L2_PIX_FMT_RGB565 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RGB565 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RGB565 , + }, + { + .pixelformat =V4L2_PIX_FMT_RGB565X , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RGB565 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RGB565 , + }, +/* YUV422 */ + { + .pixelformat =V4L2_PIX_FMT_YUYV , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_YVYU , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_UYVY , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_VYUY , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_NV16 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV422SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV422SP , + }, + { + .pixelformat =V4L2_PIX_FMT_NV61 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV422SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV422SP , + .input_yuv_seq_invert = true, + }, + { + .pixelformat =V4L2_PIX_FMT_YUV422P , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV422P , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV422P , + }, +/* YUV420 */ + { + .pixelformat =V4L2_PIX_FMT_NV12_16L16 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420MB , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420MB , + }, + { + .pixelformat =V4L2_PIX_FMT_NV12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420SP , + }, + { + .pixelformat =V4L2_PIX_FMT_NV21 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420SP , + .input_yuv_seq_invert = true, + }, + + { + .pixelformat =V4L2_PIX_FMT_YUV420 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420P , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420P , + }, + { + .pixelformat =V4L2_PIX_FMT_YVU420 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420P , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420P , + .input_yuv_seq_invert = true, + }, +/* Compressed */ + { + .pixelformat =V4L2_PIX_FMT_JPEG , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, }; -static bool sun6i_csi_capture_format_check (u32 format) +const +struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat) {unsigned int i;for (i =0 ; i <ARRAY_SIZE (sun6i_csi_capture_formats); i++) -if (sun6i_csi_capture_formats[i] == format) -return true; +if (sun6i_csi_capture_formats[i].pixelformat == pixelformat) +return &sun6i_csi_capture_formats[i]; -return false; +return NULL ; }/* Capture */
@@ -821,8 +947,9 @@ static void sun6i_csi_capture_format_prepare(struct v4l2_format *format) &pix_format->height,SUN6I_CSI_CAPTURE_HEIGHT_MIN , SUN6I_CSI_CAPTURE_HEIGHT_MAX, 1, 0); -if (!sun6i_csi_capture_format_check (pix_format->pixelformat)) - pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; +if (!sun6i_csi_capture_format_find (pix_format->pixelformat)) + pix_format->pixelformat = + sun6i_csi_capture_formats[0 ].pixelformat; width = pix_format->width; height = pix_format->height;
@@ -881,7 +1008,7 @@ static int sun6i_csi_capture_enum_fmt(struct file *file, void *private,if (index >=ARRAY_SIZE (sun6i_csi_capture_formats))return -EINVAL ; - fmtdesc->pixelformat = sun6i_csi_capture_formats[index]; + fmtdesc->pixelformat = sun6i_csi_capture_formats[index].pixelformat;return 0 ; }
@@ -1149,7 +1276,7 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)/* V4L2 Format */ format->type = queue->type; - pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; + pix_format->pixelformat = sun6i_csi_capture_formats[0 ].pixelformat; pix_format->width =1280 ; pix_format->height =720 ; pix_format->field =V4L2_FIELD_NONE ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +12 -0
@@ -18,6 +18,15 @@struct sun6i_csi_device ; +struct sun6i_csi_capture_format { +u32 pixelformat; +u8 output_format_field; +u8 output_format_frame; +bool input_yuv_seq_invert; +bool input_format_raw; +u32 hsize_len_factor; +}; +#undef currentstruct sun6i_csi_capture_state {struct list_head queue;
@@ -46,6 +55,9 @@ void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev,u32 *pixelformat,u32 *field); +const +struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat); +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.36.1
PATCH v5 33/44 media: sun6i-csi: Configure registers from format tables
In reply to Paul KocialkowskiSwitch over to using the static format table descriptions to configure registers. Rework the hardware configuration helpers to leverage information from the format structures and benefit from their logic. Remove the previous dedicated helpers.
The intention is to make the interaction between the different formats and the hardware side more visible and clear.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 210 +++--------------- .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 55 ----- 2 files changed, 36 insertions(+), 229 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +36 -174
@@ -319,163 +319,6 @@ sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev, } } -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* non-YUV */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return CSI_INPUT_FORMAT_RAW ; - -switch (pixformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return CSI_INPUT_FORMAT_RAW ; -default : -break ; - } - -/* not support YUV420 input format yet */ -dev_dbg (csi_dev->dev,"Select YUV422 as default input format of CSI.\n" ); -return CSI_INPUT_FORMAT_YUV422 ; -} - -static enum csi_output_fmt -get_csi_output_format (struct sun6i_csi_device *csi_dev,u32 pixformat, -u32 field) -{ -bool buf_interlaced = false; - -if (field ==V4L2_FIELD_INTERLACED - || field ==V4L2_FIELD_INTERLACED_TB - || field ==V4L2_FIELD_INTERLACED_BT ) - buf_interlaced = true; - -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; -case V4L2_PIX_FMT_SBGGR10 : -case V4L2_PIX_FMT_SGBRG10 : -case V4L2_PIX_FMT_SGRBG10 : -case V4L2_PIX_FMT_SRGGB10 : -return buf_interlaced ?CSI_FRAME_RAW_10 :CSI_FIELD_RAW_10 ; -case V4L2_PIX_FMT_SBGGR12 : -case V4L2_PIX_FMT_SGBRG12 : -case V4L2_PIX_FMT_SGRBG12 : -case V4L2_PIX_FMT_SRGGB12 : -return buf_interlaced ?CSI_FRAME_RAW_12 :CSI_FIELD_RAW_12 ; - -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -case V4L2_PIX_FMT_NV12_16L16 : -return buf_interlaced ?CSI_FRAME_MB_YUV420 : -CSI_FIELD_MB_YUV420 ; -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV420 : -CSI_FIELD_UV_CB_YUV420 ; -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV420 : -CSI_FIELD_PLANAR_YUV420 ; -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV422 : -CSI_FIELD_UV_CB_YUV422 ; -case V4L2_PIX_FMT_YUV422P : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV422 : -CSI_FIELD_PLANAR_YUV422 ; - -case V4L2_PIX_FMT_RGB565 : -case V4L2_PIX_FMT_RGB565X : -return buf_interlaced ?CSI_FRAME_RGB565 :CSI_FIELD_RGB565 ; - -case V4L2_PIX_FMT_JPEG : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); -break ; - } - -return CSI_FIELD_RAW_8 ; -} - -static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* Input sequence does not apply to non-YUV formats */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return 0 ; - -switch (pixformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YUYV ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YVYU ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YVU420 : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YVYU ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YUYV ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; - -case V4L2_PIX_FMT_YUYV : -return CSI_INPUT_SEQ_YUYV ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , - pixformat); -break ; - } - -return CSI_INPUT_SEQ_YUYV ; -} -static void sun6i_csi_capture_configure_interface (struct sun6i_csi_device *csi_dev) {
@@ -570,6 +413,8 @@ sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev)static void sun6i_csi_capture_configure_format (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap; +const struct sun6i_csi_bridge_format *bridge_format; +const struct sun6i_csi_capture_format *capture_format;u32 mbus_code, pixelformat, field;u8 input_format, input_yuv_seq, output_format;u32 value =0 ;
@@ -577,9 +422,29 @@ static void sun6i_csi_capture_configure_format(struct sun6i_csi_device *csi_dev)sun6i_csi_capture_format (csi_dev, &pixelformat, &field);sun6i_csi_bridge_format (csi_dev, &mbus_code,NULL ); - input_format =get_csi_input_format (csi_dev, mbus_code, pixelformat); - input_yuv_seq =get_csi_input_seq (csi_dev, mbus_code, pixelformat); - output_format =get_csi_output_format (csi_dev, pixelformat, field); + bridge_format =sun6i_csi_bridge_format_find (mbus_code); +if (WARN_ON (!bridge_format)) +return ; + + input_format = bridge_format->input_format; + input_yuv_seq = bridge_format->input_yuv_seq; + + capture_format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!capture_format)) +return ; + +if (capture_format->input_format_raw) + input_format =SUN6I_CSI_INPUT_FMT_RAW ; + +if (capture_format->input_yuv_seq_invert) + input_yuv_seq = bridge_format->input_yuv_seq_invert; + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + output_format = capture_format->output_format_field; +else + output_format = capture_format->output_format_frame; value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format);
@@ -598,6 +463,7 @@ static void sun6i_csi_capture_configure_format(struct sun6i_csi_device *csi_dev)static void sun6i_csi_capture_configure_window (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap; +const struct sun6i_csi_capture_format *format;const struct v4l2_format_info *info;u32 hsize_len, vsize_len;u32 luma_line, chroma_line =0 ;
@@ -607,23 +473,19 @@ static void sun6i_csi_capture_configure_window(struct sun6i_csi_device *csi_dev)sun6i_csi_capture_dimensions (csi_dev, &width, &height);sun6i_csi_capture_format (csi_dev, &pixelformat, &field); + format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!format)) +return ; + hsize_len = width; vsize_len = height; -switch (pixelformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -/* -* Horizontal length should be 2 times of width for packed -* YUV formats. -*/ - hsize_len *=2 ; -break ; -default : -break ; - } +/* +* When using 8-bit raw input/output (for packed YUV), we need to adapt +* the width to account for the difference in bpp when it's not 8-bit. +*/ +if (format->hsize_len_factor) + hsize_len *= format->hsize_len_factor; regmap_write(regmap, SUN6I_CSI_CH_HSIZE_REG, SUN6I_CSI_CH_HSIZE_LEN(hsize_len) |
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +0 -55
59 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 34/44 media: sun6i-csi: Introduce format match structure, list and helper
In reply to Paul KocialkowskiIntroduce a list of mbus/pixel format combinations that need an exact match between the two sides. This is the case when using raw input configuration. The list will be used to replace the sun6i_csi_is_format_supported combinatory helper.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 117 ++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.h | 5 + 2 files changed, 122 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +117 -0
@@ -227,6 +227,123 @@ struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 pixelformat)return NULL ; } +/* RAW formats need an exact match between pixel and mbus formats. */ +static const +struct sun6i_csi_capture_format_match sun6i_csi_capture_format_matches[] = { +/* YUV420 */ + { + .pixelformat =V4L2_PIX_FMT_YUYV , + .mbus_code =MEDIA_BUS_FMT_YUYV8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_YUYV , + .mbus_code =MEDIA_BUS_FMT_YUYV8_1X16 , + }, + { + .pixelformat =V4L2_PIX_FMT_YVYU , + .mbus_code =MEDIA_BUS_FMT_YVYU8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_YVYU , + .mbus_code =MEDIA_BUS_FMT_YVYU8_1X16 , + }, + { + .pixelformat =V4L2_PIX_FMT_UYVY , + .mbus_code =MEDIA_BUS_FMT_UYVY8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_UYVY , + .mbus_code =MEDIA_BUS_FMT_UYVY8_1X16 , + }, + { + .pixelformat =V4L2_PIX_FMT_VYUY , + .mbus_code =MEDIA_BUS_FMT_VYUY8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_VYUY , + .mbus_code =MEDIA_BUS_FMT_VYUY8_1X16 , + }, +/* RGB */ + { + .pixelformat =V4L2_PIX_FMT_RGB565 , + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_LE , + }, + { + .pixelformat =V4L2_PIX_FMT_RGB565X , + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_BE , + }, +/* Bayer */ + { + .pixelformat =V4L2_PIX_FMT_SBGGR8 , + .mbus_code =MEDIA_BUS_FMT_SBGGR8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG8 , + .mbus_code =MEDIA_BUS_FMT_SGBRG8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG8 , + .mbus_code =MEDIA_BUS_FMT_SGRBG8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB8 , + .mbus_code =MEDIA_BUS_FMT_SRGGB8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR10 , + .mbus_code =MEDIA_BUS_FMT_SBGGR10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG10 , + .mbus_code =MEDIA_BUS_FMT_SGBRG10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG10 , + .mbus_code =MEDIA_BUS_FMT_SGRBG10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB10 , + .mbus_code =MEDIA_BUS_FMT_SRGGB10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR12 , + .mbus_code =MEDIA_BUS_FMT_SBGGR12_1X12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG12 , + .mbus_code =MEDIA_BUS_FMT_SGBRG12_1X12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG12 , + .mbus_code =MEDIA_BUS_FMT_SGRBG12_1X12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB12 , + .mbus_code =MEDIA_BUS_FMT_SRGGB12_1X12 , + }, +/* Compressed */ + { + .pixelformat =V4L2_PIX_FMT_JPEG , + .mbus_code =MEDIA_BUS_FMT_JPEG_1X8 , + }, +}; + +static bool sun6i_csi_capture_format_match (u32 pixelformat,u32 mbus_code) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (sun6i_csi_capture_format_matches); i++) { +const struct sun6i_csi_capture_format_match *match = + &sun6i_csi_capture_format_matches[i]; + +if (match->pixelformat == pixelformat && + match->mbus_code == mbus_code) +return true; + } + +return false; +} +/* Capture */ static void sun6i_csi_capture_irq_enable (struct sun6i_csi_device *csi_dev)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +5 -0
@@ -27,6 +27,11 @@ struct sun6i_csi_capture_format {u32 hsize_len_factor; }; +struct sun6i_csi_capture_format_match { +u32 pixelformat; +u32 mbus_code; +}; +#undef currentstruct sun6i_csi_capture_state {struct list_head queue;
Signature · 1 line
2.36.1
PATCH v5 35/44 media: sun6i-csi: Implement capture link validation with logic
In reply to Paul KocialkowskiRework the capture link validate implementation with actual logic that reflects the possibilities of the device instead of the combinatory helper functions, using the match list when needed.
Remove the previous dedicated helper.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 120 ------------------ .../platform/sunxi/sun6i-csi/sun6i_csi.h | 9 -- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 106 +++++++++------- 3 files changed, 62 insertions(+), 173 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -120
@@ -28,126 +28,6 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" -/* Helpers */ - -/* TODO add 10&12 bit YUV, RGB support */ -bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev, -u32 pixformat,u32 mbus_code) -{ -struct v4l2_fwnode_endpoint *endpoint = - &csi_dev->bridge.source_parallel.endpoint; - -/* -* Some video receivers have the ability to be compatible with -* 8bit and 16bit bus width. -* Identify the media bus format from device tree. -*/ -if ((endpoint->bus_type ==V4L2_MBUS_PARALLEL - || endpoint->bus_type ==V4L2_MBUS_BT656 ) - && endpoint->bus.parallel.bus_width ==16 ) { -switch (pixformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_1X16 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -case MEDIA_BUS_FMT_YVYU8_1X16 : -return true; -default : -dev_dbg (csi_dev->dev, -"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; -default : -dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , - pixformat); -break ; - } -return false; - } - -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -return (mbus_code ==MEDIA_BUS_FMT_SBGGR8_1X8 ); -case V4L2_PIX_FMT_SGBRG8 : -return (mbus_code ==MEDIA_BUS_FMT_SGBRG8_1X8 ); -case V4L2_PIX_FMT_SGRBG8 : -return (mbus_code ==MEDIA_BUS_FMT_SGRBG8_1X8 ); -case V4L2_PIX_FMT_SRGGB8 : -return (mbus_code ==MEDIA_BUS_FMT_SRGGB8_1X8 ); -case V4L2_PIX_FMT_SBGGR10 : -return (mbus_code ==MEDIA_BUS_FMT_SBGGR10_1X10 ); -case V4L2_PIX_FMT_SGBRG10 : -return (mbus_code ==MEDIA_BUS_FMT_SGBRG10_1X10 ); -case V4L2_PIX_FMT_SGRBG10 : -return (mbus_code ==MEDIA_BUS_FMT_SGRBG10_1X10 ); -case V4L2_PIX_FMT_SRGGB10 : -return (mbus_code ==MEDIA_BUS_FMT_SRGGB10_1X10 ); -case V4L2_PIX_FMT_SBGGR12 : -return (mbus_code ==MEDIA_BUS_FMT_SBGGR12_1X12 ); -case V4L2_PIX_FMT_SGBRG12 : -return (mbus_code ==MEDIA_BUS_FMT_SGBRG12_1X12 ); -case V4L2_PIX_FMT_SGRBG12 : -return (mbus_code ==MEDIA_BUS_FMT_SGRBG12_1X12 ); -case V4L2_PIX_FMT_SRGGB12 : -return (mbus_code ==MEDIA_BUS_FMT_SRGGB12_1X12 ); - -case V4L2_PIX_FMT_YUYV : -return (mbus_code ==MEDIA_BUS_FMT_YUYV8_2X8 ); -case V4L2_PIX_FMT_YVYU : -return (mbus_code ==MEDIA_BUS_FMT_YVYU8_2X8 ); -case V4L2_PIX_FMT_UYVY : -return (mbus_code ==MEDIA_BUS_FMT_UYVY8_2X8 ); -case V4L2_PIX_FMT_VYUY : -return (mbus_code ==MEDIA_BUS_FMT_VYUY8_2X8 ); - -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return true; -default : -dev_dbg (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; - -case V4L2_PIX_FMT_RGB565 : -return (mbus_code ==MEDIA_BUS_FMT_RGB565_2X8_LE ); -case V4L2_PIX_FMT_RGB565X : -return (mbus_code ==MEDIA_BUS_FMT_RGB565_2X8_BE ); - -case V4L2_PIX_FMT_JPEG : -return (mbus_code ==MEDIA_BUS_FMT_JPEG_1X8 ); - -default : -dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , - pixformat); -break ; - } - -return false; -} -/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -9
@@ -49,13 +49,4 @@ struct sun6i_csi_variant { unsigned long clock_mod_rate; }; -/** -* sun6i_csi_is_format_supported() - check if the format supported by csi -* @csi: pointer to the csi -* @pixformat: v4l2 pixel format (V4L2_PIX_FMT_*) -* @mbus_code: media bus format code (MEDIA_BUS_FMT_*) -*/ -bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev, -u32 pixformat,u32 mbus_code); -#endif /* __SUN6I_CSI_H__ */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +62 -44
125 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 36/44 media: sun6i-csi: Get bridge subdev directly in capture stream ops
In reply to Paul KocialkowskiThe remote subdev connected to the capture video device is always our bridge, so get the bridge subdev directly instead of using a dedicated helper (which is removed by this commit).
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +3 -27
@@ -42,22 +42,6 @@ void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev, *field = csi_dev->capture.format.fmt.pix.field; } -static struct v4l2_subdev * -sun6i_csi_capture_remote_subdev (struct sun6i_csi_capture *capture,u32 *pad) -{ -struct media_pad *remote; - - remote =media_entity_remote_pad (&capture->pad); - -if (!remote || !is_media_entity_v4l2_subdev (remote->entity)) -return NULL ; - -if (pad) - *pad = remote->index; - -return media_entity_to_v4l2_subdev (remote->entity); -} -/* Format */ static const struct sun6i_csi_capture_format sun6i_csi_capture_formats[] = {
@@ -822,8 +806,8 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,struct sun6i_csi_capture *capture = &csi_dev->capture;struct sun6i_csi_capture_state *state = &capture->state;struct video_device *video_dev = &capture->video_dev; +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;struct device *dev = csi_dev->dev; -struct v4l2_subdev *subdev;int ret; state->sequence =0 ;
@@ -832,12 +816,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,if (ret <0 ) goto error_state; - subdev =sun6i_csi_capture_remote_subdev (capture,NULL ); -if (!subdev) { - ret = -EINVAL ; - goto error_media_pipeline; - } -/* PM */ ret =pm_runtime_resume_and_get (dev);
@@ -886,12 +864,10 @@ static void sun6i_csi_capture_stop_streaming(struct vb2_queue *queue) {struct sun6i_csi_device *csi_dev =vb2_get_drv_priv (queue);struct sun6i_csi_capture *capture = &csi_dev->capture; +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;struct device *dev = csi_dev->dev; -struct v4l2_subdev *subdev; - subdev =sun6i_csi_capture_remote_subdev (capture,NULL ); -if (subdev) -v4l2_subdev_call (subdev, video, s_stream,0 ); +v4l2_subdev_call (subdev, video, s_stream,0 );sun6i_csi_capture_disable (csi_dev);sun6i_csi_capture_irq_disable (csi_dev);
Signature · 1 line
2.36.1
PATCH v5 37/44 media: sun6i-csi: Move hardware control to the bridge
In reply to Paul KocialkowskiIn order to support the isp workflow, we need to be able to configure the hardware from the bridge when the capture device is not used.
As a result, move all hardware configuration calls from capture to the bridge. Only the window configuration part (which is specific to using capture) remains there.
This effectively opens the way for hooking the bridge to the isp in the future.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 227 ++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.c | 249 +----------------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 3 + 3 files changed, 237 insertions(+), 242 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +227 -0
@@ -174,6 +174,205 @@ sun6i_csi_bridge_format_find(u32 mbus_code)return NULL ; } +/* Bridge */ + +static void sun6i_csi_bridge_irq_enable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG , +SUN6I_CSI_CH_INT_EN_VS | +SUN6I_CSI_CH_INT_EN_HB_OF | +SUN6I_CSI_CH_INT_EN_FIFO2_OF | +SUN6I_CSI_CH_INT_EN_FIFO1_OF | +SUN6I_CSI_CH_INT_EN_FIFO0_OF | +SUN6I_CSI_CH_INT_EN_FD | +SUN6I_CSI_CH_INT_EN_CD ); +} + +static void sun6i_csi_bridge_irq_disable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 ); +} + +static void sun6i_csi_bridge_irq_clear (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 ); +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , +SUN6I_CSI_CH_INT_STA_CLEAR ); +} + +static void sun6i_csi_bridge_enable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN , +SUN6I_CSI_EN_CSI_EN ); + +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON , +SUN6I_CSI_CAP_VCAP_ON ); +} + +static void sun6i_csi_bridge_disable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN ,0 ); +} + +static void +sun6i_csi_bridge_configure_interface (struct sun6i_csi_device *csi_dev) +{ +struct device *dev = csi_dev->dev; +struct regmap *regmap = csi_dev->regmap; +struct v4l2_fwnode_endpoint *endpoint = + &csi_dev->bridge.source_parallel.endpoint; +unsigned char bus_width = endpoint->bus.parallel.bus_width; +unsigned int flags = endpoint->bus.parallel.flags; +u32 field; +u32 value =SUN6I_CSI_IF_CFG_IF_CSI ; + +sun6i_csi_bridge_format (csi_dev,NULL , &field); + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | +SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | +SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ; +else + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; + +switch (endpoint->bus_type) { +case V4L2_MBUS_PARALLEL : +if (bus_width ==16 ) + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; +else + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ; + +if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + +if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) + value |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; + +if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) + value |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ; + +if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; +break ; +case V4L2_MBUS_BT656 : +if (bus_width ==16 ) + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; +else + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ; + +if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + +if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; +break ; +default : +dev_warn (dev,"unsupported bus type: %d\n" , endpoint->bus_type); +break ; + } + +switch (bus_width) { +case 8 : +/* 16-bit YUV formats use a doubled width in 8-bit mode. */ +case 16 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ; +break ; +case 10 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ; +break ; +case 12 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ; +break ; +default : +dev_warn (dev,"unsupported bus width: %u\n" , bus_width); +break ; + } + +regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); +} + +static void sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; +const struct sun6i_csi_bridge_format *bridge_format; +const struct sun6i_csi_capture_format *capture_format; +u32 mbus_code, field, pixelformat; +u8 input_format, input_yuv_seq, output_format; +u32 value =0 ; + +sun6i_csi_bridge_format (csi_dev, &mbus_code, &field); + + bridge_format =sun6i_csi_bridge_format_find (mbus_code); +if (WARN_ON (!bridge_format)) +return ; + + input_format = bridge_format->input_format; + input_yuv_seq = bridge_format->input_yuv_seq; + +sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); + + capture_format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!capture_format)) +return ; + +if (capture_format->input_format_raw) + input_format =SUN6I_CSI_INPUT_FMT_RAW ; + +if (capture_format->input_yuv_seq_invert) + input_yuv_seq = bridge_format->input_yuv_seq_invert; + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + output_format = capture_format->output_format_field; +else + output_format = capture_format->output_format_frame; + + value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); + value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format); + value |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (input_yuv_seq); + +if (field ==V4L2_FIELD_TOP ) + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ; +else if (field ==V4L2_FIELD_BOTTOM ) + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ; +else + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; + +regmap_write (regmap,SUN6I_CSI_CH_CFG_REG , value); +} + +static void sun6i_csi_bridge_configure (struct sun6i_csi_device *csi_dev) +{ +sun6i_csi_bridge_configure_interface (csi_dev); +sun6i_csi_bridge_configure_format (csi_dev); +} +/* V4L2 Subdev */ static int sun6i_csi_bridge_s_stream (struct v4l2_subdev *subdev,int on)
@@ -204,6 +403,30 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on) goto disable; } +/* PM */ + + ret =pm_runtime_resume_and_get (dev); +if (ret <0 ) +return ret; + +/* Clear */ + +sun6i_csi_bridge_irq_clear (csi_dev); + +/* Configure */ + +sun6i_csi_bridge_configure (csi_dev); +sun6i_csi_capture_configure (csi_dev); + +/* State Update */ + +sun6i_csi_capture_state_update (csi_dev); + +/* Enable */ + +sun6i_csi_bridge_irq_enable (csi_dev); +sun6i_csi_bridge_enable (csi_dev); + ret =v4l2_subdev_call (source_subdev, video, s_stream,1 );if (ret && ret != -ENOIOCTLCMD ) goto disable;
@@ -211,6 +434,10 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)return 0 ; disable: +sun6i_csi_bridge_irq_disable (csi_dev); +sun6i_csi_bridge_disable (csi_dev); + +pm_runtime_put (dev);return ret; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +7 -242
307 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +3 -0
@@ -63,6 +63,9 @@ void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev,const struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat); +void sun6i_csi_capture_configure (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_state_update (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.36.1
PATCH v5 38/44 media: sun6i-csi: Rename the capture video device to sun6i-csi-capture
In reply to Paul KocialkowskiNow that the driver is properly split between bridge and capture, rename the video device to highlight its role and be in line with the bridge entity naming.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 3 ++- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +2 -1
@@ -1023,7 +1023,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)/* Video Device */ -strscpy (video_dev->name,SUN6I_CSI_NAME ,sizeof (video_dev->name)); +strscpy (video_dev->name,SUN6I_CSI_CAPTURE_NAME , +sizeof (video_dev->name)); video_dev->device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_STREAMING ; video_dev->vfl_dir =VFL_DIR_RX ; video_dev->release = video_device_release_empty;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +2 -0
@@ -11,6 +11,8 @@#include <media/v4l2-dev.h> #include <media/videobuf2-core.h> +#define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture" +#define SUN6I_CSI_CAPTURE_WIDTH_MIN 32#define SUN6I_CSI_CAPTURE_WIDTH_MAX 4800#define SUN6I_CSI_CAPTURE_HEIGHT_MIN 32
Signature · 1 line
2.36.1
PATCH v5 39/44 media: sun6i-csi: Cleanup headers and includes, update copyright lines
In reply to Paul KocialkowskiCleanup includes, update copyright lines and some cosmetic changes.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 15 +++++-------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ++++----- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 4 ++-- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 22 ++++++++++++++----- .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 9 ++++---- 5 files changed, 34 insertions(+), 26 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +6 -9
@@ -1,18 +1,14 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ #include <linux/clk.h> -#include <linux/delay.h> -#include <linux/dma-mapping.h> #include <linux/err.h> -#include <linux/fs.h> #include <linux/interrupt.h> -#include <linux/io.h> -#include <linux/ioctl.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h>
@@ -20,12 +16,12 @@#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> -#include <linux/sched.h> -#include <linux/sizes.h> -#include <linux/slab.h> +#include <media/v4l2-device.h> #include <media/v4l2-mc.h> #include "sun6i_csi.h" +#include "sun6i_csi_bridge.h" +#include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h" /* Media */
@@ -375,4 +371,5 @@ module_platform_driver(sun6i_csi_platform_driver);MODULE_DESCRIPTION ("Allwinner A31 Camera Sensor Interface driver" );MODULE_AUTHOR ("Yong Deng <[email protected]>" ); +MODULE_AUTHOR ("Paul Kocialkowski <[email protected]>" );MODULE_LICENSE ("GPL" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +5 -5
@@ -1,15 +1,15 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ -#ifndef __SUN6I_CSI_H__ -#define __SUN6I_CSI_H__ +#ifndef _SUN6I_CSI_H_ +#define _SUN6I_CSI_H_#include <media/v4l2-device.h> -#include <media/v4l2-fwnode.h> #include <media/videobuf2-v4l2.h> #include "sun6i_csi_bridge.h"
@@ -49,4 +49,4 @@ struct sun6i_csi_variant { unsigned long clock_mod_rate; }; -#endif /* __SUN6I_CSI_H__ */ +#endif
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +2 -2
@@ -1,13 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ #include <linux/of.h> #include <linux/regmap.h> -#include <media/v4l2-device.h> #include <media/v4l2-event.h> #include <media/v4l2-ioctl.h>
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +16 -6
@@ -1,15 +1,15 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ -#ifndef __SUN6I_CAPTURE_H__ -#define __SUN6I_CAPTURE_H__ +#ifndef _SUN6I_CAPTURE_H_ +#define _SUN6I_CAPTURE_H_ -#include <media/v4l2-dev.h> -#include <media/videobuf2-core.h> +#include <media/v4l2-device.h> #define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture"
@@ -57,21 +57,31 @@ struct sun6i_csi_capture { struct v4l2_format format; }; +/* Helpers */ +void sun6i_csi_capture_dimensions (struct sun6i_csi_device *csi_dev,unsigned int *width,unsigned int *height);void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev,u32 *pixelformat,u32 *field); +/* Format */ +const struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat); +/* Capture */ +void sun6i_csi_capture_configure (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_state_update (struct sun6i_csi_device *csi_dev); +/* State */ +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); +/* Capture */ +int sun6i_csi_capture_setup (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_cleanup (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_CAPTURE_H__ */ +#endif
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +5 -4
@@ -1,12 +1,13 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ -#ifndef __SUN6I_CSI_REG_H__ -#define __SUN6I_CSI_REG_H__ +#ifndef _SUN6I_CSI_REG_H_ +#define _SUN6I_CSI_REG_H_#include <linux/kernel.h>
@@ -180,4 +181,4 @@#define SUN6I_CSI_CH_FIFO_STAT_REG 0x98#define SUN6I_CSI_CH_PCLK_STAT_REG 0x9c -#endif /* __SUN6I_CSI_REG_H__ */ +#endif
Signature · 1 line
2.36.1
PATCH v5 40/44 media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code
In reply to Paul KocialkowskiIntroduce MIPI CSI-2 support to the bridge with a new port, source and hardware configuration helper.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 1 + .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 46 +++++++++++++++++-- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 1 + 3 files changed, 44 insertions(+), 4 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +1 -0
@@ -20,6 +20,7 @@enum sun6i_csi_port {SUN6I_CSI_PORT_PARALLEL =0 , +SUN6I_CSI_PORT_MIPI_CSI2 =1 , };struct sun6i_csi_buffer {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +42 -4
101 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +1 -0
@@ -46,6 +46,7 @@ struct sun6i_csi_bridge {struct mutex lock;/* Mbus format lock. */ struct sun6i_csi_bridge_source source_parallel; +struct sun6i_csi_bridge_source source_mipi_csi2; };/* Helpers */
Signature · 1 line
2.36.1
PATCH v5 41/44 media: sun6i-csi: Only configure capture when streaming
In reply to Paul KocialkowskiAdd a streaming element to the capture state structure to know if the capture device is used or not. Only configure things related to output when streaming, including the output format, irq, state (dma buffer) and window configuration registers.
After this change, it becomes possible to use the bridge without the capture device, which will be the case in the isp media flow.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 50 ++++++++++++------- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 11 +++- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 + 3 files changed, 41 insertions(+), 21 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +31 -19
@@ -338,6 +338,7 @@ sun6i_csi_bridge_configure_mipi_csi2(struct sun6i_csi_device *csi_dev)static void sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap; +bool capture_streaming = csi_dev->capture.state.streaming;const struct sun6i_csi_bridge_format *bridge_format;const struct sun6i_csi_capture_format *capture_format;u32 mbus_code, field, pixelformat;
@@ -353,26 +354,29 @@ static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev) input_format = bridge_format->input_format; input_yuv_seq = bridge_format->input_yuv_seq; -sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); +if (capture_streaming) { +sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); - capture_format =sun6i_csi_capture_format_find (pixelformat); -if (WARN_ON (!capture_format)) -return ; + capture_format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!capture_format)) +return ; -if (capture_format->input_format_raw) - input_format =SUN6I_CSI_INPUT_FMT_RAW ; +if (capture_format->input_format_raw) + input_format =SUN6I_CSI_INPUT_FMT_RAW ; -if (capture_format->input_yuv_seq_invert) - input_yuv_seq = bridge_format->input_yuv_seq_invert; +if (capture_format->input_yuv_seq_invert) + input_yuv_seq = bridge_format->input_yuv_seq_invert; -if (field ==V4L2_FIELD_INTERLACED || - field ==V4L2_FIELD_INTERLACED_TB || - field ==V4L2_FIELD_INTERLACED_BT ) - output_format = capture_format->output_format_field; -else - output_format = capture_format->output_format_frame; +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + output_format = capture_format->output_format_field; +else + output_format = capture_format->output_format_frame; + + value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); + } - value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format); value |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (input_yuv_seq);
@@ -406,6 +410,7 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev);struct sun6i_csi_bridge *bridge = &csi_dev->bridge;struct media_entity *bridge_entity = &bridge->subdev.entity; +bool capture_streaming = csi_dev->capture.state.streaming;struct device *dev = csi_dev->dev;struct sun6i_csi_bridge_source *source;struct v4l2_subdev *source_subdev;
@@ -448,15 +453,20 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)/* Configure */ sun6i_csi_bridge_configure (csi_dev, source); -sun6i_csi_capture_configure (csi_dev); + +if (capture_streaming) +sun6i_csi_capture_configure (csi_dev);/* State Update */ -sun6i_csi_capture_state_update (csi_dev); +if (capture_streaming) +sun6i_csi_capture_state_update (csi_dev);/* Enable */ -sun6i_csi_bridge_irq_enable (csi_dev); +if (capture_streaming) +sun6i_csi_bridge_irq_enable (csi_dev); +sun6i_csi_bridge_enable (csi_dev); ret =v4l2_subdev_call (source_subdev, video, s_stream,1 );
@@ -466,7 +476,9 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)return 0 ; disable: -sun6i_csi_bridge_irq_disable (csi_dev); +if (capture_streaming) +sun6i_csi_bridge_irq_disable (csi_dev); +sun6i_csi_bridge_disable (csi_dev);pm_runtime_put (dev);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +9 -2
@@ -616,13 +616,17 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,if (ret <0 ) goto error_state; + state->streaming = true; + ret =v4l2_subdev_call (subdev, video, s_stream,1 );if (ret && ret != -ENOIOCTLCMD ) - goto error_media_pipeline; + goto error_streaming;return 0 ; -error_media_pipeline: +error_streaming: + state->streaming = false; +media_pipeline_stop (&video_dev->entity); error_state:
@@ -634,11 +638,14 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,static void sun6i_csi_capture_stop_streaming (struct vb2_queue *queue) {struct sun6i_csi_device *csi_dev =vb2_get_drv_priv (queue); +struct sun6i_csi_capture_state *state = &csi_dev->capture.state;struct video_device *video_dev = &csi_dev->capture.video_dev;struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;v4l2_subdev_call (subdev, video, s_stream,0 ); + state->streaming = false; +media_pipeline_stop (&video_dev->entity);sun6i_csi_capture_state_cleanup (csi_dev, true);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +1 -0
@@ -44,6 +44,7 @@ struct sun6i_csi_capture_state {struct sun6i_csi_buffer *complete;unsigned int sequence; +bool streaming; };struct sun6i_csi_capture {
Signature · 1 line
2.36.1
PATCH v5 42/44 media: sun6i-csi: Add extra checks to the interrupt routine
In reply to Paul KocialkowskiCheck against the enabled bits and make sure capture is running before serving an interrupt, to add extra safety in the process.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +7 -2
@@ -89,13 +89,17 @@ static void sun6i_csi_v4l2_cleanup(struct sun6i_csi_device *csi_dev)static irqreturn_t sun6i_csi_interrupt (int irq,void *private) {struct sun6i_csi_device *csi_dev = private; +bool capture_streaming = csi_dev->capture.state.streaming;struct regmap *regmap = csi_dev->regmap; -u32 status; +u32 status =0 , enable =0 ;regmap_read (regmap,SUN6I_CSI_CH_INT_STA_REG , &status); +regmap_read (regmap,SUN6I_CSI_CH_INT_EN_REG , &enable); -if (!(status &0xFF )) +if (!status)return IRQ_NONE ; +else if (!(status & enable) || !capture_streaming) + goto complete; if ((status & SUN6I_CSI_CH_INT_STA_FIFO0_OF) || (status & SUN6I_CSI_CH_INT_STA_FIFO1_OF) ||
@@ -116,6 +120,7 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private)if (status &SUN6I_CSI_CH_INT_STA_VS )sun6i_csi_capture_sync (csi_dev); +complete:regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , status);return IRQ_HANDLED ;
Signature · 1 line
2.36.1
PATCH v5 43/44 media: sun6i-csi: Request a shared interrupt
In reply to Paul KocialkowskiRequest our interrupt shared since it is typically shared with the isp block. The interrupt routine looks good to go for shared irq.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +2 -2
@@ -248,8 +248,8 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, goto error_clock_rate_exclusive; } - ret =devm_request_irq (dev, irq, sun6i_csi_interrupt,0 ,SUN6I_CSI_NAME , - csi_dev); + ret =devm_request_irq (dev, irq, sun6i_csi_interrupt,IRQF_SHARED , +SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (dev,"failed to request interrupt\n" ); goto error_clock_rate_exclusive;
Signature · 1 line
2.36.1
PATCH v5 44/44 MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry
In reply to Paul KocialkowskiGiven the substantial rework of the driver that I carried out and the knowledge acquired about the hardware along the way, make myself a maintainer of the sun6i-csi driver.
Also rename and move the entry while at it since the driver is not specific to the V3s.
--- MAINTAINERS | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
MAINTAINERS +9 -8
@@ -762,6 +762,15 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml F: drivers/media/platform/sunxi/sun4i-csi/ +ALLWINNER A31 CSI DRIVER +M: Yong Deng <[email protected]> +M: Paul Kocialkowski <[email protected]> +L: [email protected] +S: Maintained +T: git git://linuxtv.org/media_tree.git +F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +F: drivers/media/platform/sunxi/sun6i-csi/ + ALLWINNER A31 MIPI CSI-2 BRIDGE DRIVER M: Paul Kocialkowski <[email protected]> L: [email protected]
@@ -5234,14 +5243,6 @@ M: Jaya Kumar <[email protected]> S: Maintained F: sound/pci/cs5535audio/ -CSI DRIVERS FOR ALLWINNER V3s -M: Yong Deng <[email protected]> -L: [email protected] -S: Maintained -T: git git://linuxtv.org/media_tree.git -F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml -F: drivers/media/platform/sunxi/sun6i-csi/ - CW1200 WLAN driver M: Solomon Peachy <[email protected]> S: Maintained
Signature · 1 line
2.36.1