[v3,3/3] media: vsp1: Add support for RZ/G2L VSPD
Commit Message
The RZ/G2L VSPD provides a single VSPD instance. It has the following
sub modules MAU, CTU, RPF, DPR, LUT, BRS, WPF and LIF.
The VSPD block on RZ/G2L does not have a version register, so added a
new compatible string "renesas,rzg2l-vsp2" with a data pointer containing
the info structure. Also the reset line is shared with the DU module.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
v2->v3:
* Fixed version comparison in vsp1_lookup()
v1->v2:
* Changed the compatible from vsp2-rzg2l->rzg2l-vsp2
* Added standalone device info for rzg2l-vsp2.
* Added vsp1_lookup helper function.
* Updated comments for LIF0 buffer attribute register
* Used last ID for rzg2l-vsp2.
RFC->v1:
* Used data pointer containing info structure to retrieve version information
RFC:
* https://patchwork.kernel.org/project/linux-renesas-soc/patch/20220112174612.10773-21-biju.das.jz@bp.renesas.com/
---
drivers/media/platform/vsp1/vsp1_drv.c | 44 +++++++++++++++++++------
drivers/media/platform/vsp1/vsp1_lif.c | 15 +++++----
drivers/media/platform/vsp1/vsp1_regs.h | 2 ++
3 files changed, 45 insertions(+), 16 deletions(-)
Comments
Hi Biju,
On Fri, Mar 11, 2022 at 11:38 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> The RZ/G2L VSPD provides a single VSPD instance. It has the following
> sub modules MAU, CTU, RPF, DPR, LUT, BRS, WPF and LIF.
>
> The VSPD block on RZ/G2L does not have a version register, so added a
> new compatible string "renesas,rzg2l-vsp2" with a data pointer containing
> the info structure. Also the reset line is shared with the DU module.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v2->v3:
> * Fixed version comparison in vsp1_lookup()
Thanks for the update!
> --- a/drivers/media/platform/vsp1/vsp1_lif.c
> +++ b/drivers/media/platform/vsp1/vsp1_lif.c
> @@ -130,13 +131,15 @@ static void lif_configure_stream(struct vsp1_entity *entity,
> VI6_LIF_CTRL_REQSEL | VI6_LIF_CTRL_LIF_EN);
>
> /*
> - * On R-Car V3M the LIF0 buffer attribute register has to be set to a
> - * non-default value to guarantee proper operation (otherwise artifacts
> - * may appear on the output). The value required by the manual is not
> - * explained but is likely a buffer size or threshold.
> + * On R-Car V3M and RZ/G2L the LIF0 buffer attribute register has to be
> + * set to a non-default value to guarantee proper operation (otherwise
> + * artifacts may appear on the output). The value required by the
> + * manual is not explained but is likely a buffer size or threshold.
> */
> - if ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
> - (VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M))
> + if (((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
> + (VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M)) ||
> + ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
> + VI6_IP_VERSION_MODEL_VSPD_RZG2L))
> vsp1_lif_write(lif, dlb, VI6_LIF_LBA,
> VI6_LIF_LBA_LBA0 |
> (1536 << VI6_LIF_LBA_LBA1_SHIFT));
LGTM, although using a feature bit in vsp1_device_info, or just a
switch() statement here, would probably be better.
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert,
Thanks for the feedback.
> Subject: Re: [PATCH v3 3/3] media: vsp1: Add support for RZ/G2L VSPD
>
> Hi Biju,
>
> On Fri, Mar 11, 2022 at 11:38 AM Biju Das <biju.das.jz@bp.renesas.com>
> wrote:
> > The RZ/G2L VSPD provides a single VSPD instance. It has the following
> > sub modules MAU, CTU, RPF, DPR, LUT, BRS, WPF and LIF.
> >
> > The VSPD block on RZ/G2L does not have a version register, so added a
> > new compatible string "renesas,rzg2l-vsp2" with a data pointer
> > containing the info structure. Also the reset line is shared with the DU
> module.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > v2->v3:
> > * Fixed version comparison in vsp1_lookup()
>
> Thanks for the update!
>
> > --- a/drivers/media/platform/vsp1/vsp1_lif.c
> > +++ b/drivers/media/platform/vsp1/vsp1_lif.c
> > @@ -130,13 +131,15 @@ static void lif_configure_stream(struct
> vsp1_entity *entity,
> > VI6_LIF_CTRL_REQSEL | VI6_LIF_CTRL_LIF_EN);
> >
> > /*
> > - * On R-Car V3M the LIF0 buffer attribute register has to be set
> to a
> > - * non-default value to guarantee proper operation (otherwise
> artifacts
> > - * may appear on the output). The value required by the manual
> is not
> > - * explained but is likely a buffer size or threshold.
> > + * On R-Car V3M and RZ/G2L the LIF0 buffer attribute register
> has to be
> > + * set to a non-default value to guarantee proper operation
> (otherwise
> > + * artifacts may appear on the output). The value required by
> the
> > + * manual is not explained but is likely a buffer size or
> threshold.
> > */
> > - if ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
> > - (VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M))
> > + if (((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
> > + (VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M)) ||
> > + ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
> > + VI6_IP_VERSION_MODEL_VSPD_RZG2L))
> > vsp1_lif_write(lif, dlb, VI6_LIF_LBA,
> > VI6_LIF_LBA_LBA0 |
> > (1536 << VI6_LIF_LBA_LBA1_SHIFT));
>
> LGTM, although using a feature bit in vsp1_device_info, or just a
> switch() statement here, would probably be better.
I will go with switch statement, as V3M(0x1801) and V3H(0x1802) shares same info
and SoC separation to be done here to identify the V3M.
Cheers,
Biju
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-
> m68k.org
>
> In personal conversations with technical people, I call myself a hacker.
> But when I'm talking to journalists I just say "programmer" or something
> like that.
> -- Linus Torvalds
@@ -807,11 +807,37 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
},
};
+static const struct vsp1_device_info rzg2l_vsp2_device_info = {
+ .version = VI6_IP_VERSION_MODEL_VSPD_RZG2L,
+ .model = "VSP2-D",
+ .gen = 3,
+ .features = VSP1_HAS_BRS | VSP1_HAS_WPF_VFLIP | VSP1_HAS_EXT_DL,
+ .lif_count = 1,
+ .rpf_count = 2,
+ .wpf_count = 1,
+};
+
+static const struct vsp1_device_info *vsp1_lookup(struct vsp1_device *vsp1,
+ u32 version)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(vsp1_device_infos); ++i) {
+ if ((version & VI6_IP_VERSION_MODEL_MASK) ==
+ vsp1_device_infos[i].version) {
+ vsp1->info = &vsp1_device_infos[i];
+ break;
+ }
+ }
+
+ return vsp1->info;
+}
+
static int vsp1_probe(struct platform_device *pdev)
{
struct vsp1_device *vsp1;
struct device_node *fcp_node;
- unsigned int i;
+ u32 version;
int ret;
int irq;
@@ -867,24 +893,21 @@ static int vsp1_probe(struct platform_device *pdev)
if (ret < 0)
goto done;
- vsp1->version = vsp1_read(vsp1, VI6_IP_VERSION);
-
- for (i = 0; i < ARRAY_SIZE(vsp1_device_infos); ++i) {
- if ((vsp1->version & VI6_IP_VERSION_MODEL_MASK) ==
- vsp1_device_infos[i].version) {
- vsp1->info = &vsp1_device_infos[i];
- break;
- }
+ vsp1->info = of_device_get_match_data(&pdev->dev);
+ if (!vsp1->info) {
+ version = vsp1_read(vsp1, VI6_IP_VERSION);
+ vsp1->info = vsp1_lookup(vsp1, version);
}
if (!vsp1->info) {
dev_err(&pdev->dev, "unsupported IP version 0x%08x\n",
- vsp1->version);
+ version);
vsp1_device_put(vsp1);
ret = -ENXIO;
goto done;
}
+ vsp1->version = vsp1->info->version;
dev_dbg(&pdev->dev, "IP version 0x%08x\n", vsp1->version);
/*
@@ -936,6 +959,7 @@ static int vsp1_remove(struct platform_device *pdev)
static const struct of_device_id vsp1_of_match[] = {
{ .compatible = "renesas,vsp1" },
{ .compatible = "renesas,vsp2" },
+ { .compatible = "renesas,rzg2l-vsp2", .data = &rzg2l_vsp2_device_info },
{ },
};
MODULE_DEVICE_TABLE(of, vsp1_of_match);
@@ -107,6 +107,7 @@ static void lif_configure_stream(struct vsp1_entity *entity,
case VI6_IP_VERSION_MODEL_VSPDL_GEN3:
case VI6_IP_VERSION_MODEL_VSPD_V3:
+ case VI6_IP_VERSION_MODEL_VSPD_RZG2L:
hbth = 0;
obth = 1500;
lbth = 0;
@@ -130,13 +131,15 @@ static void lif_configure_stream(struct vsp1_entity *entity,
VI6_LIF_CTRL_REQSEL | VI6_LIF_CTRL_LIF_EN);
/*
- * On R-Car V3M the LIF0 buffer attribute register has to be set to a
- * non-default value to guarantee proper operation (otherwise artifacts
- * may appear on the output). The value required by the manual is not
- * explained but is likely a buffer size or threshold.
+ * On R-Car V3M and RZ/G2L the LIF0 buffer attribute register has to be
+ * set to a non-default value to guarantee proper operation (otherwise
+ * artifacts may appear on the output). The value required by the
+ * manual is not explained but is likely a buffer size or threshold.
*/
- if ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
- (VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M))
+ if (((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
+ (VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M)) ||
+ ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
+ VI6_IP_VERSION_MODEL_VSPD_RZG2L))
vsp1_lif_write(lif, dlb, VI6_LIF_LBA,
VI6_LIF_LBA_LBA0 |
(1536 << VI6_LIF_LBA_LBA1_SHIFT));
@@ -767,6 +767,8 @@
#define VI6_IP_VERSION_MODEL_VSPDL_GEN3 (0x19 << 8)
#define VI6_IP_VERSION_MODEL_VSPBS_GEN3 (0x1a << 8)
#define VI6_IP_VERSION_MODEL_VSPD_V3U (0x1c << 8)
+/* RZ/G2L SoC's have no version register, So using last ID for the version */
+#define VI6_IP_VERSION_MODEL_VSPD_RZG2L (0xff << 8)
#define VI6_IP_VERSION_SOC_MASK (0xff << 0)
#define VI6_IP_VERSION_SOC_H2 (0x01 << 0)