diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-09 11:03:15 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-10-01 11:11:15 +0200 |
| commit | bb6178b04f5ef6f62990306713fb6afdf5d8bc56 (patch) | |
| tree | 22e515525032c8157cc46e4c0481b25ff80e352e /drivers/gpu/drm/nouveau/nouveau_fence.c | |
| parent | f4f4e3e3e9f3bde110067b9e4487cb267d90055a (diff) | |
| download | blackbird-obmc-linux-bb6178b04f5ef6f62990306713fb6afdf5d8bc56.tar.gz blackbird-obmc-linux-bb6178b04f5ef6f62990306713fb6afdf5d8bc56.zip | |
drm/nouveau: export reservation_object from dmabuf to ttm
Adds an extra argument to nouveau_bo_new, which is only used in nouveau_prime.c.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index dba1f7e15cb6..515cd9aebb99 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -216,8 +216,12 @@ nouveau_fence_work(struct fence *fence, work = kmalloc(sizeof(*work), GFP_KERNEL); if (!work) { + /* + * this might not be a nouveau fence any more, + * so force a lazy wait here + */ WARN_ON(nouveau_fence_wait((struct nouveau_fence *)fence, - false, false)); + true, false)); goto err; } |
