diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-08-19 01:37:56 +0200 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-27 11:43:04 -0700 |
commit | ed9d030d93c262c504ffafd9e92c5b705a5da7d8 (patch) | |
tree | f55a540efbc81c53e7983b05179feb95718acf60 /patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch | |
parent | 9bb8b700a4fa9de778d1a17c337382e48d3133fd (diff) |
backports: refresh on next-20130726
== ckmake-report.log ==
1 2.6.24 [ OK ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.89 [ OK ]
18 3.1.10 [ OK ]
19 3.10.5 [ OK ]
20 3.11-rc4 [ OK ]
21 3.2.50 [ OK ]
22 3.3.8 [ OK ]
23 3.4.56 [ OK ]
24 3.5.7 [ OK ]
25 3.6.11 [ OK ]
26 3.7.10 [ OK ]
27 3.8.13 [ OK ]
28 3.9.11 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch')
-rw-r--r-- | patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch b/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch index c983ced2..96333f87 100644 --- a/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch +++ b/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1665,7 +1665,11 @@ int i915_driver_load(struct drm_device * +@@ -1652,7 +1652,11 @@ int i915_driver_load(struct drm_device * return 0; out_gem_unload: @@ -12,7 +12,7 @@ unregister_shrinker(&dev_priv->mm.inactive_shrinker); if (dev->pdev->msi_enabled) -@@ -1699,7 +1703,11 @@ int i915_driver_unload(struct drm_device +@@ -1686,7 +1690,11 @@ int i915_driver_unload(struct drm_device i915_teardown_sysfs(dev); @@ -26,7 +26,7 @@ mutex_lock(&dev->struct_mutex); --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -53,10 +53,15 @@ static void i915_gem_object_update_fence +@@ -54,10 +54,15 @@ static void i915_gem_object_update_fence struct drm_i915_fence_reg *fence, bool enable); @@ -42,7 +42,7 @@ static long i915_gem_purge(struct drm_i915_private *dev_priv, long target); static long i915_gem_shrink_all(struct drm_i915_private *dev_priv); static void i915_gem_object_truncate(struct drm_i915_gem_object *obj); -@@ -4411,8 +4416,12 @@ i915_gem_load(struct drm_device *dev) +@@ -4409,8 +4414,12 @@ i915_gem_load(struct drm_device *dev) dev_priv->mm.interruptible = true; @@ -55,7 +55,7 @@ dev_priv->mm.inactive_shrinker.seeks = DEFAULT_SEEKS; register_shrinker(&dev_priv->mm.inactive_shrinker); } -@@ -4635,8 +4644,14 @@ static bool mutex_is_locked_by(struct mu +@@ -4633,8 +4642,14 @@ static bool mutex_is_locked_by(struct mu #endif } @@ -70,7 +70,7 @@ { struct drm_i915_private *dev_priv = container_of(shrinker, -@@ -4646,7 +4661,12 @@ i915_gem_inactive_count(struct shrinker +@@ -4644,7 +4659,12 @@ i915_gem_inactive_count(struct shrinker struct i915_address_space *vm = &dev_priv->gtt.base; struct drm_i915_gem_object *obj; bool unlock = true; @@ -83,7 +83,7 @@ if (!mutex_trylock(&dev->struct_mutex)) { if (!mutex_is_locked_by(&dev->struct_mutex, current)) -@@ -4658,6 +4678,17 @@ i915_gem_inactive_count(struct shrinker +@@ -4656,6 +4676,17 @@ i915_gem_inactive_count(struct shrinker unlock = false; } @@ -101,7 +101,7 @@ count = 0; list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) if (obj->pages_pin_count == 0) -@@ -4671,6 +4702,7 @@ i915_gem_inactive_count(struct shrinker +@@ -4669,6 +4700,7 @@ i915_gem_inactive_count(struct shrinker return count; } @@ -109,7 +109,7 @@ static unsigned long i915_gem_inactive_scan(struct shrinker *shrinker, struct shrink_control *sc) { -@@ -4704,3 +4736,4 @@ i915_gem_inactive_scan(struct shrinker * +@@ -4702,3 +4734,4 @@ i915_gem_inactive_scan(struct shrinker * mutex_unlock(&dev->struct_mutex); return freed; } |