From patchwork Wed Aug 2 18:12:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 9877371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A249560360 for ; Wed, 2 Aug 2017 18:13:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9131020410 for ; Wed, 2 Aug 2017 18:13:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 834E328703; Wed, 2 Aug 2017 18:13:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C70120410 for ; Wed, 2 Aug 2017 18:13:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1542C88DA9; Wed, 2 Aug 2017 18:13:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from vern.gendns.com (vern.gendns.com [206.190.152.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 76B8B88DA9 for ; Wed, 2 Aug 2017 18:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=lFCqVsI3FS5iYnK8IT0cl3ThTZbevkKy4FnWKyFUg/I=; b=sy5q8rasekCFMCn08uQYiq8iqj EYZVAuh+vmxDhEkn9VMncd7PBWcHhceJY315Mrrfyh/h9ma6xDjbOPFgE2nC2a18IHQNpdjUL4nWI tq6o2O5Wa3WAHpRyNdLUUOavWATmO1pInw3NxWHOnl3F6D3Cqxhx9HICtN8hLFjmtzmFTFIA72heO S+KsjHO9Rg42W6FUb9ap9knqRTur89jWHsd858vyUjy63G7pvKI1CySSj0lF3D8mvKsZaigeoU2yH mCissI11wNAWvwxJOmA51l2SlPv2zL9+dFB0l7AakYYYFsOq1S4QsiifaQcI9x2P5WRt4X8QE2DaJ DEAqtxbw==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:51468 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89) (envelope-from ) id 1dcy61-000oDy-Rl; Wed, 02 Aug 2017 14:10:14 -0400 From: David Lechner To: dri-devel@lists.freedesktop.org Subject: [PATCH v2] drm/fb-helper: pass physical dimensions to fbdev Date: Wed, 2 Aug 2017 13:12:51 -0500 Message-Id: <1501697571-16823-1-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - lists.freedesktop.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Cc: David Lechner , linux-kernel@vger.kernel.org, Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: David Lechner --- v1 changes (from RFC): * Use loop to get info from first connected connector instead of just the first connector. v2 changes: * Update width in height in drm_setup_crtcs() also to handle hotplug events. As mentioned in the comments below, drm_setup_crtcs() can't set these values during init because the data structure hasn't been allocated yet, so we end up doing the same thing in two different places. drivers/gpu/drm/drm_fb_helper.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b2a01d1..7813b86 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1884,6 +1884,7 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe uint32_t fb_width, uint32_t fb_height) { struct drm_framebuffer *fb = fb_helper->fb; + int i; info->pseudo_palette = fb_helper->pseudo_palette; info->var.xres_virtual = fb->width; @@ -1896,6 +1897,18 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe info->var.height = -1; info->var.width = -1; + drm_fb_helper_for_each_connector(fb_helper, i) { + struct drm_connector *connector = + fb_helper->connector_info[i]->connector; + + /* use the 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; + } + } + switch (fb->format->depth) { case 8: info->var.red.offset = 0; @@ -2355,6 +2368,7 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper, struct drm_display_mode **modes; struct drm_fb_offset *offsets; bool *enabled; + bool var_updated = false; int i; DRM_DEBUG_KMS("\n"); @@ -2429,6 +2443,23 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper, modeset->fb = fb_helper->fb; modeset->x = offset->x; modeset->y = offset->y; + + /* + * During init, drm_setup_crtcs() is called before the + * fbdev is allocated, so this only affects hotplug + * events. + * Only the info from the first connected connector is + * used. + */ + if (!var_updated && fb_helper->fbdev && + connector->status == connector_status_connected) { + struct fb_var_screeninfo *var = + &fb_helper->fbdev->var; + + var->width = connector->display_info.width_mm; + var->height = connector->display_info.height_mm; + var_updated = true; + } } } out: