diff options
| author | Chris Wilson | 2014-10-08 12:25:17 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-10-24 16:34:02 +0200 |
| commit | bb9059d3a034d56f57e037d7866afeef18876283 (patch) | |
| tree | 0a43696f0001f7e9317113fdfeb26bcb86c6ec25 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Report the current number of bytes freed during oom (diff) | |
| download | kernel-qcow2-linux-bb9059d3a034d56f57e037d7866afeef18876283.tar.gz kernel-qcow2-linux-bb9059d3a034d56f57e037d7866afeef18876283.tar.xz kernel-qcow2-linux-bb9059d3a034d56f57e037d7866afeef18876283.zip | |
drm/i915: Suppress no action noise from oom shrinker
If we are not able to free anything (the shrinker leaves nothing on the
global object lists), do not log anything. This is useful when other
subsystems are being stress-tested for their oom behaviour and i915.ko
is shouting into the logs about doing nothing.
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index dd25a546fb8e..e9c783d55612 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -5307,8 +5307,9 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) if (unlock) mutex_unlock(&dev->struct_mutex); - pr_info("Purging GPU memory, %lu bytes freed, %lu bytes still pinned.\n", - freed_pages << PAGE_SHIFT, pinned); + if (freed_pages || unbound || bound) + pr_info("Purging GPU memory, %lu bytes freed, %lu bytes still pinned.\n", + freed_pages << PAGE_SHIFT, pinned); if (unbound || bound) pr_err("%lu and %lu bytes still available in the " "bound and unbound GPU page lists.\n", |