Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 178a30c9 authored by Praveen Paneri's avatar Praveen Paneri Committed by Chris Wilson
Browse files

drm/i915: Unbind objects in shrinker only if device is runtime active 



When the system is running low on memory, gem shrinker is invoked.
In this process objects will be unbounded from GTT and unbinding process
will require access to GTT(GTTADR) and also to fence register potentially.
That requires a resume of gfx device, if suspended, in the shrinker path.
Considering the power leakage due to intermediate resume, perform unbinding
operation only if device is already runtime active.

v2: Use newly implemented intel_runtime_pm_get_if_in_use (Chris)

Signed-off-by: default avatarAkash Goel <akash.goel@intel.com>
Signed-off-by: default avatarPraveen Paneri <praveen.paneri@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1462178429-13449-1-git-send-email-praveen.paneri@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent a0cbe6a3

drivers/gpu/drm/i915/i915_gem_shrinker.c

+12 −0
Original line number Diff line number Diff line
@@ -133,6 +133,15 @@ i915_gem_shrink(struct drm_i915_private *dev_priv, 
	trace_i915_gem_shrink(dev_priv, target, flags);

	i915_gem_retire_requests(dev_priv->dev);



	/*

	 * Unbinding of objects will require HW access; Let us not wake the

	 * device just to recover a little memory. If absolutely necessary,

	 * we will force the wake during oom-notifier.

	 */

	if ((flags & I915_SHRINK_BOUND) &&

	    !intel_runtime_pm_get_if_in_use(dev_priv))

		flags &= ~I915_SHRINK_BOUND;



	/*

	 * As we may completely rewrite the (un)bound list whilst unbinding

	 * (due to retiring requests) we have to strictly process only
@@ -197,6 +206,9 @@ i915_gem_shrink(struct drm_i915_private *dev_priv, 
		list_splice(&still_in_list, phase->list);

	}



	if (flags & I915_SHRINK_BOUND)

		intel_runtime_pm_put(dev_priv);



	i915_gem_retire_requests(dev_priv->dev);



	return count;