diff options
Diffstat (limited to 'kernels/linux-libre-pae')
| -rw-r--r-- | kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch | 79 | ||||
| -rw-r--r-- | kernels/linux-libre-pae/PKGBUILD | 13 |
2 files changed, 4 insertions, 88 deletions
diff --git a/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch b/kernels/linux-libre-pae/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch deleted file mode 100644 index f9aa99342..000000000 --- a/kernels/linux-libre-pae/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 - diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 48a19b973..d91258bf3 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.18-gnu -_pkgver=3.18.3-gnu +_pkgver=3.18.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') + 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' + '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' 'SKIP' '8d255e4551bb88252ede8cc0f5046794372076da6bd97582229172537f0cc922' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -70,9 +68,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 # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) |