diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-linux-4.6-drm-i915-psr.patch | 115 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 14 insertions, 137 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Jun 6 00:03:45 UTC 2016 +# Fri Jun 17 02:49:52 UTC 2016 pkgbase = linux-libre - pkgver = 4.6.1_gnu - pkgrel = 2 + pkgver = 4.6.2_gnu + pkgrel = 1 url = http://linux-libre.fsfla.org/ arch = i686 arch = x86_64 @@ -17,8 +17,8 @@ pkgbase = linux-libre options = !strip source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6-gnu/linux-libre-4.6-gnu.tar.xz source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6-gnu/linux-libre-4.6-gnu.tar.xz.sign - source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6.1-gnu/patch-4.6-gnu-4.6.1-gnu.xz - source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6.1-gnu/patch-4.6-gnu-4.6.1-gnu.xz.sign + source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6.2-gnu/patch-4.6-gnu-4.6.2-gnu.xz + source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6.2-gnu/patch-4.6-gnu-4.6.2-gnu.xz.sign source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm @@ -30,11 +30,10 @@ pkgbase = linux-libre source = config.armv7h source = linux.preset source = change-default-console-loglevel.patch - source = 0001-linux-4.6-drm-i915-psr.patch source = 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch source = 0002-fix-Atmel-maXTouch-touchscreen-support.patch - source = https://repo.parabola.nu/other/rcn-libre/patches/4.6.1/rcn-libre-4.6.1-armv7-x4.patch - source = https://repo.parabola.nu/other/rcn-libre/patches/4.6.1/rcn-libre-4.6.1-armv7-x4.patch.sig + source = https://repo.parabola.nu/other/rcn-libre/patches/4.6.2/rcn-libre-4.6.2-armv7-x4.patch + source = https://repo.parabola.nu/other/rcn-libre/patches/4.6.2/rcn-libre-4.6.2-armv7-x4.patch.sig source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch source = 0003-SMILE-Plug-device-tree-file.patch @@ -45,7 +44,7 @@ pkgbase = linux-libre source = 0008-USB-armory-support.patch sha256sums = c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8 sha256sums = SKIP - sha256sums = 663f30c19792e5de130d3adbb41d0ce76c03717b38e596c23e4c62ec29ff10f0 + sha256sums = 1e5be661ba938c94b236f45c1f83e39d83a8c30e4a90c6896fc5ad8b3d29f329 sha256sums = SKIP sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494 sha256sums = SKIP @@ -58,7 +57,6 @@ pkgbase = linux-libre sha256sums = 7a286c6d42c2b7cbf778428e215a61fd13958d6a89349a7f508a76b738d4bace sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 - sha256sums = b719c3bd58d71a9e0d76b3674e854419ebec4a3fa9f8a4823f23639720527e83 sha256sums = 0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3 sha256sums = 351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25 sha256sums = f74b28e9e3b6434c1bb7803f9751a068299206953519a9e61162538f5dd8be7e @@ -80,7 +78,7 @@ pkgname = linux-libre depends = linux-libre-firmware depends = kmod optdepends = crda: to set the correct wireless channels of your country - provides = linux=4.6.1 + provides = linux=4.6.2 conflicts = replaces = linux depends_i686 = mkinitcpio>=0.7 @@ -88,13 +86,13 @@ pkgname = linux-libre pkgname = linux-libre-headers pkgdesc = Header files and scripts for building modules for Linux-libre kernel - provides = linux-headers=4.6.1 + provides = linux-headers=4.6.2 conflicts = replaces = linux-headers pkgname = linux-libre-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel - provides = linux-docs=4.6.1 + provides = linux-docs=4.6.2 conflicts = replaces = linux-docs diff --git a/0001-linux-4.6-drm-i915-psr.patch b/0001-linux-4.6-drm-i915-psr.patch deleted file mode 100644 index 29ba7ea6b872..000000000000 --- a/0001-linux-4.6-drm-i915-psr.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 03b7b5f983091bca17e9c163832fcde56971d7d1 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 18 May 2016 18:47:11 +0200 -Subject: drm/i915/psr: Try to program link training times correctly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The default of 0 is 500us of link training, but that's not enough for -some platforms. Decoding this correctly means we're using 2.5ms of -link training on these platforms, which fixes flickering issues -associated with enabling PSR. - -v2: Unbotch the math a bit. - -v3: Drop debug hunk. - -v4: Improve commit message. - -Tested-by: Lyude <cpaul@redhat.com> -Cc: Lyude <cpaul@redhat.com> -Cc: stable@vger.kernel.org -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95176 -Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> -Cc: Sonika Jindal <sonika.jindal@intel.com> -Cc: Durgadoss R <durgadoss.r@intel.com> -Cc: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com> -Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Tested-by: fritsch@kodi.tv -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> -Link: http://patchwork.freedesktop.org/patch/msgid/1463590036-17824-2-git-send-email-daniel.vetter@ffwll.ch -(cherry picked from commit 50db139018f9c94376d5f4db94a3bae65fdfac14) -Signed-off-by: Jani Nikula <jani.nikula@intel.com> ---- - drivers/gpu/drm/i915/intel_psr.c | 55 ++++++++++++++++++++++++++++++++++------ - 1 file changed, 47 insertions(+), 8 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c -index c3abae4..a788d1e 100644 ---- a/drivers/gpu/drm/i915/intel_psr.c -+++ b/drivers/gpu/drm/i915/intel_psr.c -@@ -280,7 +280,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) - * with the 5 or 6 idle patterns. - */ - uint32_t idle_frames = max(6, dev_priv->vbt.psr.idle_frames); -- uint32_t val = 0x0; -+ uint32_t val = EDP_PSR_ENABLE; -+ -+ val |= max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT; -+ val |= idle_frames << EDP_PSR_IDLE_FRAME_SHIFT; - - if (IS_HASWELL(dev)) - val |= EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES; -@@ -288,14 +291,50 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) - if (dev_priv->psr.link_standby) - val |= EDP_PSR_LINK_STANDBY; - -- I915_WRITE(EDP_PSR_CTL, val | -- max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT | -- idle_frames << EDP_PSR_IDLE_FRAME_SHIFT | -- EDP_PSR_ENABLE); -+ if (dev_priv->vbt.psr.tp1_wakeup_time > 5) -+ val |= EDP_PSR_TP1_TIME_2500us; -+ else if (dev_priv->vbt.psr.tp1_wakeup_time > 1) -+ val |= EDP_PSR_TP1_TIME_500us; -+ else if (dev_priv->vbt.psr.tp1_wakeup_time > 0) -+ val |= EDP_PSR_TP1_TIME_100us; -+ else -+ val |= EDP_PSR_TP1_TIME_0us; -+ -+ if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 5) -+ val |= EDP_PSR_TP2_TP3_TIME_2500us; -+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 1) -+ val |= EDP_PSR_TP2_TP3_TIME_500us; -+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 0) -+ val |= EDP_PSR_TP2_TP3_TIME_100us; -+ else -+ val |= EDP_PSR_TP2_TP3_TIME_0us; -+ -+ if (intel_dp_source_supports_hbr2(intel_dp) && -+ drm_dp_tps3_supported(intel_dp->dpcd)) -+ val |= EDP_PSR_TP1_TP3_SEL; -+ else -+ val |= EDP_PSR_TP1_TP2_SEL; -+ -+ I915_WRITE(EDP_PSR_CTL, val); -+ -+ if (!dev_priv->psr.psr2_support) -+ return; -+ -+ /* FIXME: selective update is probably totally broken because it doesn't -+ * mesh at all with our frontbuffer tracking. And the hw alone isn't -+ * good enough. */ -+ val = EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE; -+ -+ if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 5) -+ val |= EDP_PSR2_TP2_TIME_2500; -+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 1) -+ val |= EDP_PSR2_TP2_TIME_500; -+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 0) -+ val |= EDP_PSR2_TP2_TIME_100; -+ else -+ val |= EDP_PSR2_TP2_TIME_50; - -- if (dev_priv->psr.psr2_support) -- I915_WRITE(EDP_PSR2_CTL, EDP_PSR2_ENABLE | -- EDP_SU_TRACK_ENABLE | EDP_PSR2_TP2_TIME_100); -+ I915_WRITE(EDP_PSR2_CTL, val); - } - - static bool intel_psr_match_conditions(struct intel_dp *intel_dp) --- -cgit v0.12 - @@ -11,7 +11,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.6-gnu -_pkgver=4.6.1-gnu +_pkgver=4.6.2-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -20,7 +20,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=1 rcnrel=armv7-x4 arch=('i686' 'x86_64' 'armv7h') url="http://linux-libre.fsfla.org/" @@ -43,7 +43,6 @@ 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-linux-4.6-drm-i915-psr.patch' '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' # armv7h patches @@ -59,7 +58,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0008-USB-armory-support.patch') sha256sums=('c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8' 'SKIP' - '663f30c19792e5de130d3adbb41d0ce76c03717b38e596c23e4c62ec29ff10f0' + '1e5be661ba938c94b236f45c1f83e39d83a8c30e4a90c6896fc5ad8b3d29f329' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -72,7 +71,6 @@ sha256sums=('c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8' '7a286c6d42c2b7cbf778428e215a61fd13958d6a89349a7f508a76b738d4bace' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - 'b719c3bd58d71a9e0d76b3674e854419ebec4a3fa9f8a4823f23639720527e83' '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' 'f74b28e9e3b6434c1bb7803f9751a068299206953519a9e61162538f5dd8be7e' @@ -139,10 +137,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix flickering on 4.6 - # reported from brain0 and heftig on IRC - patch -p1 -i "${srcdir}/0001-linux-4.6-drm-i915-psr.patch" - # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug patch -p1 -i "${srcdir}/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch" |