From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Date: Mon, 20 Feb 2017 06:58:21 +0000 Subject: Re: [PATCH] drm/rockchip: cdn-dp: Fix error handling Message-Id: <58AA938D.5010902@rock-chips.com> List-Id: References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> <58AA4908.2000808@rock-chips.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Christophe JAILLET , airlied@linux.ie, heiko@sntech.de Cc: linux-rockchip@lists.infradead.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On 2017年02月20日 14:41, Christophe JAILLET wrote: > Le 20/02/2017 à 02:40, Mark yao a écrit : >> On 2017年02月20日 00:59, Christophe JAILLET wrote: >>> It is likely that both 'clk_disable_unprepare()' should be called if >>> 'pm_runtime_get_sync()' fails. >>> >>> Add a new label for that, because 'err_set_rate' is not meaningful >>> in this >>> case. >>> >>> >>> Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for >>> rk3399") >>> >>> Signed-off-by: Christophe JAILLET >>> --- >>> Not sure but a 'pm_runtime_get_sync()' is maybe also required in the >>> 'err_set_rate' path. >>> --- >>> drivers/gpu/drm/rockchip/cdn-dp-core.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> b/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> index 9ab67a670885..0fe1ec8b8fb1 100644 >>> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> @@ -111,7 +111,7 @@ static int cdn_dp_clk_enable(struct >>> cdn_dp_device *dp) >>> ret = pm_runtime_get_sync(dp->dev); >>> if (ret < 0) { >>> DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret); >>> - goto err_pclk; >>> + goto err_sync; >> >> I think the name err_pm_runtime_get is better. >> err_sync is not a clear name for the pm_runtime_get_sync. >> > I will change it. > >>> } >>> reset_control_assert(dp->core_rst); >>> @@ -133,6 +133,7 @@ static int cdn_dp_clk_enable(struct >>> cdn_dp_device *dp) >>> return 0; >>> err_set_rate: >>> +err_sync: >> >> miss pm_runtime_put, it should be: >> > I am wondering if 'pm_runtime_put_sync' should be added, instead. > We want to revert the 'pm_runtime_get_sync' of line 111. According to > the naming of the function, the _sync version looks more logical to me. > Using ccoccinelle shows that 2/3 of functions calling both > 'pm_runtime_get_sync' and 'pm_runtime_get[_sync]' and using the _sync > variant. > pm_runtime_get_sync will block until hardware actually done power configure, we need make sure power is enable before use the hardware, So we should use pm_runtime_get_sync at power on. At power off time, use pm_runtime_put is enough, it can be async, no need block. Thanks. > Which semantic is the correct one? > > >> err_set_rate: >> pm_runtime_put(dp->dev); >> err_pm_runtime_get: >> clk_disable_unprepare(dp->core_clk); >> err_core_clk: >> >>> clk_disable_unprepare(dp->core_clk); >>> err_core_clk: >>> clk_disable_unprepare(dp->pclk); >> >> > > > > -- Ｍark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH] drm/rockchip: cdn-dp: Fix error handling Date: Mon, 20 Feb 2017 14:58:21 +0800 Message-ID: <58AA938D.5010902@rock-chips.com> References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> <58AA4908.2000808@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Christophe JAILLET , airlied@linux.ie, heiko@sntech.de Cc: linux-rockchip@lists.infradead.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxN+W5tDAy5pyIMjDml6UgMTQ6NDEsIENocmlzdG9waGUgSkFJTExFVCB3cm90ZToKPiBM ZSAyMC8wMi8yMDE3IMOgIDAyOjQwLCBNYXJrIHlhbyBhIMOpY3JpdCA6Cj4+IE9uIDIwMTflubQw MuaciDIw5pelIDAwOjU5LCBDaHJpc3RvcGhlIEpBSUxMRVQgd3JvdGU6Cj4+PiBJdCBpcyBsaWtl bHkgdGhhdCBib3RoICdjbGtfZGlzYWJsZV91bnByZXBhcmUoKScgc2hvdWxkIGJlIGNhbGxlZCBp Zgo+Pj4gJ3BtX3J1bnRpbWVfZ2V0X3N5bmMoKScgZmFpbHMuCj4+Pgo+Pj4gQWRkIGEgbmV3IGxh YmVsIGZvciB0aGF0LCBiZWNhdXNlICdlcnJfc2V0X3JhdGUnIGlzIG5vdCBtZWFuaW5nZnVsIAo+ Pj4gaW4gdGhpcwo+Pj4gY2FzZS4KPj4+Cj4+Pgo+Pj4gRml4ZXM6IDFhMGY3ZWQzYWJlMiAoImRy bS9yb2NrY2hpcDogY2RuLWRwOiBhZGQgY2RuIERQIHN1cHBvcnQgZm9yIAo+Pj4gcmszMzk5IikK Pj4+Cj4+PiBTaWduZWQtb2ZmLWJ5OiBDaHJpc3RvcGhlIEpBSUxMRVQgPGNocmlzdG9waGUuamFp bGxldEB3YW5hZG9vLmZyPgo+Pj4gLS0tCj4+PiBOb3Qgc3VyZSBidXQgYSAncG1fcnVudGltZV9n ZXRfc3luYygpJyBpcyBtYXliZSBhbHNvIHJlcXVpcmVkIGluIHRoZQo+Pj4gJ2Vycl9zZXRfcmF0 ZScgcGF0aC4KPj4+IC0tLQo+Pj4gICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvY2RuLWRwLWNv cmUuYyB8IDMgKystCj4+PiAgIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKPj4+Cj4+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2Nk bi1kcC1jb3JlLmMgCj4+PiBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5j Cj4+PiBpbmRleCA5YWI2N2E2NzA4ODUuLjBmZTFlYzhiOGZiMSAxMDA2NDQKPj4+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jCj4+PiArKysgYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvY2RuLWRwLWNvcmUuYwo+Pj4gQEAgLTExMSw3ICsxMTEsNyBAQCBzdGF0 aWMgaW50IGNkbl9kcF9jbGtfZW5hYmxlKHN0cnVjdCAKPj4+IGNkbl9kcF9kZXZpY2UgKmRwKQo+ Pj4gICAgICAgcmV0ID0gcG1fcnVudGltZV9nZXRfc3luYyhkcC0+ZGV2KTsKPj4+ICAgICAgIGlm IChyZXQgPCAwKSB7Cj4+PiAgICAgICAgICAgRFJNX0RFVl9FUlJPUihkcC0+ZGV2LCAiY2Fubm90 IGdldCBwbSBydW50aW1lICVkXG4iLCByZXQpOwo+Pj4gLSAgICAgICAgZ290byBlcnJfcGNsazsK Pj4+ICsgICAgICAgIGdvdG8gZXJyX3N5bmM7Cj4+Cj4+IEkgdGhpbmsgdGhlIG5hbWUgZXJyX3Bt X3J1bnRpbWVfZ2V0IGlzIGJldHRlci4KPj4gZXJyX3N5bmMgaXMgbm90IGEgY2xlYXIgbmFtZSBm b3IgdGhlIHBtX3J1bnRpbWVfZ2V0X3N5bmMuCj4+Cj4gSSB3aWxsIGNoYW5nZSBpdC4KPgo+Pj4g ICAgICAgfQo+Pj4gICAgICAgICByZXNldF9jb250cm9sX2Fzc2VydChkcC0+Y29yZV9yc3QpOwo+ Pj4gQEAgLTEzMyw2ICsxMzMsNyBAQCBzdGF0aWMgaW50IGNkbl9kcF9jbGtfZW5hYmxlKHN0cnVj dCAKPj4+IGNkbl9kcF9kZXZpY2UgKmRwKQo+Pj4gICAgICAgcmV0dXJuIDA7Cj4+PiAgICAgZXJy X3NldF9yYXRlOgo+Pj4gK2Vycl9zeW5jOgo+Pgo+PiBtaXNzIHBtX3J1bnRpbWVfcHV0LCBpdCBz aG91bGQgYmU6Cj4+Cj4gSSBhbSB3b25kZXJpbmcgaWYgJ3BtX3J1bnRpbWVfcHV0X3N5bmMnIHNo b3VsZCBiZSBhZGRlZCwgaW5zdGVhZC4KPiBXZSB3YW50IHRvIHJldmVydCB0aGUgJ3BtX3J1bnRp bWVfZ2V0X3N5bmMnIG9mIGxpbmUgMTExLiBBY2NvcmRpbmcgdG8gCj4gdGhlIG5hbWluZyBvZiB0 aGUgZnVuY3Rpb24sIHRoZSBfc3luYyB2ZXJzaW9uIGxvb2tzIG1vcmUgbG9naWNhbCB0byBtZS4K PiBVc2luZyBjY29jY2luZWxsZSBzaG93cyB0aGF0IDIvMyBvZiBmdW5jdGlvbnMgY2FsbGluZyBi b3RoIAo+ICdwbV9ydW50aW1lX2dldF9zeW5jJyBhbmQgJ3BtX3J1bnRpbWVfZ2V0W19zeW5jXScg YW5kIHVzaW5nIHRoZSBfc3luYyAKPiB2YXJpYW50Lgo+CgpwbV9ydW50aW1lX2dldF9zeW5jIHdp bGwgYmxvY2sgdW50aWwgaGFyZHdhcmUgYWN0dWFsbHkgZG9uZSBwb3dlciBjb25maWd1cmUsCndl IG5lZWQgbWFrZSBzdXJlIHBvd2VyIGlzIGVuYWJsZSBiZWZvcmUgdXNlIHRoZSBoYXJkd2FyZSwg U28gd2Ugc2hvdWxkIAp1c2UgcG1fcnVudGltZV9nZXRfc3luYyBhdCBwb3dlciBvbi4KCkF0IHBv d2VyIG9mZiB0aW1lLCB1c2UgcG1fcnVudGltZV9wdXQgaXMgZW5vdWdoLCBpdCBjYW4gYmUgYXN5 bmMsIG5vIApuZWVkIGJsb2NrLgoKVGhhbmtzLgoKPiBXaGljaCBzZW1hbnRpYyBpcyB0aGUgY29y cmVjdCBvbmU/Cj4KPgo+PiBlcnJfc2V0X3JhdGU6Cj4+ICAgICBwbV9ydW50aW1lX3B1dChkcC0+ ZGV2KTsKPj4gZXJyX3BtX3J1bnRpbWVfZ2V0Ogo+PiAgICAgY2xrX2Rpc2FibGVfdW5wcmVwYXJl KGRwLT5jb3JlX2Nsayk7Cj4+IGVycl9jb3JlX2NsazoKPj4KPj4+IGNsa19kaXNhYmxlX3VucHJl cGFyZShkcC0+Y29yZV9jbGspOwo+Pj4gICBlcnJfY29yZV9jbGs6Cj4+PiAgICAgICBjbGtfZGlz YWJsZV91bnByZXBhcmUoZHAtPnBjbGspOwo+Pgo+Pgo+Cj4KPgo+CgoKLS0gCu+8rWFyayBZYW8K CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Mon, 20 Feb 2017 14:58:21 +0800 Subject: [PATCH] drm/rockchip: cdn-dp: Fix error handling In-Reply-To: References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> <58AA4908.2000808@rock-chips.com> Message-ID: <58AA938D.5010902@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2017?02?20? 14:41, Christophe JAILLET wrote: > Le 20/02/2017 ? 02:40, Mark yao a ?crit : >> On 2017?02?20? 00:59, Christophe JAILLET wrote: >>> It is likely that both 'clk_disable_unprepare()' should be called if >>> 'pm_runtime_get_sync()' fails. >>> >>> Add a new label for that, because 'err_set_rate' is not meaningful >>> in this >>> case. >>> >>> >>> Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for >>> rk3399") >>> >>> Signed-off-by: Christophe JAILLET >>> --- >>> Not sure but a 'pm_runtime_get_sync()' is maybe also required in the >>> 'err_set_rate' path. >>> --- >>> drivers/gpu/drm/rockchip/cdn-dp-core.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> b/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> index 9ab67a670885..0fe1ec8b8fb1 100644 >>> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> @@ -111,7 +111,7 @@ static int cdn_dp_clk_enable(struct >>> cdn_dp_device *dp) >>> ret = pm_runtime_get_sync(dp->dev); >>> if (ret < 0) { >>> DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret); >>> - goto err_pclk; >>> + goto err_sync; >> >> I think the name err_pm_runtime_get is better. >> err_sync is not a clear name for the pm_runtime_get_sync. >> > I will change it. > >>> } >>> reset_control_assert(dp->core_rst); >>> @@ -133,6 +133,7 @@ static int cdn_dp_clk_enable(struct >>> cdn_dp_device *dp) >>> return 0; >>> err_set_rate: >>> +err_sync: >> >> miss pm_runtime_put, it should be: >> > I am wondering if 'pm_runtime_put_sync' should be added, instead. > We want to revert the 'pm_runtime_get_sync' of line 111. According to > the naming of the function, the _sync version looks more logical to me. > Using ccoccinelle shows that 2/3 of functions calling both > 'pm_runtime_get_sync' and 'pm_runtime_get[_sync]' and using the _sync > variant. > pm_runtime_get_sync will block until hardware actually done power configure, we need make sure power is enable before use the hardware, So we should use pm_runtime_get_sync at power on. At power off time, use pm_runtime_put is enough, it can be async, no need block. Thanks. > Which semantic is the correct one? > > >> err_set_rate: >> pm_runtime_put(dp->dev); >> err_pm_runtime_get: >> clk_disable_unprepare(dp->core_clk); >> err_core_clk: >> >>> clk_disable_unprepare(dp->core_clk); >>> err_core_clk: >>> clk_disable_unprepare(dp->pclk); >> >> > > > > -- ?ark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751381AbdBTG7S (ORCPT ); Mon, 20 Feb 2017 01:59:18 -0500 Received: from regular1.263xmail.com ([211.150.99.136]:39404 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750926AbdBTG7Q (ORCPT ); Mon, 20 Feb 2017 01:59:16 -0500 X-263anti-spam: KSV:0;BIG:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ADDR-CHECKED4: 1 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <0c7eb09e71c39daaf1a9575ca4966ff6> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH] drm/rockchip: cdn-dp: Fix error handling To: Christophe JAILLET , airlied@linux.ie, heiko@sntech.de References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> <58AA4908.2000808@rock-chips.com> Cc: linux-rockchip@lists.infradead.org, kernel-janitors@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org From: Mark yao Message-ID: <58AA938D.5010902@rock-chips.com> Date: Mon, 20 Feb 2017 14:58:21 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017年02月20日 14:41, Christophe JAILLET wrote: > Le 20/02/2017 à 02:40, Mark yao a écrit : >> On 2017年02月20日 00:59, Christophe JAILLET wrote: >>> It is likely that both 'clk_disable_unprepare()' should be called if >>> 'pm_runtime_get_sync()' fails. >>> >>> Add a new label for that, because 'err_set_rate' is not meaningful >>> in this >>> case. >>> >>> >>> Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for >>> rk3399") >>> >>> Signed-off-by: Christophe JAILLET >>> --- >>> Not sure but a 'pm_runtime_get_sync()' is maybe also required in the >>> 'err_set_rate' path. >>> --- >>> drivers/gpu/drm/rockchip/cdn-dp-core.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> b/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> index 9ab67a670885..0fe1ec8b8fb1 100644 >>> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c >>> @@ -111,7 +111,7 @@ static int cdn_dp_clk_enable(struct >>> cdn_dp_device *dp) >>> ret = pm_runtime_get_sync(dp->dev); >>> if (ret < 0) { >>> DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret); >>> - goto err_pclk; >>> + goto err_sync; >> >> I think the name err_pm_runtime_get is better. >> err_sync is not a clear name for the pm_runtime_get_sync. >> > I will change it. > >>> } >>> reset_control_assert(dp->core_rst); >>> @@ -133,6 +133,7 @@ static int cdn_dp_clk_enable(struct >>> cdn_dp_device *dp) >>> return 0; >>> err_set_rate: >>> +err_sync: >> >> miss pm_runtime_put, it should be: >> > I am wondering if 'pm_runtime_put_sync' should be added, instead. > We want to revert the 'pm_runtime_get_sync' of line 111. According to > the naming of the function, the _sync version looks more logical to me. > Using ccoccinelle shows that 2/3 of functions calling both > 'pm_runtime_get_sync' and 'pm_runtime_get[_sync]' and using the _sync > variant. > pm_runtime_get_sync will block until hardware actually done power configure, we need make sure power is enable before use the hardware, So we should use pm_runtime_get_sync at power on. At power off time, use pm_runtime_put is enough, it can be async, no need block. Thanks. > Which semantic is the correct one? > > >> err_set_rate: >> pm_runtime_put(dp->dev); >> err_pm_runtime_get: >> clk_disable_unprepare(dp->core_clk); >> err_core_clk: >> >>> clk_disable_unprepare(dp->core_clk); >>> err_core_clk: >>> clk_disable_unprepare(dp->pclk); >> >> > > > > -- Ｍark Yao