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

Commit e3118a03 authored by Chris Wilson's avatar Chris Wilson Committed by Rodrigo Vivi
Browse files

drm/i915/selftests: Disable shrinker across mmap-exhaustion 



For mmap-exhaustion, we deliberately put the system under a large amount
of pressure to ensure that we are able to reap mmap-offsets from dead
objects. If background activity does that reaping for us, that defeats
the purpose of the test and in some cases will fail our sanity checks
(because of the fake activity we use to prevent the idle worker).

Fixes: 932cac10 ("drm/i915/selftests: Prevent background reaping of acti
ve objects")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011103748.18387-1-chris@chris-wilson.co.uk


(cherry picked from commit 0b4bf7ca)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 04144445

drivers/gpu/drm/i915/selftests/i915_gem_object.c

+3 −0
Original line number Diff line number Diff line
@@ -501,6 +501,8 @@ static bool assert_mmap_offset(struct drm_i915_private *i915, 


static void disable_retire_worker(struct drm_i915_private *i915)

{

	i915_gem_shrinker_unregister(i915);



	mutex_lock(&i915->drm.struct_mutex);

	if (!i915->gt.active_requests++) {

		intel_runtime_pm_get(i915);
@@ -613,6 +615,7 @@ static int igt_mmap_offset_exhaustion(void *arg) 
	else

		queue_delayed_work(i915->wq, &i915->gt.idle_work, 0);

	mutex_unlock(&i915->drm.struct_mutex);

	i915_gem_shrinker_register(i915);

	return err;

err_obj:

	i915_gem_object_put(obj);