drm/msm: rework binding of Imageon GPUs

Currently the msm driver creates an extra interim platform device for
Imageon GPUs. This is not ideal, as the device doesn't have
corresponding OF node. If the headless mode is used for newer GPUs, then
the msm_use_mmu() function can not detect corresponding IOMMU devices.
Also the DRM device (although it's headless) is created with modesetting
flags being set.

To solve all these issues, rework the way the Imageon devices are bound.
Remove the interim device, don't register a component and instead use a
cut-down version of the normal functions to probe or remove the driver.

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

diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index 27dbbb3020812f6fb7cff85a4e77c4ee471df470..99c8d2f4e4b49fda912fa49429399cf207eccead 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -260,42 +260,22 @@ static const struct component_ops a3xx_ops = {
        .unbind = adreno_unbind,
 };
 
-static void adreno_device_register_headless(void)
-{
-       /* on imx5, we don't have a top-level mdp/dpu node
-        * this creates a dummy node for the driver for that case
-        */
-       struct platform_device_info dummy_info = {
-               .parent = NULL,
-               .name = "msm",
-               .id = -1,
-               .res = NULL,
-               .num_res = 0,
-               .data = NULL,
-               .size_data = 0,
-               .dma_mask = ~0,
-       };
-       platform_device_register_full(&dummy_info);
-}
-
 static int adreno_probe(struct platform_device *pdev)
 {
-
-       int ret;
-
-       ret = component_add(&pdev->dev, &a3xx_ops);
-       if (ret)
-               return ret;
-
        if (of_device_is_compatible(pdev->dev.of_node, "amd,imageon"))
-               adreno_device_register_headless();
+               return msm_gpu_probe(pdev, &a3xx_ops);
 
-       return 0;
+       return component_add(&pdev->dev, &a3xx_ops);
 }
 
 static void adreno_remove(struct platform_device *pdev)
 {
-       component_del(&pdev->dev, &a3xx_ops);
+       struct msm_drm_private *priv = platform_get_drvdata(pdev);
+
+       if (priv->kms_init)
+               component_del(&pdev->dev, &a3xx_ops);
+       else
+               msm_gpu_remove(pdev, &a3xx_ops);
 }
 
 static void adreno_shutdown(struct platform_device *pdev)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index ce22d96033c8efe9210436eff8241f52d3c053bd..0ab005a7d5e99e46fe47c9e64514434416898d20 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -57,7 +57,7 @@ module_param(modeset, bool, 0600);
 DECLARE_FAULT_ATTR(fail_gem_alloc);
 DECLARE_FAULT_ATTR(fail_gem_iova);
 
-static int msm_drm_uninit(struct device *dev)
+static int msm_drm_uninit(struct device *dev, const struct component_ops *gpu_ops)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct msm_drm_private *priv = platform_get_drvdata(pdev);
@@ -84,7 +84,10 @@ static int msm_drm_uninit(struct device *dev)
        if (priv->kms)
                msm_drm_kms_uninit(dev);
 
-       component_unbind_all(dev, ddev);
+       if (gpu_ops)
+               gpu_ops->unbind(dev, dev, NULL);
+       else
+               component_unbind_all(dev, ddev);
 
        ddev->dev_private = NULL;
        drm_dev_put(ddev);
@@ -92,7 +95,8 @@ static int msm_drm_uninit(struct device *dev)
        return 0;
 }
 
-static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
+static int msm_drm_init(struct device *dev, const struct drm_driver *drv,
+                       const struct component_ops *gpu_ops)
 {
        struct msm_drm_private *priv = dev_get_drvdata(dev);
        struct drm_device *ddev;
@@ -139,7 +143,10 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
        dma_set_max_seg_size(dev, UINT_MAX);
 
        /* Bind all our sub-components: */
-       ret = component_bind_all(dev, ddev);
+       if (gpu_ops)
+               ret = gpu_ops->bind(dev, dev, NULL);
+       else
+               ret = component_bind_all(dev, ddev);
        if (ret)
                goto err_put_dev;
 
@@ -151,11 +158,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
                ret = msm_drm_kms_init(dev, drv);
                if (ret)
                        goto err_msm_uninit;
-       } else {
-               /* valid only for the dummy headless case, where of_node=NULL */
-               WARN_ON(dev->of_node);
-               ddev->driver_features &= ~DRIVER_MODESET;
-               ddev->driver_features &= ~DRIVER_ATOMIC;
        }
 
        ret = drm_dev_register(ddev, 0);
@@ -172,7 +174,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
        return 0;
 
 err_msm_uninit:
