diff options
author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2018-03-01 10:25:58 -0500 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2018-03-01 10:35:29 -0500 |
commit | d8e7e73e66d0566a82cb91642680ec0d1f77eda6 (patch) | |
tree | 0c781d34de78161921ffa788521d68bd3f8c6e17 | |
parent | c8c045142125e7c054f66241d9f3b3151bb70daf (diff) |
drm/rockchip: analogix_dp: reorder psr_unregister call in unbind
In bind the psr handler gets registered first before the core
analogix_dp_bind() gets called. So it should be the other way
around in unbind, first unbind the analogix_dp and then
unregister the psr.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/76025075.yWNtk1v57f@phil
-rw-r--r-- | drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index ea47573f5b75..eb88c52336a7 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | |||
@@ -377,8 +377,8 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, | |||
377 | { | 377 | { |
378 | struct rockchip_dp_device *dp = dev_get_drvdata(dev); | 378 | struct rockchip_dp_device *dp = dev_get_drvdata(dev); |
379 | 379 | ||
380 | rockchip_drm_psr_unregister(&dp->encoder); | ||
381 | analogix_dp_unbind(dp->adp); | 380 | analogix_dp_unbind(dp->adp); |
381 | rockchip_drm_psr_unregister(&dp->encoder); | ||
382 | dp->encoder.funcs->destroy(&dp->encoder); | 382 | dp->encoder.funcs->destroy(&dp->encoder); |
383 | } | 383 | } |
384 | 384 | ||