diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch | 79 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 10 insertions, 96 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-selinux - pkgver = 3.18.3 + pkgver = 3.18.4 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -14,22 +14,20 @@ pkgbase = linux-selinux options = !strip source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.tar.xz source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.18.3.xz - source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.18.3.sign + source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.18.4.xz + source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.18.4.sign source = config source = config.x86_64 source = linux-selinux.preset source = change-default-console-loglevel.patch - source = 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch sha256sums = becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd sha256sums = SKIP - sha256sums = 564eed0dfd7aadeec97566da6d09f8636b6335882139cf6d42e45381276bb2d0 + sha256sums = 57c74ba5266bb10be335a89d30480739b3de67b5a72b3e0b0d37a27775b1862a sha256sums = SKIP sha256sums = 1c041a377ad790f109da22595ea1a9cf35d86e8a508f71ab16f7ba053349e678 sha256sums = 6d40ef42dc4b89fd1eb3656235bfb24d4f8fe16dd5fb6387c2b6240f4256f403 sha256sums = 375da3b030f17581cbf5be9140b79029ca85eebc70197f419a4de77e00fa84e9 sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 - sha256sums = 0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d pkgname = linux-selinux pkgdesc = The Linux-selinux kernel and modules @@ -40,20 +38,20 @@ pkgname = linux-selinux depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = kernel26-selinux=3.18.3 + provides = kernel26-selinux=3.18.4 conflicts = kernel26-selinux replaces = kernel26-selinux backup = etc/mkinitcpio.d/linux-selinux.preset pkgname = linux-selinux-headers pkgdesc = Header files and scripts for building modules for Linux-selinux kernel - provides = kernel26-selinux-headers=3.18.3 + provides = kernel26-selinux-headers=3.18.4 conflicts = kernel26-selinux-headers replaces = kernel26-selinux-headers pkgname = linux-selinux-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-selinux kernel - provides = kernel26-selinux-docs=3.18.3 + provides = kernel26-selinux-docs=3.18.4 conflicts = kernel26-selinux-docs replaces = kernel26-selinux-docs diff --git a/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342768..000000000000 --- a/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon, 24 Nov 2014 11:12:42 +0100 -Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers - -The problem here is that SNA pins batchbuffers to etch out a bit more -performance. Iirc it started out as a w/a for i830M (which we've -implemented in the kernel since a long time already). The problem is -that the pin ioctl wasn't added in - -commit d23db88c3ab233daed18709e3a24d6c95344117f -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri May 23 08:48:08 2014 +0200 - - drm/i915: Prevent negative relocation deltas from wrapping - -Fix this by simply disallowing pinning from userspace so that the -kernel is in full control of batch placement again. Especially since -distros are moving towards running X as non-root, so most users won't -even be able to see any benefits. - -UMS support is dead now, but we need this minimal patch for -backporting. Follow-up patch will remove the pin ioctl code -completely. - -Note to backporters: You must have both - -commit b45305fce5bb1abec263fcff9d81ebecd6306ede -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Mon Dec 17 16:21:27 2012 +0100 - - drm/i915: Implement workaround for broken CS tlb on i830/845 - -which laned in 3.8 and - -commit c4d69da167fa967749aeb70bc0e94a457e5d00c1 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Sep 8 14:25:41 2014 +0100 - - drm/i915: Evict CS TLBs between batches - -which is also marked cc: stable. Otherwise this could introduce a -regression by disabling the userspace w/a without the kernel w/a being -fully functional on i830/45. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116 -Cc: stable@vger.kernel.org # requires c4d69da167fa967749a and v3.8 -Cc: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_gem.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index fd17cca..97b86a5 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -- if (INTEL_INFO(dev)->gen >= 6) -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) - return -ENODEV; - - ret = i915_mutex_lock_interruptible(dev); -@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, - struct drm_i915_gem_object *obj; - int ret; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return -ENODEV; -+ - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; --- -2.2.0 - @@ -5,7 +5,7 @@ pkgbase=linux-selinux _srcname=linux-3.18 -pkgver=3.18.3 +pkgver=3.18.4 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -22,17 +22,15 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux-selinux.preset' 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' ) sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd' 'SKIP' - '564eed0dfd7aadeec97566da6d09f8636b6335882139cf6d42e45381276bb2d0' + '57c74ba5266bb10be335a89d30480739b3de67b5a72b3e0b0d37a27775b1862a' 'SKIP' '1c041a377ad790f109da22595ea1a9cf35d86e8a508f71ab16f7ba053349e678' '6d40ef42dc4b89fd1eb3656235bfb24d4f8fe16dd5fb6387c2b6240f4256f403' '375da3b030f17581cbf5be9140b79029ca85eebc70197f419a4de77e00fa84e9' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -48,9 +46,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - - # fix #43143 - patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream |