From: Ezequiel Garcia <ezequiel@collabora.com>
To: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>
Cc: linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
kernel@collabora.com, Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH 2/5] drm/rockchip: Fix the device unbind order
Date: Mon, 20 Jan 2020 14:05:59 -0300 [thread overview]
Message-ID: <20200120170602.3832-3-ezequiel@collabora.com> (raw)
In-Reply-To: <20200120170602.3832-1-ezequiel@collabora.com>
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
next prev parent reply other threads:[~2020-01-20 17:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 17:05 [PATCH 0/5] drm/rockchip: Fix unbind/bind Ezequiel Garcia
2020-01-20 17:05 ` [PATCH 1/5] component: Add an API to cleanup before unbind Ezequiel Garcia
2020-01-20 17:05 ` Ezequiel Garcia [this message]
2020-01-20 17:06 ` [PATCH 3/5] drm/rockchip: vop: Fix CRTC unbind Ezequiel Garcia
2020-01-20 17:06 ` [PATCH 4/5] drm/rockchip: lvds: Fix component unbind Ezequiel Garcia
2020-01-20 17:06 ` [PATCH 5/5] drm/rockchip: rk3066_hdmi: Cleanup " Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120170602.3832-3-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).