From patchwork Wed Mar 29 14:43:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 9651761 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 C05BA602BE for ; Wed, 29 Mar 2017 14:45:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5527205FC for ; Wed, 29 Mar 2017 14:45:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA33D284D0; Wed, 29 Mar 2017 14:45:24 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable 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 52AAC205FC for ; Wed, 29 Mar 2017 14:45:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB8336E748; Wed, 29 Mar 2017 14:44:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id E15356E757; Wed, 29 Mar 2017 14:44:12 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id p52so3623930wrc.2; Wed, 29 Mar 2017 07:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0vpdcFepNlNs8008KPqVebUH8UisNHYbL4OpZDCiVXE=; b=H5H+prBdXmUtFLCJIMgvEGmk+2QusFvwZWupnbc1FHd95UDSmF6WGOG2vj/yOECRU4 EGZW07zr7siMv+jlQ9nyxXxcHY0hTnabCSozDT552zCjaxOgZnGQSLiwkqD+eqhDBGvN ocnn1K19Srhh+stCbz3nYCasj1eSFRvk7YtanxbfFIPVJXjyodo8F3SP8SnUG9ONPBzp RL4Elxe3IJkc5Wk5DDJ+cQPVTTiKevwYR58CSqLjfF/ryMGegC4csss8G4cS27NYkxI3 BFD/5S9A+cJDakwGeYRKIWYCTrzN6aGMwVfDLjaqVcmJ5TxDu7wR9GJ3lfZCekpicq35 67Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0vpdcFepNlNs8008KPqVebUH8UisNHYbL4OpZDCiVXE=; b=uaD19TG1F5ZDbwuIQuXLxHw5XQIHeYl9lVaNR0JF7PgF7KfIf4tenWXgU0r715/auB JwmezDL6Dz8ZojnSefn14dMebFztd8QwsTx/O3vmJj0iiyO7yCOqCILbxpXWsfpuRoLd AfAxSMqA4pOSaTPccDoxuwGm+ZswYYb702Y0OIEdjid2z74jB+ePvDbJpzsesL3/cJRn 6sCU3VI4fmAegfiJVH6gZx9iKzfqnYhSAA+1v+Ge/j9DM21PKd6znP3/DSQ4DOP4IyRk Iq0KNjzJuL0o8MbTt1/Oh3B1JzyMXTwThq9QMzQh09L8MarUK1CjcBoKNdrXmw/Rfeod 74Ww== X-Gm-Message-State: AFeK/H3yzKYdRBHg2zsS0ZPN+sK9+a5qT2WTaGtBK6mm173tEfALOp16xh7cJyc8j8ayYw== X-Received: by 10.223.160.239 with SMTP id n44mr848631wrn.198.1490798651349; Wed, 29 Mar 2017 07:44:11 -0700 (PDT) Received: from localhost (port-5852.pppoe.wtnet.de. [84.46.22.242]) by smtp.gmail.com with ESMTPSA id o66sm8418320wmg.33.2017.03.29.07.44.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Mar 2017 07:44:10 -0700 (PDT) From: Thierry Reding To: Daniel Vetter Date: Wed, 29 Mar 2017 16:43:57 +0200 Message-Id: <20170329144401.1804-8-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170329144401.1804-1-thierry.reding@gmail.com> References: <20170329144401.1804-1-thierry.reding@gmail.com> Cc: John Stultz , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH v4 07/11] drm/fb-helper: Support deferred setup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding FB helper code falls back to a 1024x768 mode if no outputs are connected or don't report back any modes upon initialization. This can be annoying because outputs that are added to FB helper later on can't be used with FB helper if they don't support a matching mode. The fallback is in place because VGA connectors can happen to report an unknown connection status even when they are in fact connected. Some drivers have custom solutions in place to defer FB helper setup until at least one output is connected. But the logic behind these solutions is always the same and there is nothing driver-specific about it, so a better alterative is to fix the FB helper core and add support for all drivers automatically. This patch adds support for deferred FB helper setup. It checks all the connectors for their connection status, and if all of them report to be disconnected marks the FB helper as needing deferred setup. Whet setup is deferred, the FB helper core will automatically retry setup after a hotplug event, and it will keep trying until it succeeds. Tested-by: John Stultz Reviewed-by: Daniel Vetter Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_fb_helper.c | 53 +++++++++++++++++++++++++++++++++++++---- include/drm/drm_fb_helper.h | 23 ++++++++++++++++++ 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 21a90322531c..e9fe47d218e1 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -505,6 +505,9 @@ __drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) WARN_ON(!mutex_is_locked(&fb_helper->lock)); + if (fb_helper->deferred_setup) + return 0; + drm_modeset_lock_all(dev); ret = restore_fbdev_mode(fb_helper); @@ -1611,6 +1614,23 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, } EXPORT_SYMBOL(drm_fb_helper_pan_display); +static bool drm_fb_helper_maybe_connected(struct drm_fb_helper *helper) +{ + bool connected = false; + unsigned int i; + + for (i = 0; i < helper->connector_count; i++) { + struct drm_fb_helper_connector *fb = helper->connector_info[i]; + + if (fb->connector->status != connector_status_disconnected) { + connected = true; + break; + } + } + + return connected; +} + /* * Allocates the backing storage and sets up the fbdev info structure through * the ->fb_probe callback and then registers the fbdev and sets up the panic @@ -2268,8 +2288,6 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper, int i; DRM_DEBUG_KMS("\n"); - if (drm_fb_helper_probe_connector_modes(fb_helper, width, height) == 0) - DRM_DEBUG_KMS("No connectors reported connected with modes\n"); /* prevent concurrent modification of connector_count by hotplug */ lockdep_assert_held(&fb_helper->dev->mode_config.mutex); @@ -2351,6 +2369,7 @@ static int __drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel) { struct drm_device *dev = fb_helper->dev; + unsigned int width, height; struct fb_info *info; int ret; @@ -2360,14 +2379,34 @@ static int __drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, WARN_ON(!mutex_is_locked(&fb_helper->lock)); mutex_lock(&dev->mode_config.mutex); - drm_setup_crtcs(fb_helper, - dev->mode_config.max_width, - dev->mode_config.max_height); + + width = dev->mode_config.max_width; + height = dev->mode_config.max_height; + + if (drm_fb_helper_probe_connector_modes(fb_helper, width, height) == 0) + DRM_DEBUG_KMS("No connectors reported connected with modes\n"); + + /* + * If everything's disconnected, there's no use in attempting to set + * up fbdev. + */ + if (!drm_fb_helper_maybe_connected(fb_helper)) { + DRM_INFO("No outputs connected, deferring setup\n"); + fb_helper->preferred_bpp = bpp_sel; + fb_helper->deferred_setup = true; + mutex_unlock(&dev->mode_config.mutex); + return 0; + } + + drm_setup_crtcs(fb_helper, width, height); + ret = drm_fb_helper_single_fb_probe(fb_helper, bpp_sel); mutex_unlock(&dev->mode_config.mutex); if (ret) return ret; + fb_helper->deferred_setup = false; + info = fb_helper->fbdev; info->var.pixclock = 0; ret = register_framebuffer(info); @@ -2451,6 +2490,10 @@ static int __drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) WARN_ON(!mutex_is_locked(&fb_helper->lock)); + if (fb_helper->deferred_setup) + return __drm_fb_helper_initial_config(fb_helper, + fb_helper->preferred_bpp); + mutex_lock(&dev->mode_config.mutex); if (!fb_helper->fb || !drm_fb_helper_is_bound(fb_helper)) { diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 44e2c57a7049..b0af21b371ea 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -227,6 +227,29 @@ struct drm_fb_helper { * needs to be reprobe when fbdev is in control again. */ bool delayed_hotplug; + + /** + * @deferred_setup: + * + * If no outputs are connected (disconnected or unknown) the FB helper + * code will defer setup until at least one of the outputs shows up. + * This field keeps track of the status so that setup can be retried + * at every hotplug event until it succeeds eventually. + * + * Protected by @lock. + */ + bool deferred_setup; + + /** + * @preferred_bpp: + * + * Temporary storage for the driver's preferred BPP setting passed to + * FB helper initialization. This needs to be tracked so that deferred + * FB helper setup can pass this on. + * + * See also: @deferred_setup + */ + int preferred_bpp; }; /**