lkml.org 
[lkml]   [2019]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/20] media: sun6i: Convert to the image format API
    Date
    The image format API allows us to remove some of the computation we need to
    handle the various video formats.

    Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
    ---
    drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 89 ++---------
    drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 49 +------
    drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 6 +-
    drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c | 11 +-
    4 files changed, 31 insertions(+), 124 deletions(-)

    diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
    index 4c79eb64a7a7..cad90d4528f8 100644
    --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
    +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
    @@ -10,6 +10,7 @@
    #include <linux/dma-mapping.h>
    #include <linux/err.h>
    #include <linux/fs.h>
    +#include <linux/image-formats.h>
    #include <linux/interrupt.h>
    #include <linux/io.h>
    #include <linux/ioctl.h>
    @@ -497,72 +498,27 @@ static void sun6i_csi_set_format(struct sun6i_csi_dev *sdev)
    static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)
    {
    struct sun6i_csi_config *config = &sdev->csi.config;
    - u32 bytesperline_y;
    - u32 bytesperline_c;
    + const struct image_format_info *info =
    + image_format_v4l2_lookup(config->pixelformat);
    int *planar_offset = sdev->planar_offset;
    - u32 width = config->width;
    - u32 height = config->height;
    - u32 hor_len = width;
    + u32 bytesperline_y = image_format_info_plane_stride(info, config->width, 0);
    + u32 bytesperline_c = image_format_info_plane_stride(info, config->width, 1);
    + unsigned int offset, i;

    - 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(sdev->dev,
    - "Horizontal length should be 2 times of width for packed YUV formats!\n");
    - hor_len = width * 2;
    - break;
    - default:
    - break;
    + offset = 0;
    + for (i = 0; i < info->num_planes; i++) {
    + planar_offset[i] = offset;
    +
    + offset += image_format_info_plane_size(info, config->width,
    + config->height, i);
    }

    regmap_write(sdev->regmap, CSI_CH_HSIZE_REG,
    - CSI_CH_HSIZE_HOR_LEN(hor_len) |
    + CSI_CH_HSIZE_HOR_LEN(bytesperline_c) |
    CSI_CH_HSIZE_HOR_START(0));
    regmap_write(sdev->regmap, CSI_CH_VSIZE_REG,
    - CSI_CH_VSIZE_VER_LEN(height) |
    + CSI_CH_VSIZE_VER_LEN(config->height) |
    CSI_CH_VSIZE_VER_START(0));
    -
    - planar_offset[0] = 0;
    - switch (config->pixelformat) {
    - case V4L2_PIX_FMT_HM12:
    - 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;
    - 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(sdev->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;
    - planar_offset[1] = -1;
    - planar_offset[2] = -1;
    - break;
    - }
    -
    regmap_write(sdev->regmap, CSI_CH_BUF_LEN_REG,
    CSI_CH_BUF_LEN_BUF_LEN_C(bytesperline_c) |
    CSI_CH_BUF_LEN_BUF_LEN_Y(bytesperline_y));
    @@ -588,15 +544,16 @@ int sun6i_csi_update_config(struct sun6i_csi *csi,
    void sun6i_csi_update_buf_addr(struct sun6i_csi *csi, dma_addr_t addr)
    {
    struct sun6i_csi_dev *sdev = sun6i_csi_to_dev(csi);
    + struct sun6i_csi_config *config = &sdev->csi.config;
    + const struct image_format_info *info =
    + image_format_v4l2_lookup(config->pixelformat);
    + unsigned int i;
    +
    + for (i = 0; i < info->num_planes; i++) {
    + regmap_write(sdev->regmap, CSI_CH_BUF_REG(i, 0),
    + (addr + sdev->planar_offset[i]) >> 2);

    - 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);
    + }
    }

    void sun6i_csi_set_stream(struct sun6i_csi *csi, bool enable)
    diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
    index c626821aaedb..f3472d8821ab 100644
    --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
    +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
    @@ -86,53 +86,4 @@ void sun6i_csi_update_buf_addr(struct sun6i_csi *csi, dma_addr_t addr);
    */
    void sun6i_csi_set_stream(struct sun6i_csi *csi, bool enable);

    -/* 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_HM12:
    - 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__ */
    diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
    index 703fa14bb313..7c19d2bcbd7c 100644
    --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
    +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
    @@ -74,11 +74,7 @@
    #define CSI_CH_SCALE_REG 0x4c
    #define CSI_CH_SCALE_QUART_EN BIT(0)

    -#define CSI_CH_F0_BUFA_REG 0x50
    -
    -#define CSI_CH_F1_BUFA_REG 0x58
    -
    -#define CSI_CH_F2_BUFA_REG 0x60
    +#define CSI_CH_BUF_REG(plane, chan) (0x50 + (plane) * 8 + (chan) * 4)

    #define CSI_CH_STA_REG 0x6c
    #define CSI_CH_STA_FIELD_STA_MASK BIT(2)
    diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
    index f0dfe68486d1..0c783140c3a0 100644
    --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
    +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
    @@ -5,6 +5,7 @@
    * Author: Yong Deng <yong.deng@magewell.com>
    */

    +#include <linux/image-formats.h>
    #include <linux/of.h>

    #include <media/v4l2-device.h>
    @@ -351,17 +352,19 @@ static int sun6i_video_try_fmt(struct sun6i_video *video,
    struct v4l2_format *f)
    {
    struct v4l2_pix_format *pixfmt = &f->fmt.pix;
    - int bpp;
    + const struct image_format_info *info;

    if (!is_pixformat_valid(pixfmt->pixelformat))
    pixfmt->pixelformat = supported_pixformats[0];

    + info = image_format_v4l2_lookup(pixfmt->pixelformat);
    +
    v4l_bound_align_image(&pixfmt->width, MIN_WIDTH, MAX_WIDTH, 1,
    &pixfmt->height, MIN_HEIGHT, MAX_WIDTH, 1, 1);

    - bpp = sun6i_csi_get_bpp(pixfmt->pixelformat);
    - pixfmt->bytesperline = (pixfmt->width * bpp) >> 3;
    - pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height;
    + pixfmt->bytesperline = image_format_info_plane_stride(info, pixfmt->width, 0);
    + pixfmt->sizeimage = image_format_info_plane_size(info, pixfmt->width,
    + pixfmt->height, 0);

    if (pixfmt->field == V4L2_FIELD_ANY)
    pixfmt->field = V4L2_FIELD_NONE;
    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2019-04-17 09:56    [W:2.486 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site