drm/vc4: Disable V3D interactions if the v3d component didn't probe.

One might want to use the VC4 display stack without using Mesa.
Similar to the debugfs fixes for not having all of the possible
display bits enabled, make sure you can't oops in vc4 if v3d isn't
enabled.

v2: Fix matching against other v3d variants (review by Paul), don't
    forget to set irq_enabled so that the vblank uapi works
v3: Use -ENODEV instead of -EINVAL on Paul's suggestion.

Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401183559.3823-2-eric@anholt.net
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 41403e48bb1808a1ff7fb4e6c255f35f6b2136f3..6d9be20a32be343aa6e18885732b82252ce14d56 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -72,6 +72,9 @@ static int vc4_get_param_ioctl(struct drm_device *dev, void *data,
        if (args->pad != 0)
                return -EINVAL;
 
+       if (!vc4->v3d)
+               return -ENODEV;
+
        switch (args->param) {
        case DRM_VC4_PARAM_V3D_IDENT0:
                ret = vc4_v3d_pm_get(vc4);
@@ -248,6 +251,7 @@ static int vc4_drm_bind(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct drm_device *drm;
        struct vc4_dev *vc4;
+       struct device_node *node;
        int ret = 0;
 
        dev->coherent_dma_mask = DMA_BIT_MASK(32);
@@ -256,6 +260,12 @@ static int vc4_drm_bind(struct device *dev)
        if (!vc4)
                return -ENOMEM;
 
+       /* If VC4 V3D is missing, don't advertise render nodes. */
+       node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL);
+       if (!node || !of_device_is_available(node))
+               vc4_drm_driver.driver_features &= ~DRIVER_RENDER;
+       of_node_put(node);
+
        drm = drm_dev_alloc(&vc4_drm_driver, dev);
        if (IS_ERR(drm))
                return PTR_ERR(drm);

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index e7b97d7e5ddf03ed29930f8a78f928a46609a38a..4f13f6262491c1c28465f0e3b377d467a078c07e 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -831,6 +831,7 @@ void vc4_plane_async_set_fb(struct drm_plane *plane,
 
 /* vc4_v3d.c */
 extern struct platform_driver vc4_v3d_driver;
+extern const struct of_device_id vc4_v3d_dt_match[];
 int vc4_v3d_get_bin_slot(struct vc4_dev *vc4);
 int vc4_v3d_pm_get(struct vc4_dev *vc4);
 void vc4_v3d_pm_put(struct vc4_dev *vc4);

diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 5e9496d477bf75ee0d1eb0c5900b04139ebc74b5..d9311be32a4ff6bd0c66a3e1fd83b01e9d2dfe2d 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -74,6 +74,11 @@ vc4_get_hang_state_ioctl(struct drm_device *dev, void *data,
        u32 i;
        int ret = 0;
 
+       if (!vc4->v3d) {
+               DRM_DEBUG("VC4_GET_HANG_STATE with no VC4 V3D probed\n");
+               return -ENODEV;
+       }
+
        spin_lock_irqsave(&vc4->job_lock, irqflags);
        kernel_state = vc4->hang_state;
        if (!kernel_state) {
@@ -1119,6 +1124,11 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
        struct dma_fence *in_fence;
        int ret = 0;
 
+       if (!vc4->v3d) {
+               DRM_DEBUG("VC4_SUBMIT_CL with no VC4 V3D probed\n");
+               return -ENODEV;
+       }
+
        if ((args->flags & ~(VC4_SUBMIT_CL_USE_CLEAR_COLOR |
                             VC4_SUBMIT_CL_FIXED_RCL_ORDER |
                             VC4_SUBMIT_CL_RCL_ORDER_INCREASING_X |

diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c
index 4cd2ccfe15f49b5d992117f172c7dc373fcd4bd2..ffd0a4388752eaef9e703a6073a50425a265680b 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_irq.c
+++ b/drivers/gpu/drm/vc4/vc4_irq.c
@@ -229,6 +229,9 @@ vc4_irq_preinstall(struct drm_device *dev)
 {
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
+       if (!vc4->v3d)
+               return;
+
        init_waitqueue_head(&vc4->job_wait_queue);
        INIT_WORK(&vc4->overflow_mem_work, vc4_overflow_mem_work);
 
@@ -243,6 +246,9 @@ vc4_irq_postinstall(struct drm_device *dev)
 {
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
+       if (!vc4->v3d)
+               return 0;
+
        /* Enable both the render done and out of memory interrupts. */
        V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);
 
@@ -254,6 +260,9 @@ vc4_irq_uninstall(struct drm_device *dev)
 {
        struct vc4_dev *vc4 = to_vc4_dev(dev);
 
+       if (!vc4->v3d)
+               return;
+
        /* Disable sending interrupts for our driver's IRQs. */
        V3D_WRITE(V3D_INTDIS, V3D_DRIVER_IRQS);
 

diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index 5160cad25fcea928930d0b4a7221960e5e70b6d8..295dacc8bcb939ddf94e0b1dc4d447fd98a835ad 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -525,6 +525,7 @@ int vc4_kms_load(struct drm_device *dev)
        /* Set support for vblank irq fast disable, before drm_vblank_init() */
        dev->vblank_disable_immediate = true;
 
+       dev->irq_enabled = true;
        ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
        if (ret < 0) {
                dev_err(dev->dev, "failed to initialize vblank\n");

diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c
index 4951504150204244ecd8ce49c40d92959617bb21..f4aa75efd16b0d41df379a3d73efca20593e5296 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_perfmon.c
+++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
@@ -100,12 +100,18 @@ void vc4_perfmon_close_file(struct vc4_file *vc4file)
 int vc4_perfmon_create_ioctl(struct drm_device *dev, void *data,
                             struct drm_file *file_priv)
 {
+       struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_file *vc4file = file_priv->driver_priv;
        struct drm_vc4_perfmon_create *req = data;
        struct vc4_perfmon *perfmon;
        unsigned int i;
        int ret;
 
+       if (!vc4->v3d) {
+               DRM_DEBUG("Creating perfmon no VC4 V3D probed\n");
+               return -ENODEV;
+       }
+
        /* Number of monitored counters cannot exceed HW limits. */
        if (req->ncounters > DRM_VC4_MAX_PERF_COUNTERS ||
            !req->ncounters)
@@ -146,10 +152,16 @@ int vc4_perfmon_create_ioctl(struct drm_device *dev, void *data,
 int vc4_perfmon_destroy_ioctl(struct drm_device *dev, void *data,
                              struct drm_file *file_priv)
 {
+       struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_file *vc4file = file_priv->driver_priv;
        struct drm_vc4_perfmon_destroy *req = data;
        struct vc4_perfmon *perfmon;
 
+       if (!vc4->v3d) {
+               DRM_DEBUG("Destroying perfmon no VC4 V3D probed\n");
+               return -ENODEV;
+       }
+
        mutex_lock(&vc4file->perfmon.lock);
        perfmon = idr_remove(&vc4file->perfmon.idr, req->id);
        mutex_unlock(&vc4file->perfmon.lock);
@@ -164,11 +176,17 @@ int vc4_perfmon_destroy_ioctl(struct drm_device *dev, void *data,
 int vc4_perfmon_get_values_ioctl(struct drm_device *dev, void *data,
                                 struct drm_file *file_priv)
 {
+       struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_file *vc4file = file_priv->driver_priv;
        struct drm_vc4_perfmon_get_values *req = data;
        struct vc4_perfmon *perfmon;
        int ret;
 
+       if (!vc4->v3d) {
+               DRM_DEBUG("Getting perfmon no VC4 V3D probed\n");
+               return -ENODEV;
+       }
+
        mutex_lock(&vc4file->perfmon.lock);
        perfmon = idr_find(&vc4file->perfmon.idr, req->id);
        vc4_perfmon_get(perfmon);

diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
index 36e6c7086ecf1c08ecf18b813e332dc27e26f8d5..a4b6859e3af65e6775e81c1d37fddb17841119f5 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -474,7 +474,7 @@ static int vc4_v3d_dev_remove(struct platform_device *pdev)
        return 0;
 }
 
-static const struct of_device_id vc4_v3d_dt_match[] = {
+const struct of_device_id vc4_v3d_dt_match[] = {
        { .compatible = "brcm,bcm2835-v3d" },
        { .compatible = "brcm,cygnus-v3d" },
        { .compatible = "brcm,vc4-v3d" },