diff options
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1300_linux-4.4.301.patch | 180 |
2 files changed, 184 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 53822338..c28b7561 100644 --- a/0000_README +++ b/0000_README @@ -1243,6 +1243,10 @@ Patch: 1299_linux-4.4.300.patch From: http://www.kernel.org Desc: Linux 4.4.300 +Patch: 1300_linux-4.4.301.patch +From: http://www.kernel.org +Desc: Linux 4.4.301 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1300_linux-4.4.301.patch b/1300_linux-4.4.301.patch new file mode 100644 index 00000000..5ccaefc1 --- /dev/null +++ b/1300_linux-4.4.301.patch @@ -0,0 +1,180 @@ +diff --git a/Makefile b/Makefile +index 29bb2f87dd2ad..3bf23154499e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 4 +-SUBLEVEL = 300 ++SUBLEVEL = 301 + EXTRAVERSION = + NAME = Blurry Fish Butt + +diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h +index adbbcaf14af67..8d7d102af52f4 100644 +--- a/drivers/gpu/drm/i915/i915_drv.h ++++ b/drivers/gpu/drm/i915/i915_drv.h +@@ -1719,6 +1719,8 @@ struct drm_i915_private { + + struct intel_uncore uncore; + ++ struct mutex tlb_invalidate_lock; ++ + struct i915_virtual_gpu vgpu; + + struct intel_guc guc; +@@ -2066,6 +2068,9 @@ struct drm_i915_gem_object { + */ + unsigned int active:I915_NUM_RINGS; + ++ unsigned long flags; ++#define I915_BO_WAS_BOUND_BIT 0 ++ + /** + * This is set if the object has been written to since last bound + * to the GTT +diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c +index f56af0aaafde5..ffce88930371e 100644 +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -2212,6 +2212,85 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj) + kfree(obj->pages); + } + ++#define _wait_for_us(COND, US, W) ({ \ ++ unsigned long timeout__ = jiffies + usecs_to_jiffies(US) + 1; \ ++ int ret__; \ ++ for (;;) { \ ++ bool expired__ = time_after(jiffies, timeout__); \ ++ if (COND) { \ ++ ret__ = 0; \ ++ break; \ ++ } \ ++ if (expired__) { \ ++ ret__ = -ETIMEDOUT; \ ++ break; \ ++ } \ ++ usleep_range((W), (W)*2); \ ++ } \ ++ ret__; \ ++}) ++ ++static int ++__intel_wait_for_register_fw(struct drm_i915_private *dev_priv, ++ u32 reg, ++ const u32 mask, ++ const u32 value, ++ const unsigned int timeout_us, ++ const unsigned int timeout_ms) ++{ ++#define done ((I915_READ_FW(reg) & mask) == value) ++ int ret = _wait_for_us(done, timeout_us, 2); ++ if (ret) ++ ret = wait_for(done, timeout_ms); ++ return ret; ++#undef done ++} ++ ++static void invalidate_tlbs(struct drm_i915_private *dev_priv) ++{ ++ static const u32 gen8_regs[] = { ++ [RCS] = GEN8_RTCR, ++ [VCS] = GEN8_M1TCR, ++ [VCS2] = GEN8_M2TCR, ++ [VECS] = GEN8_VTCR, ++ [BCS] = GEN8_BTCR, ++ }; ++ enum intel_ring_id id; ++ ++ if (INTEL_INFO(dev_priv)->gen < 8) ++ return; ++ ++ mutex_lock(&dev_priv->tlb_invalidate_lock); ++ intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); ++ ++ for (id = 0; id < I915_NUM_RINGS; id++) { ++ struct intel_engine_cs *engine = &dev_priv->ring[id]; ++ /* ++ * HW architecture suggest typical invalidation time at 40us, ++ * with pessimistic cases up to 100us and a recommendation to ++ * cap at 1ms. We go a bit higher just in case. ++ */ ++ const unsigned int timeout_us = 100; ++ const unsigned int timeout_ms = 4; ++ ++ if (!intel_ring_initialized(engine)) ++ continue; ++ ++ if (WARN_ON_ONCE(id >= ARRAY_SIZE(gen8_regs) || !gen8_regs[id])) ++ continue; ++ ++ I915_WRITE_FW(gen8_regs[id], 1); ++ if (__intel_wait_for_register_fw(dev_priv, ++ gen8_regs[id], 1, 0, ++ timeout_us, timeout_ms)) ++ DRM_ERROR_RATELIMITED("%s TLB invalidation did not complete in %ums!\n", ++ engine->name, timeout_ms); ++ } ++ ++ intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); ++ mutex_unlock(&dev_priv->tlb_invalidate_lock); ++} ++ + int + i915_gem_object_put_pages(struct drm_i915_gem_object *obj) + { +@@ -2230,6 +2309,14 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj) + * lists early. */ + list_del(&obj->global_list); + ++ if (test_and_clear_bit(I915_BO_WAS_BOUND_BIT, &obj->flags)) { ++ struct drm_i915_private *i915 = to_i915(obj->base.dev); ++ ++ intel_runtime_pm_get(i915); ++ invalidate_tlbs(i915); ++ intel_runtime_pm_put(i915); ++ } ++ + ops->put_pages(obj); + obj->pages = NULL; + +@@ -5050,6 +5137,8 @@ i915_gem_load(struct drm_device *dev) + i915_gem_shrinker_init(dev_priv); + + mutex_init(&dev_priv->fb_tracking.lock); ++ ++ mutex_init(&dev_priv->tlb_invalidate_lock); + } + + void i915_gem_release(struct drm_device *dev, struct drm_file *file) +diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c +index 65a53ee398b8e..b2bb0b268ea9c 100644 +--- a/drivers/gpu/drm/i915/i915_gem_gtt.c ++++ b/drivers/gpu/drm/i915/i915_gem_gtt.c +@@ -3538,6 +3538,9 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, + + vma->bound |= bind_flags; + ++ if (vma->obj) ++ set_bit(I915_BO_WAS_BOUND_BIT, &vma->obj->flags); ++ + return 0; + } + +diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h +index 603d8cdfc5f1f..33a9b80da5dc8 100644 +--- a/drivers/gpu/drm/i915/i915_reg.h ++++ b/drivers/gpu/drm/i915/i915_reg.h +@@ -1592,6 +1592,12 @@ enum skl_disp_power_wells { + + #define GEN7_TLB_RD_ADDR 0x4700 + ++#define GEN8_RTCR 0x4260 ++#define GEN8_M1TCR 0x4264 ++#define GEN8_M2TCR 0x4268 ++#define GEN8_BTCR 0x426c ++#define GEN8_VTCR 0x4270 ++ + #if 0 + #define PRB0_TAIL 0x02030 + #define PRB0_HEAD 0x02034 |