From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751506AbdHDI7A (ORCPT ); Fri, 4 Aug 2017 04:59:00 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33403 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbdHDI65 (ORCPT ); Fri, 4 Aug 2017 04:58:57 -0400 Date: Fri, 4 Aug 2017 10:58:53 +0200 From: Daniel Vetter To: David Lechner Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Vetter Subject: Re: [PATCH v3 2/2] drm/fb-helper: pass physical dimensions to fbdev Message-ID: <20170804085853.wwdzv54z4dqslpem@phenom.ffwll.local> Mail-Followup-To: David Lechner , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Vetter References: <1501777149-8310-1-git-send-email-david@lechnology.com> <1501777149-8310-3-git-send-email-david@lechnology.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1501777149-8310-3-git-send-email-david@lechnology.com> X-Operating-System: Linux phenom 4.11.0-2-amd64 User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 03, 2017 at 11:19:09AM -0500, David Lechner wrote: > The fbdev subsystem has a place for physical dimensions (width and height > in mm) that is readable by userspace. Since DRM also knows these > dimensions, pass this information to the fbdev device. > > This has to be done in drm_setup_crtcs_fb() instead of drm_setup_crtcs() > because fb_helper->fbdev may be NULL in drm_setup_crtcs(). > > Signed-off-by: David Lechner > --- > drivers/gpu/drm/drm_fb_helper.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 24a721a..a98bf86 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -1882,8 +1882,6 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe > info->var.xoffset = 0; > info->var.yoffset = 0; > info->var.activate = FB_ACTIVATE_NOW; > - info->var.height = -1; > - info->var.width = -1; > > switch (fb->format->depth) { > case 8: > @@ -2435,11 +2433,24 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper, > */ > static void drm_setup_crtcs_fb(struct drm_fb_helper *fb_helper) > { > + struct fb_info *info = fb_helper->fbdev; > int i; > > for (i = 0; i < fb_helper->crtc_count; i++) > if (fb_helper->crtc_info[i].mode_set.num_connectors) > fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb; > + > + drm_fb_helper_for_each_connector(fb_helper, i) { > + struct drm_connector *connector = > + fb_helper->connector_info[i]->connector; > + > + /* use first connected connector for the physical dimensions */ > + if (connector->status == connector_status_connected) { > + info->var.height = connector->display_info.width_mm; > + info->var.width = connector->display_info.height_mm; > + break; > + } > + } Ok, small trapdoor I didn't highlight: Accessing the connector prope state (i.e. ->status and ->display_info) requires that you hold dev->mode_config.mutex. See how it's done in drm_setup_crtcs, just wrap it around this loop here. fbdev state itself is protected by fb_helper->lock, so that part is all good. I've applied patch 1 already, but can you pls respin that one with the locking fixed up? Thanks, Daniel > } > > /* Note: Drops fb_helper->lock before returning. */ > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v3 2/2] drm/fb-helper: pass physical dimensions to fbdev Date: Fri, 4 Aug 2017 10:58:53 +0200 Message-ID: <20170804085853.wwdzv54z4dqslpem@phenom.ffwll.local> References: <1501777149-8310-1-git-send-email-david@lechnology.com> <1501777149-8310-3-git-send-email-david@lechnology.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0C876E36A for ; Fri, 4 Aug 2017 08:58:57 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id x64so4964175wmg.1 for ; Fri, 04 Aug 2017 01:58:57 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1501777149-8310-3-git-send-email-david@lechnology.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Lechner Cc: Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBBdWcgMDMsIDIwMTcgYXQgMTE6MTk6MDlBTSAtMDUwMCwgRGF2aWQgTGVjaG5lciB3 cm90ZToKPiBUaGUgZmJkZXYgc3Vic3lzdGVtIGhhcyBhIHBsYWNlIGZvciBwaHlzaWNhbCBkaW1l bnNpb25zICh3aWR0aCBhbmQgaGVpZ2h0Cj4gaW4gbW0pIHRoYXQgaXMgcmVhZGFibGUgYnkgdXNl cnNwYWNlLiBTaW5jZSBEUk0gYWxzbyBrbm93cyB0aGVzZQo+IGRpbWVuc2lvbnMsIHBhc3MgdGhp cyBpbmZvcm1hdGlvbiB0byB0aGUgZmJkZXYgZGV2aWNlLgo+IAo+IFRoaXMgaGFzIHRvIGJlIGRv bmUgaW4gZHJtX3NldHVwX2NydGNzX2ZiKCkgaW5zdGVhZCBvZiBkcm1fc2V0dXBfY3J0Y3MoKQo+ IGJlY2F1c2UgZmJfaGVscGVyLT5mYmRldiBtYXkgYmUgTlVMTCBpbiBkcm1fc2V0dXBfY3J0Y3Mo KS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBEYXZpZCBMZWNobmVyIDxkYXZpZEBsZWNobm9sb2d5LmNv bT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyB8IDE1ICsrKysrKysr KysrKystLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyBiL2Ry aXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPiBpbmRleCAyNGE3MjFhLi5hOThiZjg2IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCj4gQEAgLTE4ODIsOCArMTg4Miw2IEBAIHZvaWQg ZHJtX2ZiX2hlbHBlcl9maWxsX3ZhcihzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgc3RydWN0IGRybV9m Yl9oZWxwZXIgKmZiX2hlbHBlCj4gIAlpbmZvLT52YXIueG9mZnNldCA9IDA7Cj4gIAlpbmZvLT52 YXIueW9mZnNldCA9IDA7Cj4gIAlpbmZvLT52YXIuYWN0aXZhdGUgPSBGQl9BQ1RJVkFURV9OT1c7 Cj4gLQlpbmZvLT52YXIuaGVpZ2h0ID0gLTE7Cj4gLQlpbmZvLT52YXIud2lkdGggPSAtMTsKPiAg Cj4gIAlzd2l0Y2ggKGZiLT5mb3JtYXQtPmRlcHRoKSB7Cj4gIAljYXNlIDg6Cj4gQEAgLTI0MzUs MTEgKzI0MzMsMjQgQEAgc3RhdGljIHZvaWQgZHJtX3NldHVwX2NydGNzKHN0cnVjdCBkcm1fZmJf aGVscGVyICpmYl9oZWxwZXIsCj4gICAqLwo+ICBzdGF0aWMgdm9pZCBkcm1fc2V0dXBfY3J0Y3Nf ZmIoc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlcikKPiAgewo+ICsJc3RydWN0IGZiX2lu Zm8gKmluZm8gPSBmYl9oZWxwZXItPmZiZGV2Owo+ICAJaW50IGk7Cj4gIAo+ICAJZm9yIChpID0g MDsgaSA8IGZiX2hlbHBlci0+Y3J0Y19jb3VudDsgaSsrKQo+ICAJCWlmIChmYl9oZWxwZXItPmNy dGNfaW5mb1tpXS5tb2RlX3NldC5udW1fY29ubmVjdG9ycykKPiAgCQkJZmJfaGVscGVyLT5jcnRj X2luZm9baV0ubW9kZV9zZXQuZmIgPSBmYl9oZWxwZXItPmZiOwo+ICsKPiArCWRybV9mYl9oZWxw ZXJfZm9yX2VhY2hfY29ubmVjdG9yKGZiX2hlbHBlciwgaSkgewo+ICsJCXN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IgPQo+ICsJCQkJCWZiX2hlbHBlci0+Y29ubmVjdG9yX2luZm9baV0t PmNvbm5lY3RvcjsKPiArCj4gKwkJLyogdXNlIGZpcnN0IGNvbm5lY3RlZCBjb25uZWN0b3IgZm9y IHRoZSBwaHlzaWNhbCBkaW1lbnNpb25zICovCj4gKwkJaWYgKGNvbm5lY3Rvci0+c3RhdHVzID09 IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkKSB7Cj4gKwkJCWluZm8tPnZhci5oZWlnaHQgPSBj b25uZWN0b3ItPmRpc3BsYXlfaW5mby53aWR0aF9tbTsKPiArCQkJaW5mby0+dmFyLndpZHRoID0g Y29ubmVjdG9yLT5kaXNwbGF5X2luZm8uaGVpZ2h0X21tOwo+ICsJCQlicmVhazsKPiArCQl9Cj4g Kwl9CgpPaywgc21hbGwgdHJhcGRvb3IgSSBkaWRuJ3QgaGlnaGxpZ2h0OiBBY2Nlc3NpbmcgdGhl IGNvbm5lY3RvciBwcm9wZSBzdGF0ZQooaS5lLiAtPnN0YXR1cyBhbmQgLT5kaXNwbGF5X2luZm8p IHJlcXVpcmVzIHRoYXQgeW91IGhvbGQKZGV2LT5tb2RlX2NvbmZpZy5tdXRleC4gU2VlIGhvdyBp dCdzIGRvbmUgaW4gZHJtX3NldHVwX2NydGNzLCBqdXN0IHdyYXAgaXQKYXJvdW5kIHRoaXMgbG9v cCBoZXJlLgoKZmJkZXYgc3RhdGUgaXRzZWxmIGlzIHByb3RlY3RlZCBieSBmYl9oZWxwZXItPmxv Y2ssIHNvIHRoYXQgcGFydCBpcyBhbGwKZ29vZC4KCkkndmUgYXBwbGllZCBwYXRjaCAxIGFscmVh ZHksIGJ1dCBjYW4geW91IHBscyByZXNwaW4gdGhhdCBvbmUgd2l0aCB0aGUKbG9ja2luZyBmaXhl ZCB1cD8KClRoYW5rcywgRGFuaWVsCj4gIH0KPiAgCj4gIC8qIE5vdGU6IERyb3BzIGZiX2hlbHBl ci0+bG9jayBiZWZvcmUgcmV0dXJuaW5nLiAqLwo+IC0tIAo+IDIuNy40Cj4gCj4gX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKRGFuaWVsIFZl dHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3 bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==