From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard Subject: [PATCH 2/3] drm/fb: add support for not enabling fbcon on non-desktop displays [v2] Date: Fri, 10 Nov 2017 16:20:08 -0800 Message-ID: <20171111002009.2340-3-keithp@keithp.com> References: <20171025063023.12584-1-airlied@gmail.com> <20171111002009.2340-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 22DA86EBB8 for ; Sat, 11 Nov 2017 00:20:13 +0000 (UTC) In-Reply-To: <20171111002009.2340-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, Dave Airlie , Daniel Vetter Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCldlIGRvbid0IHdhbnQgZmJj b24gdG8gZ2V0IHVzZWQgb24gbm9uLWRlc2t0b3AgZGlzbGF5cywKZG9uJ3QgcGFzcyB0aGVtIGFz IGVuYWJsZWQgY29ubmVjdG9ycyB0byB0aGUgZmIgaGVscGVyIHNldHVwLgoKVGhpcyBwcmV2ZW50 cyBteSBITUQgZnJvbSBnZXR0aW5nIGRpc29ydGVkIGZiY29uLCBhbmQgZnJvbQphZmZlY3Rpbmcg b3RoZXIgZGlzcGxheXMgY29uc29sZS4KCnYyOiBDaGFuZ2UgZGVzY3JpcHRpb24gZnJvbSBub24t c3RhbmRhcmQgdG8gbm9uLWRlc2t0b3AKClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJs aWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyB8IDYg KysrKystCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZmJfaGVscGVyLmMKaW5kZXggMTE2ZDFmMTMzN2M3Li4wNzM3NDAwOGYxNDYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2RybV9mYl9oZWxwZXIuYwpAQCAtMjAzMyw2ICsyMDMzLDkgQEAgc3RhdGljIGJvb2wg ZHJtX2Nvbm5lY3Rvcl9lbmFibGVkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJv b2wgc3RyaWN0KQogewogCWJvb2wgZW5hYmxlOwogCisJaWYgKGNvbm5lY3Rvci0+ZGlzcGxheV9p bmZvLm5vbl9kZXNrdG9wKQorCQlyZXR1cm4gZmFsc2U7CisKIAlpZiAoc3RyaWN0KQogCQllbmFi bGUgPSBjb25uZWN0b3ItPnN0YXR1cyA9PSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKIAll bHNlCkBAIC0yMDUyLDcgKzIwNTUsOCBAQCBzdGF0aWMgdm9pZCBkcm1fZW5hYmxlX2Nvbm5lY3Rv cnMoc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKIAkJY29ubmVjdG9yID0gZmJfaGVs cGVyLT5jb25uZWN0b3JfaW5mb1tpXS0+Y29ubmVjdG9yOwogCQllbmFibGVkW2ldID0gZHJtX2Nv bm5lY3Rvcl9lbmFibGVkKGNvbm5lY3RvciwgdHJ1ZSk7CiAJCURSTV9ERUJVR19LTVMoImNvbm5l Y3RvciAlZCBlbmFibGVkPyAlc1xuIiwgY29ubmVjdG9yLT5iYXNlLmlkLAotCQkJICBlbmFibGVk W2ldID8gInllcyIgOiAibm8iKTsKKwkJCSAgICAgIGNvbm5lY3Rvci0+ZGlzcGxheV9pbmZvLm5v bl9kZXNrdG9wID8gIm5vbiBkZXNrdG9wIiA6IGVuYWJsZWRbaV0gPyAieWVzIiA6ICJubyIpOwor CiAJCWFueV9lbmFibGVkIHw9IGVuYWJsZWRbaV07CiAJfQogCi0tIAoyLjE1LjAucmMwCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754919AbdKKAUw (ORCPT ); Fri, 10 Nov 2017 19:20:52 -0500 Received: from home.keithp.com ([63.227.221.253]:48146 "EHLO elaine.keithp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754121AbdKKAUN (ORCPT ); Fri, 10 Nov 2017 19:20:13 -0500 From: Keith Packard To: linux-kernel@vger.kernel.org, Dave Airlie , Daniel Vetter Cc: Keith Packard , dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/fb: add support for not enabling fbcon on non-desktop displays [v2] Date: Fri, 10 Nov 2017 16:20:08 -0800 Message-Id: <20171111002009.2340-3-keithp@keithp.com> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171111002009.2340-1-keithp@keithp.com> References: <20171025063023.12584-1-airlied@gmail.com> <20171111002009.2340-1-keithp@keithp.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Airlie We don't want fbcon to get used on non-desktop dislays, don't pass them as enabled connectors to the fb helper setup. This prevents my HMD from getting disorted fbcon, and from affecting other displays console. v2: Change description from non-standard to non-desktop Signed-off-by: Dave Airlie --- drivers/gpu/drm/drm_fb_helper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 116d1f1337c7..07374008f146 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2033,6 +2033,9 @@ static bool drm_connector_enabled(struct drm_connector *connector, bool strict) { bool enable; + if (connector->display_info.non_desktop) + return false; + if (strict) enable = connector->status == connector_status_connected; else @@ -2052,7 +2055,8 @@ static void drm_enable_connectors(struct drm_fb_helper *fb_helper, connector = fb_helper->connector_info[i]->connector; enabled[i] = drm_connector_enabled(connector, true); DRM_DEBUG_KMS("connector %d enabled? %s\n", connector->base.id, - enabled[i] ? "yes" : "no"); + connector->display_info.non_desktop ? "non desktop" : enabled[i] ? "yes" : "no"); + any_enabled |= enabled[i]; } -- 2.15.0.rc0