main/linux-hardened: enable graphics drivers for virthardened

fixes #7607

3 files changed, 88 insertions, 12 deletions

diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD
index 959619d91f..e589c6d18e 100644
--- a/main/linux-hardened/APKBUILD
+++ b/main/linux-hardened/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with hardening patches"
 url="http://alpinelinux.org"
 depends="mkinitfs"
@@ -204,12 +204,12 @@ _dev() {
 }
 
 sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a  linux-4.9.tar.xz
-752b09fc50f1f91bbf0b1ea7c49b7cc2bb601103c90de80086dde0e3baa745ebcdb0d953ac49c3db5d8dcd95cfdc45e09d29e7304f1baf2666889464fd70a39b  patch-4.9.50.xz
-205a75130683365a75e9f58c01c99ff251076f3006fe582883efc1f29a5207c8da61e4261ce8f19de222ec310fd2404123b29d51edcbd235d30b30637efbcf0e  hardened-3.1-4.9.50-201704252333-alpine.patch
+857e6a203a61baf6fe312a2132b18b9d6331870a44706a72f7612aab5a68e1f1ae0a9eb6e43919f559b775c6a270348b4ba96fd5e38e690d2758c3c7a9bf3ba2  patch-4.9.51.xz
+49b3c51f3a87931afd3491be62229e962ab270dc5db6e76eda32561c5bf76f48517883b922f20830a05e7cc6939801c0fa3fc76eed24c6999d0d2b941977e54b  hardened-3.1-4.9.51-201704252333-alpine.patch
 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782  0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d  zfs-fix.patch
+1debe6f60f236f17533be7a99c618d13e62d5bc0dbd3a96fd7dba764c334324deb152eb12e01526d0112b1aa7180df7cc0346aae5c9ee2a748db6eb4e7556622  config-virthardened.x86
+ce3eef8ce5693ad8e19dd7810d8798ee600d32de0e47230f65c42b904904d3cca6b09337b9e8c9eeb4b18dce18870cc1749618d61a28dcb6d3d6123971b634a6  config-virthardened.x86_64
 e0f8793210d3974a748bd7b1cd71cf7adc3672d279a1d51bbf1a7417161fadaf377bff43fa51b943c89051c62cf608af263137e5c5f904cf70391b94d60cb14d  config-hardened.x86
 d70509a365308f85dfd348d5dad9f5a9c9932434b6c37805b6a7384189599c76d6a2623b1d9e19d89552c4afbd69df7b788019cec42bc5b654635a13902763be  config-hardened.x86_64
-0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277  config-hardened.armhf
-1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4  config-virthardened.x86
-0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0  config-virthardened.x86_64"
+0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277  config-hardened.armhf"
diff --git a/main/linux-hardened/config-virthardened.x86 b/main/linux-hardened/config-virthardened.x86
index a35c3255c2..ceada338ac 100644
--- a/main/linux-hardened/config-virthardened.x86
+++ b/main/linux-hardened/config-virthardened.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.9.8 Kernel Configuration
+# Linux/x86 4.9.51 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1334,7 +1334,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
-# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
 
 #
 # Bus devices
@@ -2108,6 +2109,7 @@ CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_PCA9541=m
 # CONFIG_I2C_MUX_REG is not set
 CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
 
 #
 # I2C Hardware Bus support
@@ -2506,11 +2508,46 @@ CONFIG_MFD_WL1273_CORE=m
 # CONFIG_AGP is not set
 # CONFIG_VGA_ARB is not set
 # CONFIG_VGA_SWITCHEROO is not set
-# CONFIG_DRM is not set
+CONFIG_DRM=m
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_I915 is not set
+# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+# CONFIG_DRM_GMA500 is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_LEGACY is not set
 
 #
 # Frame buffer Devices
@@ -2582,6 +2619,7 @@ CONFIG_FB_HYPERV=m
 # CONFIG_FB_SM712 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_VGASTATE=m
+CONFIG_HDMI=y
 
 #
 # Console display driver support
diff --git a/main/linux-hardened/config-virthardened.x86_64 b/main/linux-hardened/config-virthardened.x86_64
index 29bd7098ec..d44184135c 100644
--- a/main/linux-hardened/config-virthardened.x86_64
+++ b/main/linux-hardened/config-virthardened.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.9.8 Kernel Configuration
+# Linux/x86 4.9.51 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1356,7 +1356,8 @@ CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
-# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
 
 #
 # Bus devices
@@ -2152,6 +2153,7 @@ CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_PCA9541=m
 # CONFIG_I2C_MUX_REG is not set
 CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
 
 #
 # I2C Hardware Bus support
@@ -2544,11 +2546,46 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_AGP is not set
 # CONFIG_VGA_ARB is not set
 # CONFIG_VGA_SWITCHEROO is not set
-# CONFIG_DRM is not set
+CONFIG_DRM=m
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_I915 is not set
+# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+# CONFIG_DRM_GMA500 is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_LEGACY is not set
 
 #
 # Frame buffer Devices
@@ -2621,6 +2658,7 @@ CONFIG_FB_HYPERV=m
 # CONFIG_FB_SM712 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_VGASTATE=m
+CONFIG_HDMI=y
 
 #
 # Console display driver support