From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Thu, 02 Aug 2018 11:28:39 +0000 Subject: [PATCH fix for 4.19 1/3] fbcon: Only allow FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER if fbdev is builtin Message-Id: <20180802112841.27679-2-hdegoede@redhat.com> List-Id: References: <20180802112841.27679-1-hdegoede@redhat.com> In-Reply-To: <20180802112841.27679-1-hdegoede@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bartlomiej Zolnierkiewicz Cc: Hans de Goede , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Having FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER with fbdev+fbcon being build as a module does not make much sense. Having FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER only when fbdev+fbcon are builtin was always the intention, hence the =y checks but they were checking the wrong option, fbcon is build as part of fb.ko, so we must check for FB=y. Signed-off-by: Hans de Goede --- drivers/video/console/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index e91edef98633..787792c3d08d 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -152,7 +152,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bool "Framebuffer Console Deferred Takeover" - depends on FRAMEBUFFER_CONSOLE=y && DUMMY_CONSOLE=y + depends on FB=y && FRAMEBUFFER_CONSOLE && DUMMY_CONSOLE help If enabled this defers the framebuffer console taking over the console from the dummy console until the first text is displayed on -- 2.18.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH fix for 4.19 1/3] fbcon: Only allow FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER if fbdev is builtin Date: Thu, 2 Aug 2018 13:28:39 +0200 Message-ID: <20180802112841.27679-2-hdegoede@redhat.com> References: <20180802112841.27679-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC2B56E594 for ; Thu, 2 Aug 2018 11:28:45 +0000 (UTC) In-Reply-To: <20180802112841.27679-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Bartlomiej Zolnierkiewicz Cc: Hans de Goede , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SGF2aW5nIEZSQU1FQlVGRkVSX0NPTlNPTEVfREVGRVJSRURfVEFLRU9WRVIgd2l0aCBmYmRlditm YmNvbiBiZWluZyBidWlsZAphcyBhIG1vZHVsZSBkb2VzIG5vdCBtYWtlIG11Y2ggc2Vuc2UuCgpI YXZpbmcgRlJBTUVCVUZGRVJfQ09OU09MRV9ERUZFUlJFRF9UQUtFT1ZFUiBvbmx5IHdoZW4gZmJk ZXYrZmJjb24gYXJlCmJ1aWx0aW4gd2FzIGFsd2F5cyB0aGUgaW50ZW50aW9uLCBoZW5jZSB0aGUg PXkgY2hlY2tzIGJ1dCB0aGV5IHdlcmUKY2hlY2tpbmcgdGhlIHdyb25nIG9wdGlvbiwgZmJjb24g aXMgYnVpbGQgYXMgcGFydCBvZiBmYi5rbywgc28gd2UgbXVzdApjaGVjayBmb3IgRkI9eS4KClNp Z25lZC1vZmYtYnk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+Ci0tLQogZHJp dmVycy92aWRlby9jb25zb2xlL0tjb25maWcgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNl cnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2NvbnNv bGUvS2NvbmZpZyBiL2RyaXZlcnMvdmlkZW8vY29uc29sZS9LY29uZmlnCmluZGV4IGU5MWVkZWY5 ODYzMy4uNzg3NzkyYzNkMDhkIDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL2NvbnNvbGUvS2Nv bmZpZworKysgYi9kcml2ZXJzL3ZpZGVvL2NvbnNvbGUvS2NvbmZpZwpAQCAtMTUyLDcgKzE1Miw3 IEBAIGNvbmZpZyBGUkFNRUJVRkZFUl9DT05TT0xFX1JPVEFUSU9OCiAKIGNvbmZpZyBGUkFNRUJV RkZFUl9DT05TT0xFX0RFRkVSUkVEX1RBS0VPVkVSCiAJYm9vbCAiRnJhbWVidWZmZXIgQ29uc29s ZSBEZWZlcnJlZCBUYWtlb3ZlciIKLQlkZXBlbmRzIG9uIEZSQU1FQlVGRkVSX0NPTlNPTEU9eSAm JiBEVU1NWV9DT05TT0xFPXkKKwlkZXBlbmRzIG9uIEZCPXkgJiYgRlJBTUVCVUZGRVJfQ09OU09M RSAmJiBEVU1NWV9DT05TT0xFCiAJaGVscAogCSAgSWYgZW5hYmxlZCB0aGlzIGRlZmVycyB0aGUg ZnJhbWVidWZmZXIgY29uc29sZSB0YWtpbmcgb3ZlciB0aGUKIAkgIGNvbnNvbGUgZnJvbSB0aGUg ZHVtbXkgY29uc29sZSB1bnRpbCB0aGUgZmlyc3QgdGV4dCBpcyBkaXNwbGF5ZWQgb24KLS0gCjIu MTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==