| From 9360bd1112d8874d21942e2ae74f5416b00a8db6 Mon Sep 17 00:00:00 2001 |
| From: Ben Skeggs <bskeggs@redhat.com> |
| Date: Wed, 13 Nov 2013 15:18:32 +1000 |
| Subject: drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence |
| |
| From: Ben Skeggs <bskeggs@redhat.com> |
| |
| commit 9360bd1112d8874d21942e2ae74f5416b00a8db6 upstream. |
| |
| Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/nouveau/nouveau_gem.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/nouveau/nouveau_gem.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c |
| @@ -287,7 +287,8 @@ validate_fini_list(struct list_head *lis |
| 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); |
