drm/nouveau: specify if interruptible wait is desired in nouveau_fence_sync
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 16 Sep 2014 09:15:07 +0000 (11:15 +0200)
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 30 Sep 2014 12:04:00 +0000 (14:04 +0200)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_fence.c
drivers/gpu/drm/nouveau/nouveau_fence.h
drivers/gpu/drm/nouveau/nouveau_gem.c

Simple merge
Simple merge