diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-13 15:18:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-14 14:55:06 +1000 |
| commit | 9360bd1112d8874d21942e2ae74f5416b00a8db6 (patch) | |
| tree | 07094b444fc4fab30a295d0b01570de98246089d | |
| parent | 5d216f6013d54a6085d5e499407aec6d67e79990 (diff) | |
| download | op-kernel-dev-9360bd1112d8874d21942e2ae74f5416b00a8db6.zip op-kernel-dev-9360bd1112d8874d21942e2ae74f5416b00a8db6.tar.gz | |
drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -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 c60f65a..78a27f8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -308,7 +308,8 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence, list_for_each_safe(entry, tmp, list) { nvbo = list_entry(entry, struct nouveau_bo, entry); - nouveau_bo_fence(nvbo, fence); + if (likely(fence)) + nouveau_bo_fence(nvbo, fence); if (unlikely(nvbo->validate_mapped)) { ttm_bo_kunmap(&nvbo->kmap); |