-       msm_drm_uninit(dev);
+       msm_drm_uninit(dev, gpu_ops);
 
        return ret;
 
@@ -834,6 +836,28 @@ static const struct drm_driver msm_driver = {
        .patchlevel         = MSM_VERSION_PATCHLEVEL,
 };
 
+static const struct drm_driver msm_gpu_driver = {
+       .driver_features    = DRIVER_GEM |
+                               DRIVER_RENDER |
+                               DRIVER_SYNCOBJ_TIMELINE |
+                               DRIVER_SYNCOBJ,
+       .open               = msm_open,
+       .postclose          = msm_postclose,
+       .gem_prime_import_sg_table = msm_gem_prime_import_sg_table,
+#ifdef CONFIG_DEBUG_FS
+       .debugfs_init       = msm_debugfs_init,
+#endif
+       .show_fdinfo        = msm_show_fdinfo,
+       .ioctls             = msm_ioctls,
+       .num_ioctls         = ARRAY_SIZE(msm_ioctls),
+       .fops               = &fops,
+       .name               = "msm",
+       .desc               = "MSM Snapdragon DRM",
+       .major              = MSM_VERSION_MAJOR,
+       .minor              = MSM_VERSION_MINOR,
+       .patchlevel         = MSM_VERSION_PATCHLEVEL,
+};
+
 /*
  * Componentized driver support:
  */
@@ -958,12 +982,12 @@ static int add_gpu_components(struct device *dev,
 
 static int msm_drm_bind(struct device *dev)
 {
-       return msm_drm_init(dev, &msm_driver);
+       return msm_drm_init(dev, &msm_driver, NULL);
 }
 
 static void msm_drm_unbind(struct device *dev)
 {
-       msm_drm_uninit(dev);
+       msm_drm_uninit(dev, NULL);
 }
 
 const struct component_master_ops msm_drm_ops = {
@@ -1012,29 +1036,34 @@ int msm_drv_probe(struct device *master_dev,
        return 0;
 }
 
-/*
- * Platform driver:
- * Used only for headlesss GPU instances
- */
-
-static int msm_pdev_probe(struct platform_device *pdev)
+int msm_gpu_probe(struct platform_device *pdev,
+                 const struct component_ops *ops)
 {
-       return msm_drv_probe(&pdev->dev, NULL, NULL);
+       struct msm_drm_private *priv;
+       int ret;
+
+       priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       platform_set_drvdata(pdev, priv);
+
+       /* on all devices that I am aware of, iommu's which can map
+        * any address the cpu can see are used:
+        */
+       ret = dma_set_mask_and_coherent(&pdev->dev, ~0);
+       if (ret)
+               return ret;
+
+       return msm_drm_init(&pdev->dev, &msm_gpu_driver, ops);
 }
 
-static void msm_pdev_remove(struct platform_device *pdev)
+void msm_gpu_remove(struct platform_device *pdev,
+                   const struct component_ops *ops)
 {
-       component_master_del(&pdev->dev, &msm_drm_ops);
+       msm_drm_uninit(&pdev->dev, ops);
 }
 
-static struct platform_driver msm_platform_driver = {
-       .probe      = msm_pdev_probe,
-       .remove     = msm_pdev_remove,
-       .driver     = {
-               .name   = "msm",
-       },
-};
-
 static int __init msm_drm_register(void)
 {
        if (!modeset)
@@ -1049,13 +1078,13 @@ static int __init msm_drm_register(void)
        adreno_register();
        msm_mdp4_register();
        msm_mdss_register();
-       return platform_driver_register(&msm_platform_driver);
+
+       return 0;
 }
 
 static void __exit msm_drm_unregister(void)
 {
        DBG("fini");
-       platform_driver_unregister(&msm_platform_driver);
        msm_mdss_unregister();
        msm_mdp4_unregister();
        msm_dp_unregister();

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 5b276a4540753aa25d46e50f0957790ed39474ae..e3dfaa156307dcd8bb675f865985a0888be8fb87 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -543,6 +543,10 @@ extern const struct component_master_ops msm_drm_ops;
 int msm_kms_pm_prepare(struct device *dev);
 void msm_kms_pm_complete(struct device *dev);
 
+int msm_gpu_probe(struct platform_device *pdev,
+                 const struct component_ops *ops);
+void msm_gpu_remove(struct platform_device *pdev,
+                   const struct component_ops *ops);
 int msm_drv_probe(struct device *dev,
        int (*kms_init)(struct drm_device *dev),
        struct msm_kms *kms);