summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-07-31 16:59:55 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-05 19:04:07 +0200
commit31a46c9c092afc6558e7be7eaa42eb9bd4d3de8b (patch)
tree7da4bcf61c21512caeef3e209c0e8814bc575dd5
parentfc8c067eee712b274e554be5cc87c79366cc5ad2 (diff)
drm/i915: Rework drop caches for checkpatch
With an upcoming change to bind, to make checkpatch happy and keep the code clean, we need to rework this code a bit. This should have no functional impact. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> [danvet: Add the newline Chris requested.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index eed2f4ca9a7..04debcedac2 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1784,12 +1784,14 @@ i915_drop_caches_set(void *data, u64 val)
if (val & DROP_BOUND) {
list_for_each_entry_safe(obj, next, &vm->inactive_list,
- mm_list)
- if (obj->pin_count == 0) {
- ret = i915_gem_object_unbind(obj);
- if (ret)
- goto unlock;
- }
+ mm_list) {
+ if (obj->pin_count)
+ continue;
+
+ ret = i915_gem_object_unbind(obj);
+ if (ret)
+ goto unlock;
+ }
}
if (val & DROP_UNBOUND) {