drm/msm/adreno: Check for recognized GPU before bind

If we have a newer dtb than kernel, we could end up in a situation where
the GPU device is present in the dtb, but not in the drivers device
table.  We don't want this to prevent the display from probing.  So
check that we recognize the GPU before adding the GPU component.

v2: use %pOF

Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/657701/

diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index f176796e238d3c76a5be8f65e585749498ba59cf..5e730756723989a90cd11f8d607af283397b79da 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -182,6 +182,26 @@ static int find_chipid(struct device_node *node, uint32_t *chipid)
        return 0;
 }
 
+bool adreno_has_gpu(struct device_node *node)
+{
+       const struct adreno_info *info;
+       uint32_t chip_id;
+       int ret;
+
+       ret = find_chipid(node, &chip_id);
+       if (ret)
+               return false;
+
+       info = adreno_info(chip_id);
+       if (!info) {
+               pr_warn("%pOF: Unknown GPU revision: %"ADRENO_CHIPID_FMT"\n",
+                       node, ADRENO_CHIPID_ARGS(chip_id));
+               return false;
+       }
+
+       return true;
+}
+
 static int adreno_bind(struct device *dev, struct device *master, void *data)
 {
        static struct adreno_platform_config config = {};
@@ -192,18 +212,17 @@ static int adreno_bind(struct device *dev, struct device *master, void *data)
        int ret;
 
        ret = find_chipid(dev->of_node, &config.chip_id);
-       if (ret)
+       /* We shouldn't have gotten this far if we can't parse the chip_id */
+       if (WARN_ON(ret))
                return ret;
 
        dev->platform_data = &config;
        priv->gpu_pdev = to_platform_device(dev);
 
        info = adreno_info(config.chip_id);
-       if (!info) {
-               dev_warn(drm->dev, "Unknown GPU revision: %"ADRENO_CHIPID_FMT"\n",
-                       ADRENO_CHIPID_ARGS(config.chip_id));
+       /* We shouldn't have gotten this far if we don't recognize the GPU: */
+       if (!WARN_ON(info))
                return -ENXIO;
-       }
 
        config.info = info;
 

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 8eeb54a367f072ae4c3f1bdd46cd086cb79810dc..d007687c24467d84d4d4179174764ef066c66354 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1034,7 +1034,7 @@ static int add_gpu_components(struct device *dev,
        if (!np)
                return 0;
 
-       if (of_device_is_available(np))
+       if (of_device_is_available(np) && adreno_has_gpu(np))
                drm_of_component_match_add(dev, matchptr, component_compare_of, np);
 
        of_node_put(np);

diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index bed0692f5adb30e50d0448640a329158d1ffe5e5..5bf7cd985b9c50e38468fed695234f787919a8aa 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -662,6 +662,7 @@ msm_gpu_create_private_address_space(struct msm_gpu *gpu, struct task_struct *ta
 void msm_gpu_cleanup(struct msm_gpu *gpu);
 
 struct msm_gpu *adreno_load_gpu(struct drm_device *dev);
+bool adreno_has_gpu(struct device_node *node);
 void __init adreno_register(void);
 void __exit adreno_unregister(void);