Re: [PATCH v5 3/5] media: hantro: add support for STM32MP25 VENC

[Hugues FRUCHET <hugues.fruchet@foss.st.com>]

Hi Sebastian,

Yes, feel free to fix the two comments !

BR,
Hugues.

On 12/21/23 12:18, Sebastian Fricke wrote:
> Hey Hugues,
> 
> one small comment below, if it should turn out to be the only problem I
> can fix it myself for the pull request.
> 
> On 21.12.2023 09:47, Hugues Fruchet wrote:
>> Add support for STM32MP25 VENC video hardware encoder.
>> Support of JPEG encoding.
>> VENC has its own reset/clock/irq.
>>
>> Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
>> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>> ---
>> drivers/media/platform/verisilicon/Makefile   |   3 +-
>> .../media/platform/verisilicon/hantro_drv.c   |   1 +
>> .../media/platform/verisilicon/hantro_hw.h    |   1 +
>> .../platform/verisilicon/stm32mp25_venc_hw.c  | 115 ++++++++++++++++++
>> 4 files changed, 119 insertions(+), 1 deletion(-)
>> create mode 100644 drivers/media/platform/verisilicon/stm32mp25_venc_hw.c
>>
>> diff --git a/drivers/media/platform/verisilicon/Makefile 
>> b/drivers/media/platform/verisilicon/Makefile
>> index 5854e0f0dd32..3bf43fdbedc1 100644
>> --- a/drivers/media/platform/verisilicon/Makefile
>> +++ b/drivers/media/platform/verisilicon/Makefile
>> @@ -41,4 +41,5 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \
>>         sunxi_vpu_hw.o
>>
>> hantro-vpu-$(CONFIG_VIDEO_HANTRO_STM32MP25) += \
>> -        stm32mp25_vdec_hw.o
>> +        stm32mp25_vdec_hw.o \
>> +        stm32mp25_venc_hw.o
>> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c 
>> b/drivers/media/platform/verisilicon/hantro_drv.c
>> index 2db27c333924..4d97a8ac03de 100644
>> --- a/drivers/media/platform/verisilicon/hantro_drv.c
>> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
>> @@ -736,6 +736,7 @@ static const struct of_device_id of_hantro_match[] 
>> = {
>> #endif
>> #ifdef CONFIG_VIDEO_HANTRO_STM32MP25
>>     { .compatible = "st,stm32mp25-vdec", .data = 
>> &stm32mp25_vdec_variant, },
>> +    { .compatible = "st,stm32mp25-venc", .data = 
>> &stm32mp25_venc_variant, },
>> #endif
>>     { /* sentinel */ }
>> };
>> diff --git a/drivers/media/platform/verisilicon/hantro_hw.h 
>> b/drivers/media/platform/verisilicon/hantro_hw.h
>> index b7eccc1a96fc..70c72e9d11d5 100644
>> --- a/drivers/media/platform/verisilicon/hantro_hw.h
>> +++ b/drivers/media/platform/verisilicon/hantro_hw.h
>> @@ -407,6 +407,7 @@ extern const struct hantro_variant 
>> rk3588_vpu981_variant;
>> extern const struct hantro_variant sama5d4_vdec_variant;
>> extern const struct hantro_variant sunxi_vpu_variant;
>> extern const struct hantro_variant stm32mp25_vdec_variant;
>> +extern const struct hantro_variant stm32mp25_venc_variant;
>>
>> extern const struct hantro_postproc_ops hantro_g1_postproc_ops;
>> extern const struct hantro_postproc_ops hantro_g2_postproc_ops;
>> diff --git a/drivers/media/platform/verisilicon/stm32mp25_venc_hw.c 
>> b/drivers/media/platform/verisilicon/stm32mp25_venc_hw.c
>> new file mode 100644
>> index 000000000000..0ff0f073b922
>> --- /dev/null
>> +++ b/drivers/media/platform/verisilicon/stm32mp25_venc_hw.c
>> @@ -0,0 +1,115 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * STM32MP25 VENC video encoder driver
>> + *
>> + * Copyright (C) STMicroelectronics SA 2022
>> + * Authors: Hugues Fruchet <hugues.fruchet@foss.st.com>
>> + *          for STMicroelectronics.
>> + *
>> + */
>> +
>> +#include <linux/clk.h>
>> +#include <linux/delay.h>
>> +#include <linux/reset.h>
>> +
>> +#include "hantro.h"
>> +#include "hantro_jpeg.h"
>> +#include "hantro_h1_regs.h"
>> +
>> +/*
>> + * Supported formats.
>> + */
>> +
>> +static const struct hantro_fmt stm32mp25_venc_fmts[] = {
>> +    {
>> +        .fourcc = V4L2_PIX_FMT_YUV420M,
>> +        .codec_mode = HANTRO_MODE_NONE,
>> +        .enc_fmt = ROCKCHIP_VPU_ENC_FMT_YUV420P,
>> +    },
>> +    {
>> +        .fourcc = V4L2_PIX_FMT_NV12M,
>> +        .codec_mode = HANTRO_MODE_NONE,
>> +        .enc_fmt = ROCKCHIP_VPU_ENC_FMT_YUV420SP,
>> +    },
>> +    {
>> +        .fourcc = V4L2_PIX_FMT_YUYV,
>> +        .codec_mode = HANTRO_MODE_NONE,
>> +        .enc_fmt = ROCKCHIP_VPU_ENC_FMT_YUYV422,
>> +    },
>> +    {
>> +        .fourcc = V4L2_PIX_FMT_UYVY,
>> +        .codec_mode = HANTRO_MODE_NONE,
>> +        .enc_fmt = ROCKCHIP_VPU_ENC_FMT_UYVY422,
>> +    },
>> +    {
>> +        .fourcc = V4L2_PIX_FMT_JPEG,
>> +        .codec_mode = HANTRO_MODE_JPEG_ENC,
>> +        .max_depth = 2,
>> +        .header_size = JPEG_HEADER_SIZE,
>> +        .frmsize = {
>> +            .min_width = 96,
>> +            .max_width = FMT_4K_WIDTH,
>> +            .step_width = MB_DIM,
>> +            .min_height = 96,
>> +            .max_height = FMT_4K_HEIGHT,
>> +            .step_height = MB_DIM,
>> +        },
>> +    },
>> +};
>> +
>> +static irqreturn_t stm32mp25_venc_irq(int irq, void *dev_id)
>> +{
>> +    struct hantro_dev *vpu = dev_id;
>> +    enum vb2_buffer_state state;
>> +    u32 status;
>> +
>> +    status = vepu_read(vpu, H1_REG_INTERRUPT);
>> +    state = (status & H1_REG_INTERRUPT_FRAME_RDY) ?
>> +        VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
>> +
>> +    vepu_write(vpu, H1_REG_INTERRUPT_BIT, H1_REG_INTERRUPT);
>> +
>> +    hantro_irq_done(vpu, state);
>> +
>> +    return IRQ_HANDLED;
>> +}
>> +
>> +static void stm32mp25_venc_reset(struct hantro_ctx *ctx)
>> +{
>> +}
>> +
>> +/*
>> + * Supported codec ops.
>> + */
>> +
>> +static const struct hantro_codec_ops stm32mp25_venc_codec_ops[] = {
>> +    [HANTRO_MODE_JPEG_ENC] = {
>> +        .run = hantro_h1_jpeg_enc_run,
>> +        .reset = stm32mp25_venc_reset,
>> +        .done = hantro_h1_jpeg_enc_done,
>> +    },
>> +};
>> +
>> +/*
>> + * Variants.
>> + */
>> +
>> +static const struct hantro_irq stm32mp25_venc_irqs[] = {
>> +    { "venc", stm32mp25_venc_irq },
>> +};
>> +
>> +static const char * const stm32mp25_venc_clk_names[] = {
>> +    "venc-clk"
>> +};
>> +
>> +const struct hantro_variant stm32mp25_venc_variant = {
>> +    .enc_fmts = stm32mp25_venc_fmts,
>> +    .num_enc_fmts = ARRAY_SIZE(stm32mp25_venc_fmts),
>> +    .codec = HANTRO_JPEG_ENCODER,
>> +    .codec_ops = stm32mp25_venc_codec_ops,
>> +    .irqs = stm32mp25_venc_irqs,
>> +    .num_irqs = ARRAY_SIZE(stm32mp25_venc_irqs),
>> +    .clk_names = stm32mp25_venc_clk_names,
>> +    .num_clocks = ARRAY_SIZE(stm32mp25_venc_clk_names)
>> +};
>> +
> 
> There is an superfluous new line here.
> 
> Greetings,
> Sebastian
> 
>> -- 
>> 2.25.1
>>
>>