drm/vc4: drv: Support BCM2712

The BCM2712 has an improved display pipeline, most notably with a
different HVS and only HDMI and writeback outputs.

Let's introduce it as a new VideoCore generation and compatible.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index b42f648..d4b87ec 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -309,7 +309,9 @@ static int vc4_drm_bind(struct device *dev)
 
        dev->coherent_dma_mask = DMA_BIT_MASK(32);
 
-       if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
+       if (of_device_is_compatible(dev->of_node, "brcm,bcm2712-vc6"))
+               gen = VC4_GEN_6;
+       else if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
                gen = VC4_GEN_5;
        else
                gen = VC4_GEN_4;
@@ -471,6 +473,7 @@ static void vc4_platform_drm_remove(struct platform_device *pdev)
 
 static const struct of_device_id vc4_of_match[] = {
        { .compatible = "brcm,bcm2711-vc5", },
+       { .compatible = "brcm,bcm2712-vc6", },
        { .compatible = "brcm,bcm2835-vc4", },
        { .compatible = "brcm,cygnus-vc4", },
        {},

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 31de9de..4e66491 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -84,6 +84,7 @@ struct vc4_perfmon {
 enum vc4_gen {
        VC4_GEN_4,
        VC4_GEN_5,
+       VC4_GEN_6,
 };
 
 struct vc4_dev {