diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-04-02 14:07:48 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-04-02 14:07:48 +0100 |
| commit | 1cc2008d2ffee849f28ee1de08f7cc207c8af6cb (patch) | |
| tree | a37f6668a8515cb85e0f6bcdc8e685ebab2b1d4f | |
| parent | e8f52e6b9528a8b483d30a0ca55e3b441fa4e170 (diff) | |
| download | linux-stable-queue-1cc2008d2ffee849f28ee1de08f7cc207c8af6cb.tar.gz | |
Drop i915 patch that probably doesn't make sense for 3.16
| -rw-r--r-- | queue-3.16/drm-i915-mark-pin-flags-as-u64.patch | 41 | ||||
| -rw-r--r-- | queue-3.16/series | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/queue-3.16/drm-i915-mark-pin-flags-as-u64.patch b/queue-3.16/drm-i915-mark-pin-flags-as-u64.patch deleted file mode 100644 index c5092ccb..00000000 --- a/queue-3.16/drm-i915-mark-pin-flags-as-u64.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 2 Nov 2018 16:12:09 +0000 -Subject: drm/i915: Mark pin flags as u64 - -commit 83b466b1dc5f0b4d33f0a901e8b00197a8f3582d upstream. - -Since the flags are being used to operate on a u64 variable, they too -need to be marked as such so that the inverses are full width (and not -zero extended on 32b kernels and bdw+). - -Reported-by: Sergii Romantsov <sergii.romantsov@globallogic.com> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> -Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> -Link: https://patchwork.freedesktop.org/patch/msgid/20181102161232.17742-2-chris@chris-wilson.co.uk -[bwh: Backported to 3.16: - - The available flags and bit numbers are different here - - Also fix PIN_OFFSET_MASK (as done upstream by commits f51455d442c0 and - 9125963a9494) - - Adjust filename, context] -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -2169,11 +2169,11 @@ void i915_init_vm(struct drm_i915_privat - void i915_gem_free_object(struct drm_gem_object *obj); - void i915_gem_vma_destroy(struct i915_vma *vma); - --#define PIN_MAPPABLE 0x1 --#define PIN_NONBLOCK 0x2 --#define PIN_GLOBAL 0x4 --#define PIN_OFFSET_BIAS 0x8 --#define PIN_OFFSET_MASK (~4095) -+#define PIN_MAPPABLE BIT_ULL(0) -+#define PIN_NONBLOCK BIT_ULL(1) -+#define PIN_GLOBAL BIT_ULL(2) -+#define PIN_OFFSET_BIAS BIT_ULL(3) -+#define PIN_OFFSET_MASK (-4096ULL) - int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj, - struct i915_address_space *vm, - uint32_t alignment, diff --git a/queue-3.16/series b/queue-3.16/series index cc5eab27..0d27e046 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -1,4 +1,3 @@ -drm-i915-mark-pin-flags-as-u64.patch wireless-airo-potential-buffer-overflow-in-sprintf.patch drm-i915-ringbuffer-delay-after-emit_invalidate-for-gen4-gen5.patch x86-pci-fix-broadcom-cnb20le-unintended-sign-extension-redux.patch |