From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Date: Mon, 20 Feb 2017 01:40:24 +0000 Subject: Re: [PATCH] drm/rockchip: cdn-dp: Fix error handling Message-Id: <58AA4908.2000808@rock-chips.com> List-Id: References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> In-Reply-To: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> 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, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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. > } > > 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: 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 09:40:24 +0800 Message-ID: <58AA4908.2000808@rock-chips.com> References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> 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, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxN+W5tDAy5pyIMjDml6UgMDA6NTksIENocmlzdG9waGUgSkFJTExFVCB3cm90ZToKPiBJ dCBpcyBsaWtlbHkgdGhhdCBib3RoICdjbGtfZGlzYWJsZV91bnByZXBhcmUoKScgc2hvdWxkIGJl IGNhbGxlZCBpZgo+ICdwbV9ydW50aW1lX2dldF9zeW5jKCknIGZhaWxzLgo+Cj4gQWRkIGEgbmV3 IGxhYmVsIGZvciB0aGF0LCBiZWNhdXNlICdlcnJfc2V0X3JhdGUnIGlzIG5vdCBtZWFuaW5nZnVs IGluIHRoaXMKPiBjYXNlLgo+Cj4KPiBGaXhlczogMWEwZjdlZDNhYmUyICgiZHJtL3JvY2tjaGlw OiBjZG4tZHA6IGFkZCBjZG4gRFAgc3VwcG9ydCBmb3IgcmszMzk5IikKPgo+IFNpZ25lZC1vZmYt Ynk6IENocmlzdG9waGUgSkFJTExFVCA8Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI+Cj4g LS0tCj4gTm90IHN1cmUgYnV0IGEgJ3BtX3J1bnRpbWVfZ2V0X3N5bmMoKScgaXMgbWF5YmUgYWxz byByZXF1aXJlZCBpbiB0aGUKPiAnZXJyX3NldF9yYXRlJyBwYXRoLgo+IC0tLQo+ICAgZHJpdmVy cy9ncHUvZHJtL3JvY2tjaGlwL2Nkbi1kcC1jb3JlLmMgfCAzICsrLQo+ICAgMSBmaWxlIGNoYW5n ZWQsIDIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL2Nkbi1kcC1jb3JlLmMKPiBpbmRleCA5YWI2N2E2NzA4ODUuLjBmZTFlYzhiOGZiMSAxMDA2 NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvY2RuLWRwLWNvcmUuYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jCj4gQEAgLTExMSw3ICsxMTEs NyBAQCBzdGF0aWMgaW50IGNkbl9kcF9jbGtfZW5hYmxlKHN0cnVjdCBjZG5fZHBfZGV2aWNlICpk cCkKPiAgIAlyZXQgPSBwbV9ydW50aW1lX2dldF9zeW5jKGRwLT5kZXYpOwo+ICAgCWlmIChyZXQg PCAwKSB7Cj4gICAJCURSTV9ERVZfRVJST1IoZHAtPmRldiwgImNhbm5vdCBnZXQgcG0gcnVudGlt ZSAlZFxuIiwgcmV0KTsKPiAtCQlnb3RvIGVycl9wY2xrOwo+ICsJCWdvdG8gZXJyX3N5bmM7CgpJ IHRoaW5rIHRoZSBuYW1lIGVycl9wbV9ydW50aW1lX2dldCBpcyBiZXR0ZXIuCmVycl9zeW5jIGlz IG5vdCBhIGNsZWFyIG5hbWUgZm9yIHRoZSBwbV9ydW50aW1lX2dldF9zeW5jLgoKPiAgIAl9Cj4g ICAKPiAgIAlyZXNldF9jb250cm9sX2Fzc2VydChkcC0+Y29yZV9yc3QpOwo+IEBAIC0xMzMsNiAr MTMzLDcgQEAgc3RhdGljIGludCBjZG5fZHBfY2xrX2VuYWJsZShzdHJ1Y3QgY2RuX2RwX2Rldmlj ZSAqZHApCj4gICAJcmV0dXJuIDA7Cj4gICAKPiAgIGVycl9zZXRfcmF0ZToKPiArZXJyX3N5bmM6 CgptaXNzIHBtX3J1bnRpbWVfcHV0LCBpdCBzaG91bGQgYmU6CgplcnJfc2V0X3JhdGU6CiAgICAg cG1fcnVudGltZV9wdXQoZHAtPmRldik7CmVycl9wbV9ydW50aW1lX2dldDoKICAgICBjbGtfZGlz YWJsZV91bnByZXBhcmUoZHAtPmNvcmVfY2xrKTsKZXJyX2NvcmVfY2xrOgoKPiAgIAljbGtfZGlz YWJsZV91bnByZXBhcmUoZHAtPmNvcmVfY2xrKTsKPiAgIGVycl9jb3JlX2NsazoKPiAgIAljbGtf ZGlzYWJsZV91bnByZXBhcmUoZHAtPnBjbGspOwoKCi0tIArvvK1hcmsgWWFvCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Mon, 20 Feb 2017 09:40:24 +0800 Subject: [PATCH] drm/rockchip: cdn-dp: Fix error handling In-Reply-To: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> Message-ID: <58AA4908.2000808@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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. > } > > 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: 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 S1752023AbdBTBkg (ORCPT ); Sun, 19 Feb 2017 20:40:36 -0500 Received: from regular1.263xmail.com ([211.150.99.139]:43338 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042AbdBTBkf (ORCPT ); Sun, 19 Feb 2017 20:40:35 -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: kernel-janitors@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <7ec1c10d4a1b1785ff4f46f06cd15c34> 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> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org From: Mark yao Message-ID: <58AA4908.2000808@rock-chips.com> Date: Mon, 20 Feb 2017 09:40:24 +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: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> 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日 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. > } > > 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: 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