diff options
| author | Maarten Lankhorst <m.b.lankhorst@gmail.com> | 2013-06-27 11:38:22 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-28 01:56:11 (GMT) |
| commit | 27f06b2dbb84cf44b9ff404db1b93f14796ba559 (patch) | |
| tree | d591dd1ce42326cb61b27f258d6665f03fccbfac /drivers/gpu/drm/nouveau/nouveau_gem.c | |
| parent | 1e2bd5f53b6282e711e9f074765911868f8e7dc1 (diff) | |
| download | linux-27f06b2dbb84cf44b9ff404db1b93f14796ba559.tar.xz | |
drm/nouveau: complain loudly if buffer is pinned during destruction
Shouldn't happen, and we invert the struct_mutex with reservation here,
potentially leading to deadlocks. Once reservations become lockdep annotated,
lockdep will go splat on this.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index b4b4d0c..7054706 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -50,7 +50,8 @@ nouveau_gem_object_del(struct drm_gem_object *gem) return; nvbo->gem = NULL; - if (unlikely(nvbo->pin_refcnt)) { + /* Lockdep hates you for doing reserve with gem object lock held */ + if (WARN_ON_ONCE(nvbo->pin_refcnt)) { nvbo->pin_refcnt = 1; nouveau_bo_unpin(nvbo); } |