aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFarhan Ali <[email protected]>2018-02-22 11:22:24 -0500
committerChristian Borntraeger <[email protected]>2018-03-14 19:21:17 +0000
commit258400304225a219a2d98f29fe957df98789a843 (patch)
tree8b8e47814888b5b14b1d99fdd2d225c175d9955d
parentdaea5469e184209420770fcf47f3db3d7a6d04ee (diff)
s390/setup: enable display support for KVM guest
The S390 architecture does not support any graphics hardware, but with the latest support for Virtio GPU in Linux and Virtio GPU emulation in QEMU, it's possible to enable graphics for S390 using the Virtio GPU device. To enable display we need to enable the Linux Virtual Terminal (VT) layer for S390. But the VT subsystem initializes quite early at boot so we need a dummy console driver till the Virtio GPU driver is initialized and we can run the framebuffer console. The framebuffer console over a Virtio GPU device can be run in combination with the serial SCLP console (default on S390). The SCLP console can still be accessed by management applications (eg: via Libvirt's virsh console). Signed-off-by: Farhan Ali <[email protected]> Acked-by: Christian Borntraeger <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Message-Id: <e23b61f4f599ba23881727a1e8880e9d60cc6a48.1519315352.git.alifm@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--arch/s390/kernel/setup.c2
-rw-r--r--drivers/tty/Kconfig2
-rw-r--r--drivers/video/console/Kconfig2
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index a6a91f01a17a..f98a0f362876 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -221,6 +221,8 @@ static void __init conmode_default(void)
SET_CONSOLE_SCLP;
#endif
}
+ if (IS_ENABLED(CONFIG_VT) && IS_ENABLED(CONFIG_DUMMY_CONSOLE))
+ conswitchp = &dummy_con;
}
#ifdef CONFIG_CRASH_DUMP
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index b811442c5ce6..5ca53facc2c8 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -11,7 +11,7 @@ if TTY
config VT
bool "Virtual terminal" if EXPERT
- depends on !S390 && !UML
+ depends on !UML
select INPUT
default y
---help---
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 9485857228ea..b9c2c916247e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -9,7 +9,7 @@ config VGA_CONSOLE
depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \
!SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
- !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM
+ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM && !S390
default y
help
Saying Y here will allow you to use Linux in text mode through a