lkml.org 
[lkml]   [2020]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/5] drm/rockchip: Fix the device unbind order
Date
In order to cleanup the configuration, destroying the components
in the pipeline, the components must be present.

Therefore, cleanup the config first, and unbind the components
later.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 20ecb1508a22..ca12a35483f9 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -108,6 +108,11 @@ static void rockchip_iommu_cleanup(struct drm_device *drm_dev)
iommu_domain_free(private->domain);
}

+static void unbind_cleanup(void *data)
+{
+ drm_mode_config_cleanup((struct drm_device *)data);
+}
+
static int rockchip_drm_bind(struct device *dev)
{
struct drm_device *drm_dev;
@@ -140,13 +145,13 @@ static int rockchip_drm_bind(struct device *dev)
rockchip_drm_mode_config_init(drm_dev);

/* Try to bind all sub drivers. */
- ret = component_bind_all(dev, drm_dev);
+ ret = component_bind_all_or_cleanup(dev, drm_dev, unbind_cleanup);
if (ret)
- goto err_mode_config_cleanup;
+ goto err_free;

ret = drm_vblank_init(drm_dev, drm_dev->mode_config.num_crtc);
if (ret)
- goto err_unbind_all;
+ goto err_drm_cleanup;

drm_mode_config_reset(drm_dev);

@@ -158,7 +163,7 @@ static int rockchip_drm_bind(struct device *dev)

ret = rockchip_drm_fbdev_init(drm_dev);
if (ret)
- goto err_unbind_all;
+ goto err_drm_cleanup;

/* init kms poll for handling hpd */
drm_kms_helper_poll_init(drm_dev);
@@ -171,10 +176,9 @@ static int rockchip_drm_bind(struct device *dev)
err_kms_helper_poll_fini:
drm_kms_helper_poll_fini(drm_dev);
rockchip_drm_fbdev_fini(drm_dev);
-err_unbind_all:
- component_unbind_all(dev, drm_dev);
-err_mode_config_cleanup:
+err_drm_cleanup:
drm_mode_config_cleanup(drm_dev);
+ component_unbind_all(dev, drm_dev);
rockchip_iommu_cleanup(drm_dev);
err_free:
drm_dev->dev_private = NULL;
@@ -193,8 +197,8 @@ static void rockchip_drm_unbind(struct device *dev)
drm_kms_helper_poll_fini(drm_dev);

drm_atomic_helper_shutdown(drm_dev);
- component_unbind_all(dev, drm_dev);
drm_mode_config_cleanup(drm_dev);
+ component_unbind_all(dev, drm_dev);
rockchip_iommu_cleanup(drm_dev);

drm_dev->dev_private = NULL;
--
2.25.0
\
 
 \ /
  Last update: 2020-01-20 18:06    [W:2.072 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site