From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded Date: Tue, 31 Jan 2017 14:21:17 -0500 Message-ID: <20170131192117.GE20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170129132444.25251-22-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gU3VuLCBKYW4gMjksIDIwMTcgYXQgMDE6MjQ6NDFQTSArMDAwMCwgSm9obiBLZWVwaW5nIHdy b3RlOgo+IFRoaXMgZW5zdXJlcyB0aGF0IHRoZSBvdXRwdXQgcmVzb2x1dGlvbiBpcyBrbm93biBi ZWZvcmUgZmJjb24gbG9hZHMuCj4gCj4gU2lnbmVkLW9mZi1ieTogSm9obiBLZWVwaW5nIDxqb2hu QG1ldGFuYXRlLmNvbT4KPiAtLS0KPiBVbmNoYW5nZWQgaW4gdjMKPiBVbmNoYW5nZWQgaW4gdjIK PiAKPiAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgfCAxMSArKysrKysr KystLQo+ICAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+ IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYyBi L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCj4gaW5kZXggZjViMTUzNzdl Zjg1Li41YmFkOTJlMjM3MGUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L2R3LW1pcGktZHNpLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1k c2kuYwo+IEBAIC0xMTc2LDEwICsxMTc2LDE3IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfYmlu ZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKPiAgCj4gIAlkc2kt PmRzaV9ob3N0Lm9wcyA9ICZkd19taXBpX2RzaV9ob3N0X29wczsKPiAgCWRzaS0+ZHNpX2hvc3Qu ZGV2ID0gZGV2Owo+IC0JcmV0dXJuIG1pcGlfZHNpX2hvc3RfcmVnaXN0ZXIoJmRzaS0+ZHNpX2hv c3QpOwo+ICsJcmV0ID0gbWlwaV9kc2lfaG9zdF9yZWdpc3RlcigmZHNpLT5kc2lfaG9zdCk7Cj4g KwlpZiAoIXJldCAmJiAhZHNpLT5wYW5lbCkgewo+ICsJCW1pcGlfZHNpX2hvc3RfdW5yZWdpc3Rl cigmZHNpLT5kc2lfaG9zdCk7Cj4gKwkJZHJtX2VuY29kZXJfY2xlYW51cCgmZHNpLT5lbmNvZGVy KTsKPiArCQlkcm1fY29ubmVjdG9yX2NsZWFudXAoJmRzaS0+Y29ubmVjdG9yKTsKCk1vdmUgdGhl IGhvc3QgcmVnaXN0cmF0aW9uIHVwIGJlZm9yZSBkd19taXBpX2RzaV9yZWdpc3RlcigpIHRvIGF2 b2lkCmhhdmluZyB0byBjbGVhbiB1cCB0aGUgZW5jb2RlciBhbmQgY29ubmVjdG9yPwoKPiArCQly ZXQgPSAtRVBST0JFX0RFRkVSOwo+ICsJfQo+ICAKPiAgZXJyX3BsbHJlZjoKPiAtCWNsa19kaXNh YmxlX3VucHJlcGFyZShkc2ktPnBsbHJlZl9jbGspOwo+ICsJaWYgKHJldCkKCkkgcGVyc29uYWxs eSB0aGluayBpdCdzIGNsZWFuZXIgdG8gZXhwbGljaXRseSBnb3RvIGluIHRoZSBlcnJvciBjb25k aXRpb25hbCAob3IKaW4gdGhpcyBjYXNlLCB0aGUgZGVmZXIgY29uZGl0aW9uYWwpIGFuZCBoYXZl IGEgcmV0dXJuIDA7IHJpZ2h0IGJlZm9yZSB0aGUgZXJyXyoKbGFiZWxzLiBUaGVuIHlvdSBkb24n dCBuZWVkIHRvIHdvcnJ5IGFib3V0IGEpIGNoZWNraW5nIHJldCBpbiBhbGwgb2YgeW91cgpjbGVh bnVwcyBhbmQgYikgc29tZW9uZSBhZGRpbmcgY29kZSBhYm92ZSB0aGUgbGFiZWxzIHRoYXQgeW91 IGRvbid0IGludGVuZCB0bwpydW4uCgpTZWFuCgo+ICsJCWNsa19kaXNhYmxlX3VucHJlcGFyZShk c2ktPnBsbHJlZl9jbGspOwo+ICAJcmV0dXJuIHJldDsKPiAgfQo+ICAKPiAtLSAKPiAyLjExLjAu MTk3LmdiNTU2ZGU1LmRpcnR5Cj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCgotLSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwgR29v Z2xlIC8gQ2hyb21pdW0gT1MKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: seanpaul@chromium.org (Sean Paul) Date: Tue, 31 Jan 2017 14:21:17 -0500 Subject: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded In-Reply-To: <20170129132444.25251-22-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> Message-ID: <20170131192117.GE20076@art_vandelay> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Jan 29, 2017 at 01:24:41PM +0000, John Keeping wrote: > This ensures that the output resolution is known before fbcon loads. > > Signed-off-by: John Keeping > --- > Unchanged in v3 > Unchanged in v2 > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index f5b15377ef85..5bad92e2370e 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > > dsi->dsi_host.ops = &dw_mipi_dsi_host_ops; > dsi->dsi_host.dev = dev; > - return mipi_dsi_host_register(&dsi->dsi_host); > + ret = mipi_dsi_host_register(&dsi->dsi_host); > + if (!ret && !dsi->panel) { > + mipi_dsi_host_unregister(&dsi->dsi_host); > + drm_encoder_cleanup(&dsi->encoder); > + drm_connector_cleanup(&dsi->connector); Move the host registration up before dw_mipi_dsi_register() to avoid having to clean up the encoder and connector? > + ret = -EPROBE_DEFER; > + } > > err_pllref: > - clk_disable_unprepare(dsi->pllref_clk); > + if (ret) I personally think it's cleaner to explicitly goto in the error conditional (or in this case, the defer conditional) and have a return 0; right before the err_* labels. Then you don't need to worry about a) checking ret in all of your cleanups and b) someone adding code above the labels that you don't intend to run. Sean > + clk_disable_unprepare(dsi->pllref_clk); > return ret; > } > > -- > 2.11.0.197.gb556de5.dirty > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbdAaT3F (ORCPT ); Tue, 31 Jan 2017 14:29:05 -0500 Received: from mail-yb0-f173.google.com ([209.85.213.173]:36819 "EHLO mail-yb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbdAaT26 (ORCPT ); Tue, 31 Jan 2017 14:28:58 -0500 Date: Tue, 31 Jan 2017 14:21:17 -0500 From: Sean Paul To: John Keeping Cc: Mark Yao , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded Message-ID: <20170131192117.GE20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170129132444.25251-22-john@metanate.com> 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 Sun, Jan 29, 2017 at 01:24:41PM +0000, John Keeping wrote: > This ensures that the output resolution is known before fbcon loads. > > Signed-off-by: John Keeping > --- > Unchanged in v3 > Unchanged in v2 > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index f5b15377ef85..5bad92e2370e 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > > dsi->dsi_host.ops = &dw_mipi_dsi_host_ops; > dsi->dsi_host.dev = dev; > - return mipi_dsi_host_register(&dsi->dsi_host); > + ret = mipi_dsi_host_register(&dsi->dsi_host); > + if (!ret && !dsi->panel) { > + mipi_dsi_host_unregister(&dsi->dsi_host); > + drm_encoder_cleanup(&dsi->encoder); > + drm_connector_cleanup(&dsi->connector); Move the host registration up before dw_mipi_dsi_register() to avoid having to clean up the encoder and connector? > + ret = -EPROBE_DEFER; > + } > > err_pllref: > - clk_disable_unprepare(dsi->pllref_clk); > + if (ret) I personally think it's cleaner to explicitly goto in the error conditional (or in this case, the defer conditional) and have a return 0; right before the err_* labels. Then you don't need to worry about a) checking ret in all of your cleanups and b) someone adding code above the labels that you don't intend to run. Sean > + clk_disable_unprepare(dsi->pllref_clk); > return ret; > } > > -- > 2.11.0.197.gb556de5.dirty > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS