diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
| commit | 054f8fe34189a62a0b87700c062a18c3a8421615 (patch) | |
| tree | 805b9cc11d537a66870978b1ea51fc66c5a8f9a9 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
| parent | 53752ea210016b548cfc3898e6a5ea338fcb6c2c (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-17.03lsk-v3.18-17.02
Conflicts:
arch/x86/boot/compressed/misc.h
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 063b44817e08..ccc17703014e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -141,10 +141,11 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) obj->madv == I915_MADV_DONTNEED ? " purgeable" : ""); if (obj->base.name) seq_printf(m, " (name: %d)", obj->base.name); - list_for_each_entry(vma, &obj->vma_list, vma_link) + list_for_each_entry(vma, &obj->vma_list, vma_link) { if (vma->pin_count > 0) pin_count++; - seq_printf(m, " (pinned x %d)", pin_count); + } + seq_printf(m, " (pinned x %d)", pin_count); if (obj->pin_display) seq_printf(m, " (display)"); if (obj->fence_reg != I915_FENCE_REG_NONE) |