From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [PATCH] drm/rockchip: analogix_dp: reorder psr_unregister call in unbind Date: Thu, 01 Mar 2018 16:25:58 +0100 Message-ID: <76025075.yWNtk1v57f@phil> References: <20180110162348.22765-1-thierry.escande@collabora.com> <20180110162348.22765-4-thierry.escande@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180110162348.22765-4-thierry.escande@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Thierry Escande , Neil Armstrong , Jeffy Chen , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , Laurent Pinchart , Daniel Vetter List-Id: linux-rockchip.vger.kernel.org SW4gYmluZCB0aGUgcHNyIGhhbmRsZXIgZ2V0cyByZWdpc3RlcmVkIGZpcnN0IGJlZm9yZSB0aGUg Y29yZQphbmFsb2dpeF9kcF9iaW5kKCkgZ2V0cyBjYWxsZWQuIFNvIGl0IHNob3VsZCBiZSB0aGUg b3RoZXIgd2F5CmFyb3VuZCBpbiB1bmJpbmQsIGZpcnN0IHVuYmluZCB0aGUgYW5hbG9naXhfZHAg YW5kIHRoZW4KdW5yZWdpc3RlciB0aGUgcHNyLgoKU2lnbmVkLW9mZi1ieTogSmVmZnkgQ2hlbiA8 amVmZnkuY2hlbkByb2NrLWNoaXBzLmNvbT4KU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBFc2NhbmRl IDx0aGllcnJ5LmVzY2FuZGVAY29sbGFib3JhLmNvbT4KU2lnbmVkLW9mZi1ieTogSGVpa28gU3R1 ZWJuZXIgPGhlaWtvQHNudGVjaC5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5h bG9naXhfZHAtcm9ja2NoaXAuYyB8IDE1ICsrKysrKysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQs IDExIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMgYi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvYW5hbG9naXhfZHAtcm9ja2NoaXAuYwppbmRleCAzNzI1MGFiNjNiZDcuLmViODhj NTIzMzZhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2Rw LXJvY2tjaGlwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJv Y2tjaGlwLmMKQEAgLTM3MCw4ICszNzcsOCBAQCBzdGF0aWMgdm9pZCByb2NrY2hpcF9kcF91bmJp bmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsCiB7CiAJc3RydWN0 IHJvY2tjaGlwX2RwX2RldmljZSAqZHAgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKIAotCXJvY2tj aGlwX2RybV9wc3JfdW5yZWdpc3RlcigmZHAtPmVuY29kZXIpOwogCWFuYWxvZ2l4X2RwX3VuYmlu ZChkcC0+YWRwKTsKKwlyb2NrY2hpcF9kcm1fcHNyX3VucmVnaXN0ZXIoJmRwLT5lbmNvZGVyKTsK IAlkcC0+ZW5jb2Rlci5mdW5jcy0+ZGVzdHJveSgmZHAtPmVuY29kZXIpOwogfQogCi0tIAoyLjE1 LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032131AbeCAP0f (ORCPT ); Thu, 1 Mar 2018 10:26:35 -0500 Received: from gloria.sntech.de ([95.129.55.99]:48578 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032010AbeCAP03 (ORCPT ); Thu, 1 Mar 2018 10:26:29 -0500 From: Heiko Stuebner To: dri-devel@lists.freedesktop.org Cc: Thierry Escande , Rob Herring , Archit Taneja , Daniel Vetter , Neil Armstrong , Laurent Pinchart , Sandy Huang , linux-rockchip@lists.infradead.org, Jeffy Chen , linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: analogix_dp: reorder psr_unregister call in unbind Date: Thu, 01 Mar 2018 16:25:58 +0100 Message-ID: <76025075.yWNtk1v57f@phil> In-Reply-To: <20180110162348.22765-4-thierry.escande@collabora.com> References: <20180110162348.22765-1-thierry.escande@collabora.com> <20180110162348.22765-4-thierry.escande@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Thierry Escande Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 37250ab63bd7..eb88c52336a7 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -370,8 +377,8 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, { struct rockchip_dp_device *dp = dev_get_drvdata(dev); - rockchip_drm_psr_unregister(&dp->encoder); analogix_dp_unbind(dp->adp); + rockchip_drm_psr_unregister(&dp->encoder); dp->encoder.funcs->destroy(&dp->encoder); } -- 2.15.1