From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: Re: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded Date: Fri, 10 Feb 2017 17:27:47 +0000 Message-ID: <20170210172747.5f0afb0a.john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> <20170131192117.GE20076@art_vandelay> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170131192117.GE20076@art_vandelay> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul 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 T24gVHVlLCAzMSBKYW4gMjAxNyAxNDoyMToxNyAtMDUwMCwgU2VhbiBQYXVsIHdyb3RlOgoKPiBP biBTdW4sIEphbiAyOSwgMjAxNyBhdCAwMToyNDo0MVBNICswMDAwLCBKb2huIEtlZXBpbmcgd3Jv dGU6Cj4gPiBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgb3V0cHV0IHJlc29sdXRpb24gaXMga25vd24g YmVmb3JlIGZiY29uIGxvYWRzLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBKb2huIEtlZXBpbmcg PGpvaG5AbWV0YW5hdGUuY29tPgo+ID4gLS0tCj4gPiBVbmNoYW5nZWQgaW4gdjMKPiA+IFVuY2hh bmdlZCBpbiB2Mgo+ID4gCj4gPiAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNp LmMgfCAxMSArKysrKysrKystLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvZHctbWlwaS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRz aS5jCj4gPiBpbmRleCBmNWIxNTM3N2VmODUuLjViYWQ5MmUyMzcwZSAxMDA2NDQKPiA+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCj4gPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+ID4gQEAgLTExNzYsMTAgKzExNzYsMTcg QEAgc3RhdGljIGludCBkd19taXBpX2RzaV9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0 IGRldmljZSAqbWFzdGVyLAo+ID4gIAo+ID4gIAlkc2ktPmRzaV9ob3N0Lm9wcyA9ICZkd19taXBp X2RzaV9ob3N0X29wczsKPiA+ICAJZHNpLT5kc2lfaG9zdC5kZXYgPSBkZXY7Cj4gPiAtCXJldHVy biBtaXBpX2RzaV9ob3N0X3JlZ2lzdGVyKCZkc2ktPmRzaV9ob3N0KTsKPiA+ICsJcmV0ID0gbWlw aV9kc2lfaG9zdF9yZWdpc3RlcigmZHNpLT5kc2lfaG9zdCk7Cj4gPiArCWlmICghcmV0ICYmICFk c2ktPnBhbmVsKSB7Cj4gPiArCQltaXBpX2RzaV9ob3N0X3VucmVnaXN0ZXIoJmRzaS0+ZHNpX2hv c3QpOwo+ID4gKwkJZHJtX2VuY29kZXJfY2xlYW51cCgmZHNpLT5lbmNvZGVyKTsKPiA+ICsJCWRy bV9jb25uZWN0b3JfY2xlYW51cCgmZHNpLT5jb25uZWN0b3IpOyAgCj4gCj4gTW92ZSB0aGUgaG9z dCByZWdpc3RyYXRpb24gdXAgYmVmb3JlIGR3X21pcGlfZHNpX3JlZ2lzdGVyKCkgdG8gYXZvaWQK PiBoYXZpbmcgdG8gY2xlYW4gdXAgdGhlIGVuY29kZXIgYW5kIGNvbm5lY3Rvcj8KCk5vLCBtaXBp X2RzaV9ob3N0X3JlZ2lzdGVyKCkgaGFzIHRvIGJlIGNhbGxlZCBhZnRlciB0aGUgY29ubmVjdG9y IGlzCnJlZ2lzdGVyZWQgYmVjYXVzZSBpdCBpcyBsaWtlbHkgdG8gcmVzdWx0IGluIGEgY2FsbCB0 bwpkd19taXBpX2RzaV9ob3N0X2F0dGFjaCgpIHdoaWNoIGF0dGFjaGVzIGEgcGFuZWwgdG8gdGhl IGNvbm5lY3Rvci4KCj4gPiArCQlyZXQgPSAtRVBST0JFX0RFRkVSOwo+ID4gKwl9Cj4gPiAgCj4g PiAgZXJyX3BsbHJlZjoKPiA+IC0JY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGRzaS0+cGxscmVmX2Ns ayk7Cj4gPiArCWlmIChyZXQpICAKPiAKPiBJIHBlcnNvbmFsbHkgdGhpbmsgaXQncyBjbGVhbmVy IHRvIGV4cGxpY2l0bHkgZ290byBpbiB0aGUgZXJyb3IgY29uZGl0aW9uYWwgKG9yCj4gaW4gdGhp cyBjYXNlLCB0aGUgZGVmZXIgY29uZGl0aW9uYWwpIGFuZCBoYXZlIGEgcmV0dXJuIDA7IHJpZ2h0 IGJlZm9yZSB0aGUgZXJyXyoKPiBsYWJlbHMuIFRoZW4geW91IGRvbid0IG5lZWQgdG8gd29ycnkg YWJvdXQgYSkgY2hlY2tpbmcgcmV0IGluIGFsbCBvZiB5b3VyCj4gY2xlYW51cHMgYW5kIGIpIHNv bWVvbmUgYWRkaW5nIGNvZGUgYWJvdmUgdGhlIGxhYmVscyB0aGF0IHlvdSBkb24ndCBpbnRlbmQg dG8KPiBydW4uCgpBZ3JlZWQuICBJJ2xsIGNoYW5nZSB0aGlzIHRvIHVzZSBhIGdvdG8gaWYgd2Ug aGl0IHRoZSBFUFJPQkVfREVGRVIgY2FzZQphbmQga2VlcCBhbGwgdGhlIGNsZWFudXAgdG9nZXRo ZXIuCgo+ID4gKwkJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGRzaS0+cGxscmVmX2Nsayk7Cj4gPiAg CXJldHVybiByZXQ7Cj4gPiAgfQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: john@metanate.com (John Keeping) Date: Fri, 10 Feb 2017 17:27:47 +0000 Subject: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded In-Reply-To: <20170131192117.GE20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> <20170131192117.GE20076@art_vandelay> Message-ID: <20170210172747.5f0afb0a.john@metanate.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 31 Jan 2017 14:21:17 -0500, Sean Paul wrote: > 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? No, mipi_dsi_host_register() has to be called after the connector is registered because it is likely to result in a call to dw_mipi_dsi_host_attach() which attaches a panel to the 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. Agreed. I'll change this to use a goto if we hit the EPROBE_DEFER case and keep all the cleanup together. > > + clk_disable_unprepare(dsi->pllref_clk); > > return ret; > > } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753394AbdBJS1I (ORCPT ); Fri, 10 Feb 2017 13:27:08 -0500 Received: from dougal.metanate.com ([90.155.101.14]:46310 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752529AbdBJS1E (ORCPT ); Fri, 10 Feb 2017 13:27:04 -0500 Date: Fri, 10 Feb 2017 17:27:47 +0000 From: John Keeping To: Sean Paul 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: <20170210172747.5f0afb0a.john@metanate.com> In-Reply-To: <20170131192117.GE20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> <20170131192117.GE20076@art_vandelay> Organization: Metanate Ltd X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 31 Jan 2017 14:21:17 -0500, Sean Paul wrote: > 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? No, mipi_dsi_host_register() has to be called after the connector is registered because it is likely to result in a call to dw_mipi_dsi_host_attach() which attaches a panel to the 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. Agreed. I'll change this to use a goto if we hit the EPROBE_DEFER case and keep all the cleanup together. > > + clk_disable_unprepare(dsi->pllref_clk); > > return ret; > > }