Merge drm/drm-next into drm-misc-next

[mirror_ubuntu-hirsute-kernel.git] / drivers / gpu / drm / vc4 / vc4_drv.c

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 38343d2fb4fb4753ba13cd3a20653bffcb21cdc3..f1a5fd5dab6f5caf103a98764449fa79bfaf374f 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -252,6 +252,7 @@ static int vc4_drm_bind(struct device *dev)
        struct drm_device *drm;
        struct vc4_dev *vc4;
        struct device_node *node;
+       struct drm_crtc *crtc;
        int ret = 0;
 
        dev->coherent_dma_mask = DMA_BIT_MASK(32);
@@ -298,6 +299,9 @@ static int vc4_drm_bind(struct device *dev)
        if (ret < 0)
                goto unbind_all;
 
+       drm_for_each_crtc(crtc, drm)
+               vc4_crtc_disable_at_boot(crtc);
+
        ret = drm_dev_register(drm, 0);
        if (ret < 0)
                goto unbind_all;
@@ -368,6 +372,7 @@ static int vc4_platform_drm_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id vc4_of_match[] = {
+       { .compatible = "brcm,bcm2711-vc5", },
        { .compatible = "brcm,bcm2835-vc4", },
        { .compatible = "brcm,cygnus-vc4", },
        {},