[PATCH] drm/i915: Add rpm get/put in i915_shrinker_oom

[PATCH] drm/i915: Add rpm get/put in i915_shrinker_oom

[Mika Kuoppala]

From: Praveen Paneri <praveen.paneri@intel.com>

i915_gem_shrink_all() will scan the bound list only if device is not
suspended but in OOM scenarios it becomes absolutely necessary to
release as much memory as possible. So, adding rpm get/put in
i915_shrinker_oom() to ensure shrinking of bound objects in OOM
scenario.

Signed-off-by: Praveen Paneri <praveen.paneri@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
index 3bc292d626ff..4457f86c81ef 100644
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@ -325,7 +325,9 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)
 	was_interruptible = dev_priv->mm.interruptible;
 	dev_priv->mm.interruptible = false;
 
+	intel_runtime_pm_get(dev_priv);
 	freed_pages = i915_gem_shrink_all(dev_priv);
+	intel_runtime_pm_put(dev_priv);
 
 	dev_priv->mm.interruptible = was_interruptible;
 
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: Add rpm get/put in i915_shrinker_oom

[Patchwork]

== Series Details ==

Series: drm/i915: Add rpm get/put in i915_shrinker_oom
URL   : https://patchwork.freedesktop.org/series/5039/
State : failure

== Summary ==

Series 5039v1 drm/i915: Add rpm get/put in i915_shrinker_oom
http://patchwork.freedesktop.org/api/1.0/series/5039/revisions/1/mbox/

Test gem_exec_suspend:
        Subgroup basic-s3:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> INCOMPLETE (bdw-nuci7)
Test pm_rpm:
        Subgroup basic-rte:
                dmesg-warn -> PASS       (bsw-nuc-2)

bdw-nuci7        total:194  pass:181  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:196  pass:175  dwarn:0   dfail:0   fail:0   skip:21 
bsw-nuc-2        total:196  pass:158  dwarn:1   dfail:0   fail:0   skip:37 
byt-nuc          total:196  pass:161  dwarn:0   dfail:0   fail:0   skip:35 
hsw-brixbox      total:196  pass:174  dwarn:0   dfail:0   fail:0   skip:22 
hsw-gt2          total:93   pass:86   dwarn:0   dfail:0   fail:0   skip:6  
skl-i7k-2        total:196  pass:173  dwarn:0   dfail:0   fail:0   skip:23 
snb-dellxps      total:14   pass:12   dwarn:0   dfail:0   fail:0   skip:1  

Results at /archive/results/CI_IGT_test/Patchwork_1747/

65496a062fd94984d5c6c6cfcee1caeac2d6e5f5 drm-intel-nightly: 2016y-03m-31d-08h-14m-17s UTC integration manifest
85a746316d41d608d8bd2626dc41437dc391675a drm/i915: Add rpm get/put in i915_shrinker_oom

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx