lkml.org 
[lkml]   [2022]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V4 10/11] media: hantro: Add support for i.MX8MM Hantro-G1
    Date
    The i.MX8MM has a Hantro G1 video decoder similar to the
    imx8mq but lacks the post-processor present in the imx8mq.
    Add support in the driver for it with the post-processing
    removed.

    Signed-off-by: Adam Ford <aford173@gmail.com>
    Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

    diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
    index f56e8b3efada..8f020ba15194 100644
    --- a/drivers/staging/media/hantro/hantro_drv.c
    +++ b/drivers/staging/media/hantro/hantro_drv.c
    @@ -615,6 +615,7 @@ static const struct of_device_id of_hantro_match[] = {
    { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
    #endif
    #ifdef CONFIG_VIDEO_HANTRO_IMX8M
    + { .compatible = "nxp,imx8mm-vpu-g1", .data = &imx8mm_vpu_g1_variant, },
    { .compatible = "nxp,imx8mq-vpu", .data = &imx8mq_vpu_variant, },
    { .compatible = "nxp,imx8mq-vpu-g1", .data = &imx8mq_vpu_g1_variant },
    { .compatible = "nxp,imx8mq-vpu-g2", .data = &imx8mq_vpu_g2_variant },
    diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
    index f0bd2ffe290b..c00b46e06055 100644
    --- a/drivers/staging/media/hantro/hantro_hw.h
    +++ b/drivers/staging/media/hantro/hantro_hw.h
    @@ -299,6 +299,7 @@ enum hantro_enc_fmt {
    ROCKCHIP_VPU_ENC_FMT_UYVY422 = 3,
    };

    +extern const struct hantro_variant imx8mm_vpu_g1_variant;
    extern const struct hantro_variant imx8mq_vpu_g1_variant;
    extern const struct hantro_variant imx8mq_vpu_g2_variant;
    extern const struct hantro_variant imx8mq_vpu_variant;
    diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c
    index 849ea7122d47..9802508bade2 100644
    --- a/drivers/staging/media/hantro/imx8m_vpu_hw.c
    +++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c
    @@ -327,3 +327,15 @@ const struct hantro_variant imx8mq_vpu_g2_variant = {
    .clk_names = imx8mq_g2_clk_names,
    .num_clocks = ARRAY_SIZE(imx8mq_g2_clk_names),
    };
    +
    +const struct hantro_variant imx8mm_vpu_g1_variant = {
    + .dec_fmts = imx8m_vpu_dec_fmts,
    + .num_dec_fmts = ARRAY_SIZE(imx8m_vpu_dec_fmts),
    + .codec = HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER |
    + HANTRO_H264_DECODER,
    + .codec_ops = imx8mq_vpu_g1_codec_ops,
    + .irqs = imx8mq_irqs,
    + .num_irqs = ARRAY_SIZE(imx8mq_irqs),
    + .clk_names = imx8mq_g1_clk_names,
    + .num_clocks = ARRAY_SIZE(imx8mq_g1_clk_names),
    +};
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-01-25 18:27    [W:5.464 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site