From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452AbdBWQ4H (ORCPT ); Thu, 23 Feb 2017 11:56:07 -0500 Received: from mail-qk0-f175.google.com ([209.85.220.175]:36069 "EHLO mail-qk0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751191AbdBWQ4G (ORCPT ); Thu, 23 Feb 2017 11:56:06 -0500 Date: Thu, 23 Feb 2017 11:48:12 -0500 From: Sean Paul To: Christophe JAILLET Cc: mark.yao@rock-chips.com, airlied@linux.ie, heiko@sntech.de, 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 Subject: Re: [PATCH v2] drm/rockchip: cdn-dp: Fix error handling Message-ID: <20170223164812.GB24066@art_vandelay> References: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 20, 2017 at 08:08:15AM +0100, 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. > > Add a missing call to 'pm_runtime_put()'. > > Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") > Applied to drm-misc-next-fixes Thanks, Sean > Signed-off-by: Christophe JAILLET > --- > V2: rename label > add missing call to 'pm_runtime_put_sync()' in error 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_pm_runtime_get; > } > > reset_control_assert(dp->core_rst); > @@ -133,6 +133,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp) > return 0; > > 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->pclk); > -- > 2.9.3 -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Date: Thu, 23 Feb 2017 16:48:12 +0000 Subject: Re: [PATCH v2] drm/rockchip: cdn-dp: Fix error handling Message-Id: <20170223164812.GB24066@art_vandelay> List-Id: References: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> In-Reply-To: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christophe JAILLET Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org On Mon, Feb 20, 2017 at 08:08:15AM +0100, 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. > > Add a missing call to 'pm_runtime_put()'. > > Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") > Applied to drm-misc-next-fixes Thanks, Sean > Signed-off-by: Christophe JAILLET > --- > V2: rename label > add missing call to 'pm_runtime_put_sync()' in error 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_pm_runtime_get; > } > > reset_control_assert(dp->core_rst); > @@ -133,6 +133,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp) > return 0; > > 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->pclk); > -- > 2.9.3 -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v2] drm/rockchip: cdn-dp: Fix error handling Date: Thu, 23 Feb 2017 11:48:12 -0500 Message-ID: <20170223164812.GB24066@art_vandelay> References: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170220070815.23096-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 Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gTW9uLCBGZWIgMjAsIDIwMTcgYXQgMDg6MDg6MTVBTSArMDEwMCwgQ2hyaXN0b3BoZSBKQUlM TEVUIHdyb3RlOgo+IEl0IGlzIGxpa2VseSB0aGF0IGJvdGggJ2Nsa19kaXNhYmxlX3VucHJlcGFy ZSgpJyBzaG91bGQgYmUgY2FsbGVkIGlmCj4gJ3BtX3J1bnRpbWVfZ2V0X3N5bmMoKScgZmFpbHMu Cj4gCj4gQWRkIGEgbmV3IGxhYmVsIGZvciB0aGF0LCBiZWNhdXNlICdlcnJfc2V0X3JhdGUnIGlz IG5vdCBtZWFuaW5nZnVsIGluIHRoaXMKPiBjYXNlLgo+IAo+IEFkZCBhIG1pc3NpbmcgY2FsbCB0 byAncG1fcnVudGltZV9wdXQoKScuCj4gCj4gRml4ZXM6IDFhMGY3ZWQzYWJlMiAoImRybS9yb2Nr Y2hpcDogY2RuLWRwOiBhZGQgY2RuIERQIHN1cHBvcnQgZm9yIHJrMzM5OSIpCj4gCgpBcHBsaWVk IHRvIGRybS1taXNjLW5leHQtZml4ZXMKClRoYW5rcywKClNlYW4KCj4gU2lnbmVkLW9mZi1ieTog Q2hyaXN0b3BoZSBKQUlMTEVUIDxjaHJpc3RvcGhlLmphaWxsZXRAd2FuYWRvby5mcj4KPiAtLS0K PiBWMjogcmVuYW1lIGxhYmVsCj4gICAgIGFkZCBtaXNzaW5nIGNhbGwgdG8gJ3BtX3J1bnRpbWVf cHV0X3N5bmMoKScgaW4gZXJyb3IgcGF0aAo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvY2RuLWRwLWNvcmUuYyB8IDMgKystCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL2Nkbi1kcC1jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvY2RuLWRwLWNvcmUu Ywo+IGluZGV4IDlhYjY3YTY3MDg4NS4uMGZlMWVjOGI4ZmIxIDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L3JvY2tjaGlwL2Nkbi1kcC1jb3JlLmMKPiBAQCAtMTExLDcgKzExMSw3IEBAIHN0YXRpYyBpbnQg Y2RuX2RwX2Nsa19lbmFibGUoc3RydWN0IGNkbl9kcF9kZXZpY2UgKmRwKQo+ICAJcmV0ID0gcG1f cnVudGltZV9nZXRfc3luYyhkcC0+ZGV2KTsKPiAgCWlmIChyZXQgPCAwKSB7Cj4gIAkJRFJNX0RF Vl9FUlJPUihkcC0+ZGV2LCAiY2Fubm90IGdldCBwbSBydW50aW1lICVkXG4iLCByZXQpOwo+IC0J CWdvdG8gZXJyX3BjbGs7Cj4gKwkJZ290byBlcnJfcG1fcnVudGltZV9nZXQ7Cj4gIAl9Cj4gIAo+ ICAJcmVzZXRfY29udHJvbF9hc3NlcnQoZHAtPmNvcmVfcnN0KTsKPiBAQCAtMTMzLDYgKzEzMyw4 IEBAIHN0YXRpYyBpbnQgY2RuX2RwX2Nsa19lbmFibGUoc3RydWN0IGNkbl9kcF9kZXZpY2UgKmRw KQo+ICAJcmV0dXJuIDA7Cj4gIAo+ICBlcnJfc2V0X3JhdGU6Cj4gKwlwbV9ydW50aW1lX3B1dChk cC0+ZGV2KTsKPiArZXJyX3BtX3J1bnRpbWVfZ2V0Ogo+ICAJY2xrX2Rpc2FibGVfdW5wcmVwYXJl KGRwLT5jb3JlX2Nsayk7Cj4gIGVycl9jb3JlX2NsazoKPiAgCWNsa19kaXNhYmxlX3VucHJlcGFy ZShkcC0+cGNsayk7Cj4gLS0gCj4gMi45LjMKCi0tIApTZWFuIFBhdWwsIFNvZnR3YXJlIEVuZ2lu ZWVyLCBHb29nbGUgLyBDaHJvbWl1bSBPUwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: seanpaul@chromium.org (Sean Paul) Date: Thu, 23 Feb 2017 11:48:12 -0500 Subject: [PATCH v2] drm/rockchip: cdn-dp: Fix error handling In-Reply-To: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> References: <20170220070815.23096-1-christophe.jaillet@wanadoo.fr> Message-ID: <20170223164812.GB24066@art_vandelay> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Feb 20, 2017 at 08:08:15AM +0100, 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. > > Add a missing call to 'pm_runtime_put()'. > > Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") > Applied to drm-misc-next-fixes Thanks, Sean > Signed-off-by: Christophe JAILLET > --- > V2: rename label > add missing call to 'pm_runtime_put_sync()' in error 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_pm_runtime_get; > } > > reset_control_assert(dp->core_rst); > @@ -133,6 +133,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp) > return 0; > > 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->pclk); > -- > 2.9.3 -- Sean Paul, Software Engineer, Google / Chromium OS