diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2009-07-01 15:01:36 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-07-07 11:52:52 -0700 |
| commit | a17458fc9d9edc98b7c5865cdc42681cf9059f1c (patch) | |
| tree | 362a72943c91da5120200e7b8c82b6a6b0013f40 /drivers | |
| parent | a01c75b338d7c743a8982011f01a4714ad2956de (diff) | |
| download | op-kernel-dev-a17458fc9d9edc98b7c5865cdc42681cf9059f1c.zip op-kernel-dev-a17458fc9d9edc98b7c5865cdc42681cf9059f1c.tar.gz | |
drm/i915: Move lock to more reasonable location
Make this consistent with the unlock statement. Also fix a
minor typo in debugfs formatting
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_debugfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c index a61d656..9a44bfc 100644 --- a/drivers/gpu/drm/i915/i915_gem_debugfs.c +++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c @@ -75,11 +75,10 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) case ACTIVE_LIST: seq_printf(m, "Active:\n"); lock = &dev_priv->mm.active_list_lock; - spin_lock(lock); head = &dev_priv->mm.active_list; break; case INACTIVE_LIST: - seq_printf(m, "Inctive:\n"); + seq_printf(m, "Inactive:\n"); head = &dev_priv->mm.inactive_list; break; case FLUSHING_LIST: @@ -91,6 +90,8 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) return 0; } + if (lock) + spin_lock(lock); list_for_each_entry(obj_priv, head, list) { struct drm_gem_object *obj = obj_priv->obj; |
