summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-grsec-knock
diff options
context:
space:
mode:
Diffstat (limited to 'kernels/linux-libre-grsec-knock')
-rw-r--r--kernels/linux-libre-grsec-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch56
-rw-r--r--kernels/linux-libre-grsec-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch34
-rw-r--r--kernels/linux-libre-grsec-knock/PKGBUILD19
-rw-r--r--kernels/linux-libre-grsec-knock/config.armv7h34
4 files changed, 122 insertions, 21 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch b/kernels/linux-libre-grsec-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch
new file mode 100644
index 000000000..241b1012e
--- /dev/null
+++ b/kernels/linux-libre-grsec-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch
@@ -0,0 +1,56 @@
+From 634b3a4a476e96816d5d6cd5bb9f8900a53f56ba Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Date: Mon, 23 Nov 2015 10:25:28 +0100
+Subject: drm/i915: Do a better job at disabling primary plane in the noatomic
+ case.
+
+When disable_noatomic is called plane_mask is not correct yet, and
+plane_state->visible = true is left as true after disabling the primary
+plane.
+
+Other planes are already disabled as part of crtc sanitization, only the
+primary is left active. But the plane_mask is not updated here. It gets
+updated during fb takeover in modeset_gem_init, or set to the new value
+on resume.
+
+This means that to disable the primary plane 1 << drm_plane_index(primary)
+needs to be used.
+
+Afterwards because the crtc is no longer active it's forbidden to keep
+plane_state->visible set, or a WARN_ON in
+intel_plane_atomic_calc_changes triggers. There are other code points
+that rely on accurate plane_state->visible too, so make sure the bool is
+cleared.
+
+The other planes are already disabled in intel_sanitize_crtc, so they
+don't have to be handled here.
+
+Cc: stable@vger.kernel.org #v4.3, v4.2?
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92655
+Tested-by: Tomas Mezzadra <tmezzadra@gmail.com>
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: http://patchwork.freedesktop.org/patch/msgid/5652DB88.9070208@linux.intel.com
+(cherry picked from commit 54a4196188eab82e6f0a5f05716626e9f18b8fb6)
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 22e86d2..62211ab 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -6309,9 +6309,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
+ if (to_intel_plane_state(crtc->primary->state)->visible) {
+ intel_crtc_wait_for_pending_flips(crtc);
+ intel_pre_disable_primary(crtc);
++
++ intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
++ to_intel_plane_state(crtc->primary->state)->visible = false;
+ }
+
+- intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
+ dev_priv->display.crtc_disable(crtc);
+ intel_crtc->active = false;
+ intel_update_watermarks(crtc);
+--
+cgit v0.10.2
+
diff --git a/kernels/linux-libre-grsec-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch b/kernels/linux-libre-grsec-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch
new file mode 100644
index 000000000..af564c2a3
--- /dev/null
+++ b/kernels/linux-libre-grsec-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch
@@ -0,0 +1,34 @@
+From 1fdf53fafef2ccc0684a3b655e716b9921642197 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Sun, 6 Dec 2015 23:28:37 +0000
+Subject: [PATCH 9/9] ARM: dts: dove: add Dove divider clocks
+
+Add the Dove divider clocks to the Dove dtsi file.
+
+Acked-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+---
+ arch/arm/boot/dts/dove.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
+index 1791216..ea36a26 100644
+--- a/arch/arm/boot/dts/dove.dtsi
++++ b/arch/arm/boot/dts/dove.dtsi
+@@ -459,6 +459,12 @@
+ #clock-cells = <1>;
+ };
+
++ divider_clk: core-clock@0064 {
++ compatible = "marvell,dove-divider-clock";
++ reg = <0x0064 0x8>;
++ #clock-cells = <1>;
++ };
++
+ pinctrl: pin-ctrl@0200 {
+ compatible = "marvell,dove-pinctrl";
+ reg = <0x0200 0x14>,
+--
+2.6.4
+
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index aced272f0..73ae8b04f 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-libre-grsec-knock
_pkgbasever=4.3-gnu
_pkgver=4.3.4-gnu
_grsecver=3.1
-_timestamp=201601231215
+_timestamp=201601292206
_knockpatchver=4.2_2
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -53,6 +53,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
+ '0001-disabling-primary-plane-in-the-noatomic-case.patch'
'0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
'0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
# armv7h patches
@@ -65,12 +66,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
'0007-set-default-cubietruck-led-triggers.patch'
- '0008-USB-armory-support.patch')
+ '0008-USB-armory-support.patch'
+ '0009-ARM-dts-dove-add-Dove-divider-clocks.patch')
sha256sums=('1d280ae2730eb6c9b8c7e920cac2e8111c8db02c498db0c142860a84106cc169'
'SKIP'
'73ad579342bf4d4954953fa76a79454d81213a151694a7ac70d486808f1bdf3a'
'SKIP'
- '478654b1a68ed24b777009429a05a366a13240af7a13292afa912fe09413b50a'
+ 'e7836ec43279b83684d1b7902a532a19451d9c89a28be41ef4c341ca53bcfe72'
'SKIP'
'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4'
'SKIP'
@@ -82,9 +84,10 @@ sha256sums=('1d280ae2730eb6c9b8c7e920cac2e8111c8db02c498db0c142860a84106cc169'
'SKIP'
'76d15ea422e1dc4bf14af4e02eaa275a514a891991d3b06306d8df06044c5b29'
'e01a77ed063fe6835b948083943d5e118f0fa15014cc5600a89dc000c0a423b4'
- 'd4377df75b4e0832273d38df17b993a4ed6d8aa2ab09c9ab74020287bdbab42c'
+ '0021594878b17f3002ef1d89779ba22d6f49d0f5275a6415f5eb60709d3f9f70'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+ 'abdd04bd6beecb7c961130a68d71e6332bd260462eeaa2f4f8e634de813dcc4d'
'61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
'7f58bf48fd6b0c93b448ced408ef5b6cb41da392f58378475f8d5f5c09f2a98f'
@@ -96,7 +99,8 @@ sha256sums=('1d280ae2730eb6c9b8c7e920cac2e8111c8db02c498db0c142860a84106cc169'
'abc9593a479b9bb677112fa1d6502c8165d27d0854a712e1662374e4bafb96a0'
'd068215561ce769439901da0118e251c624de58fe414cc2166fbf972f76dd1a7'
'ac0fb2180560652f94bebb3c09baef3c34785b539cae541df175ebec6989d79c'
- 'c23c3bf29fd557fe2e9ca72e65cd0f1e790b771b4568d0732388d7d420cefd6a')
+ 'c23c3bf29fd557fe2e9ca72e65cd0f1e790b771b4568d0732388d7d420cefd6a'
+ '5e1b8b1e9b3243a5ab315481c39b1b88f28923148659dcc0ac7ed78d9ba4f072')
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
@@ -142,6 +146,7 @@ prepare() {
patch -p1 -i "${srcdir}/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch"
patch -p1 -i "${srcdir}/0007-set-default-cubietruck-led-triggers.patch"
patch -p1 -i "${srcdir}/0008-USB-armory-support.patch"
+ patch -p1 -i "${srcdir}/0009-ARM-dts-dove-add-Dove-divider-clocks.patch"
fi
# add freedo as boot logo
@@ -156,6 +161,10 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+ # fix #46968
+ # hangs on older intel hardware
+ patch -Np1 -i "${srcdir}/0001-disabling-primary-plane-in-the-noatomic-case.patch"
+
# make the radeon driver load without the firmwares
# http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html
if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then ## This patch is only needed for x86 computers, so we disable it for others
diff --git a/kernels/linux-libre-grsec-knock/config.armv7h b/kernels/linux-libre-grsec-knock/config.armv7h
index 087382730..4a2648d3f 100644
--- a/kernels/linux-libre-grsec-knock/config.armv7h
+++ b/kernels/linux-libre-grsec-knock/config.armv7h
@@ -790,7 +790,20 @@ CONFIG_QORIQ_CPUFREQ=y
#
# CPU Idle
#
-# CONFIG_CPU_IDLE is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_DT_IDLE_STATES=y
+
+#
+# ARM CPU Idle Drivers
+#
+CONFIG_ARM_CPUIDLE=y
+# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+# CONFIG_ARM_ZYNQ_CPUIDLE is not set
+# CONFIG_ARM_EXYNOS_CPUIDLE is not set
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
#
@@ -3046,7 +3059,7 @@ CONFIG_SERIAL_EARLYCON=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
+# CONFIG_SERIAL_8250_DMA is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_NR_UARTS=6
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
@@ -4585,6 +4598,8 @@ CONFIG_DRM_IMX_TVE=m
CONFIG_DRM_IMX_LDB=m
CONFIG_DRM_IMX_IPUV3=m
CONFIG_DRM_IMX_HDMI=m
+CONFIG_DRM_ETNAVIV=m
+# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
#
# Frame buffer Devices
@@ -4783,15 +4798,12 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_AC97_POWER_SAVE is not set
CONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
@@ -4813,22 +4825,16 @@ CONFIG_SND_PCI=y
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_INDIGOIOX is not set
# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LOLA is not set
-# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
@@ -4837,8 +4843,6 @@ CONFIG_SND_PCI=y
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SE6X is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VIRTUOSO is not set
@@ -6028,8 +6032,6 @@ CONFIG_FB_TFT_WATTEROTT=m
CONFIG_FB_FLEX=m
CONFIG_FB_TFT_FBTFT_DEVICE=m
# CONFIG_MOST is not set
-CONFIG_DRM_ETNAVIV=m
-# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
CONFIG_CHROME_PLATFORMS=y
CONFIG_CROS_EC_CHARDEV=y
CONFIG_CROS_EC_PROTO=y
@@ -6862,7 +6864,7 @@ CONFIG_TIMER_STATS=y
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_LIST is not set
+CONFIG_DEBUG_LIST=y
# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_NOTIFIERS is not set