From mboxrd@z Thu Jan 1 00:00:00 1970 From: noralf@tronnes.org (=?UTF-8?Q?Noralf_Tr=c3=b8nnes?=) Date: Mon, 12 Feb 2018 15:01:57 +0100 Subject: [PATCH] drm/pl111: Fix regression from fbdev CMA helper In-Reply-To: <0a3e5888-e8fc-df25-377c-5259c767aeed@tronnes.org> References: <20180212124019.25268-1-linus.walleij@linaro.org> <0a3e5888-e8fc-df25-377c-5259c767aeed@tronnes.org> Message-ID: <139b8daa-26c9-1aff-60f0-26c8749eede6@tronnes.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Den 12.02.2018 14.42, skrev Noralf Tr?nnes: > > Den 12.02.2018 13.40, skrev Linus Walleij: >> Commit d18df744de1a ("drm/pl111: Use drm_fb_cma_fbdev_init/fini()") >> refactored the driver to use fbdev handling in the core, but >> mistakedly limited the number of maximum connections to 0. >> >> Predictably, zero possible connections also gives zero >> framebuffers when using the system. So let's bump it to 1 so >> we get our framebuffer back. >> >> Cc: Noralf Tr?nnes >> Cc: Eric Anholt >> Fixes: d18df744de1a ("drm/pl111: Use drm_fb_cma_fbdev_init/fini()") >> Signed-off-by: Linus Walleij >> --- >> ? drivers/gpu/drm/pl111/pl111_drv.c | 2 +- >> ? 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/pl111/pl111_drv.c >> b/drivers/gpu/drm/pl111/pl111_drv.c >> index acb738c69873..306ac7cabd90 100644 >> --- a/drivers/gpu/drm/pl111/pl111_drv.c >> +++ b/drivers/gpu/drm/pl111/pl111_drv.c >> @@ -138,7 +138,7 @@ static int pl111_modeset_init(struct drm_device >> *dev) >> ? ????? drm_mode_config_reset(dev); >> ? -??? drm_fb_cma_fbdev_init(dev, 32, 0); >> +??? drm_fb_cma_fbdev_init(dev, 32, 1); >> ? ????? drm_kms_helper_poll_init(dev); > > Sorry about that. > > I don't know how bridges work, but since it doesn't work this means that > there's no connector available at this point? > > This is the arg docs: > > ?* @max_conn_count: Maximum number of connectors. > ?*????????????????? @dev->mode_config.num_connector is used if this is > zero. > > Anyways: > Acked-by: Noralf Tr?nnes > I forgot to look at the change, and I don't understand how this broke anything, drm/pl111: Use drm_fb_cma_fbdev_init/fini(): @@ -137,8 +138,7 @@ static int pl111_modeset_init(struct drm_device *dev) ???? drm_mode_config_reset(dev); -??? priv->fbdev = drm_fbdev_cma_init(dev, 32, -??? ??? ??? ??? ??? ?dev->mode_config.num_connector); +??? drm_fb_cma_fbdev_init(dev, 32, 0); ???? drm_kms_helper_poll_init(dev); New max_conn_count setting: int drm_fb_cma_fbdev_init(struct drm_device *dev, unsigned int preferred_bpp, ??? ??? ??? ? unsigned int max_conn_count) { ??? return drm_fb_cma_fbdev_init_with_funcs(dev, preferred_bpp, ??? ??? ??? ??? ??? ??? max_conn_count, NULL); } int drm_fb_cma_fbdev_init_with_funcs(struct drm_device *dev, ??? unsigned int preferred_bpp, unsigned int max_conn_count, ??? const struct drm_framebuffer_funcs *funcs) { ... ??? if (!max_conn_count) ??? ??? max_conn_count = dev->mode_config.num_connector; Noralf. From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= Subject: Re: [PATCH] drm/pl111: Fix regression from fbdev CMA helper Date: Mon, 12 Feb 2018 15:01:57 +0100 Message-ID: <139b8daa-26c9-1aff-60f0-26c8749eede6@tronnes.org> References: <20180212124019.25268-1-linus.walleij@linaro.org> <0a3e5888-e8fc-df25-377c-5259c767aeed@tronnes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.domeneshop.no (smtp.domeneshop.no [IPv6:2a01:5b40:0:3005::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 266B28989E for ; Mon, 12 Feb 2018 14:02:07 +0000 (UTC) In-Reply-To: <0a3e5888-e8fc-df25-377c-5259c767aeed@tronnes.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Linus Walleij , Daniel Vetter , Jani Nikula , Sean Paul , Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org CkRlbiAxMi4wMi4yMDE4IDE0LjQyLCBza3JldiBOb3JhbGYgVHLDuG5uZXM6Cj4KPiBEZW4gMTIu MDIuMjAxOCAxMy40MCwgc2tyZXYgTGludXMgV2FsbGVpajoKPj4gQ29tbWl0IGQxOGRmNzQ0ZGUx YSAoImRybS9wbDExMTogVXNlIGRybV9mYl9jbWFfZmJkZXZfaW5pdC9maW5pKCkiKQo+PiByZWZh Y3RvcmVkIHRoZSBkcml2ZXIgdG8gdXNlIGZiZGV2IGhhbmRsaW5nIGluIHRoZSBjb3JlLCBidXQK Pj4gbWlzdGFrZWRseSBsaW1pdGVkIHRoZSBudW1iZXIgb2YgbWF4aW11bSBjb25uZWN0aW9ucyB0 byAwLgo+Pgo+PiBQcmVkaWN0YWJseSwgemVybyBwb3NzaWJsZSBjb25uZWN0aW9ucyBhbHNvIGdp dmVzIHplcm8KPj4gZnJhbWVidWZmZXJzIHdoZW4gdXNpbmcgdGhlIHN5c3RlbS4gU28gbGV0J3Mg YnVtcCBpdCB0byAxIHNvCj4+IHdlIGdldCBvdXIgZnJhbWVidWZmZXIgYmFjay4KPj4KPj4gQ2M6 IE5vcmFsZiBUcsO4bm5lcyA8bm9yYWxmQHRyb25uZXMub3JnPgo+PiBDYzogRXJpYyBBbmhvbHQg PGVyaWNAYW5ob2x0Lm5ldD4KPj4gRml4ZXM6IGQxOGRmNzQ0ZGUxYSAoImRybS9wbDExMTogVXNl IGRybV9mYl9jbWFfZmJkZXZfaW5pdC9maW5pKCkiKQo+PiBTaWduZWQtb2ZmLWJ5OiBMaW51cyBX YWxsZWlqIDxsaW51cy53YWxsZWlqQGxpbmFyby5vcmc+Cj4+IC0tLQo+PiDCoCBkcml2ZXJzL2dw dS9kcm0vcGwxMTEvcGwxMTFfZHJ2LmMgfCAyICstCj4+IMKgIDEgZmlsZSBjaGFuZ2VkLCAxIGlu c2VydGlvbigrKSwgMSBkZWxldGlvbigtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL3BsMTExL3BsMTExX2Rydi5jIAo+PiBiL2RyaXZlcnMvZ3B1L2RybS9wbDExMS9wbDExMV9k cnYuYwo+PiBpbmRleCBhY2I3MzhjNjk4NzMuLjMwNmFjN2NhYmQ5MCAxMDA2NDQKPj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL3BsMTExL3BsMTExX2Rydi5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9wbDExMS9wbDExMV9kcnYuYwo+PiBAQCAtMTM4LDcgKzEzOCw3IEBAIHN0YXRpYyBpbnQgcGwx MTFfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlIAo+PiAqZGV2KQo+PiDCoCDCoMKgwqDC oMKgIGRybV9tb2RlX2NvbmZpZ19yZXNldChkZXYpOwo+PiDCoCAtwqDCoMKgIGRybV9mYl9jbWFf ZmJkZXZfaW5pdChkZXYsIDMyLCAwKTsKPj4gK8KgwqDCoCBkcm1fZmJfY21hX2ZiZGV2X2luaXQo ZGV2LCAzMiwgMSk7Cj4+IMKgIMKgwqDCoMKgwqAgZHJtX2ttc19oZWxwZXJfcG9sbF9pbml0KGRl dik7Cj4KPiBTb3JyeSBhYm91dCB0aGF0Lgo+Cj4gSSBkb24ndCBrbm93IGhvdyBicmlkZ2VzIHdv cmssIGJ1dCBzaW5jZSBpdCBkb2Vzbid0IHdvcmsgdGhpcyBtZWFucyB0aGF0Cj4gdGhlcmUncyBu byBjb25uZWN0b3IgYXZhaWxhYmxlIGF0IHRoaXMgcG9pbnQ/Cj4KPiBUaGlzIGlzIHRoZSBhcmcg ZG9jczoKPgo+IMKgKiBAbWF4X2Nvbm5fY291bnQ6IE1heGltdW0gbnVtYmVyIG9mIGNvbm5lY3Rv cnMuCj4gwqAqwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBAZGV2LT5tb2RlX2Nv bmZpZy5udW1fY29ubmVjdG9yIGlzIHVzZWQgaWYgdGhpcyBpcyAKPiB6ZXJvLgo+Cj4gQW55d2F5 czoKPiBBY2tlZC1ieTogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZAdHJvbm5lcy5vcmc+Cj4KCkkg Zm9yZ290IHRvIGxvb2sgYXQgdGhlIGNoYW5nZSwgYW5kIEkgZG9uJ3QgdW5kZXJzdGFuZCBob3cg dGhpcyBicm9rZSAKYW55dGhpbmcsCgpkcm0vcGwxMTE6IFVzZSBkcm1fZmJfY21hX2ZiZGV2X2lu aXQvZmluaSgpOgoKQEAgLTEzNyw4ICsxMzgsNyBAQCBzdGF0aWMgaW50IHBsMTExX21vZGVzZXRf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoKIMKgwqDCoMKgIGRybV9tb2RlX2NvbmZpZ19y ZXNldChkZXYpOwoKLcKgwqDCoCBwcml2LT5mYmRldiA9IGRybV9mYmRldl9jbWFfaW5pdChkZXYs IDMyLAotwqDCoMKgIMKgwqDCoCDCoMKgwqAgwqDCoMKgIMKgwqDCoCDCoGRldi0+bW9kZV9jb25m aWcubnVtX2Nvbm5lY3Rvcik7CivCoMKgwqAgZHJtX2ZiX2NtYV9mYmRldl9pbml0KGRldiwgMzIs IDApOwoKIMKgwqDCoMKgIGRybV9rbXNfaGVscGVyX3BvbGxfaW5pdChkZXYpOwoKTmV3IG1heF9j b25uX2NvdW50IHNldHRpbmc6CgppbnQgZHJtX2ZiX2NtYV9mYmRldl9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCAKcHJlZmVycmVkX2JwcCwKIMKgwqDCoCDCoMKgwqAg wqDCoMKgIMKgIHVuc2lnbmVkIGludCBtYXhfY29ubl9jb3VudCkKewogwqDCoMKgIHJldHVybiBk cm1fZmJfY21hX2ZiZGV2X2luaXRfd2l0aF9mdW5jcyhkZXYsIHByZWZlcnJlZF9icHAsCiDCoMKg wqAgwqDCoMKgIMKgwqDCoCDCoMKgwqAgwqDCoMKgIMKgwqDCoCBtYXhfY29ubl9jb3VudCwgTlVM TCk7Cn0KCmludCBkcm1fZmJfY21hX2ZiZGV2X2luaXRfd2l0aF9mdW5jcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogwqDCoMKgIHVuc2lnbmVkIGludCBwcmVmZXJyZWRfYnBwLCB1bnNpZ25lZCBp bnQgbWF4X2Nvbm5fY291bnQsCiDCoMKgwqAgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlcl9m dW5jcyAqZnVuY3MpCnsKLi4uCiDCoMKgwqAgaWYgKCFtYXhfY29ubl9jb3VudCkKIMKgwqDCoCDC oMKgwqAgbWF4X2Nvbm5fY291bnQgPSBkZXYtPm1vZGVfY29uZmlnLm51bV9jb25uZWN0b3I7CgpO b3JhbGYuCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK