Date: Wednesday, January 14, 2015 @ 13:05:13 Author: thestinger Revision: 125912
upgpkg: linux-grsec 3.18.2.201501132141-1 Added: linux-grsec/trunk/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch Modified: linux-grsec/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch | 79 ++++++++++ PKGBUILD | 11 + 2 files changed, 87 insertions(+), 3 deletions(-) Added: 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch =================================================================== --- 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch (rev 0) +++ 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch 2015-01-14 12:05:13 UTC (rev 125912) @@ -0,0 +1,79 @@ +From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001 +From: Daniel Vetter <daniel.vet...@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 <ch...@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.vet...@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 <ch...@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: sta...@vger.kernel.org # requires c4d69da167fa967749a and v3.8 +Cc: Chris Wilson <ch...@chris-wilson.co.uk> +Signed-off-by: Daniel Vetter <daniel.vet...@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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-14 11:48:22 UTC (rev 125911) +++ PKGBUILD 2015-01-14 12:05:13 UTC (rev 125912) @@ -9,7 +9,7 @@ _srcname=linux-3.18 _pkgver=3.18.2 _grsecver=3.0 -_timestamp=201501120821 +_timestamp=201501132141 _grsec_patch="grsecurity-$_grsecver-$_pkgver-$_timestamp.patch" pkgver=$_pkgver.$_timestamp pkgrel=1 @@ -29,17 +29,19 @@ # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' + '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch' ) sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd' 'SKIP' '927a30c152a193d22242de21b99c9765fb0086b0aa3fabd31938ffc6e1b3f37c' 'SKIP' - '2f7245b0cda85e646298973efeda073d9caff53d6c0eb8b6b5546e2e86f1db90' + '7e2e0975d94bca2c0b9e197b2b403a284fb760d3d2733976848342a6f423b589' 'SKIP' '3730ac2c05934cdfa5f82001c3815b7ea307de2b57f38b4871fd1f73bb3bb0df' '8962b42de4526ce7252b51825fd9a9f2518d799b057650a4bbe3fb9cf05977d9' 'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -57,6 +59,9 @@ # 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)