projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c6c1c2
)
drm/nouveau: Synchronize buffer object moves in hardware.
author
Francisco Jerez
<currojerez@riseup.net>
Tue, 21 Sep 2010 17:02:01 +0000
(19:02 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 4 Oct 2010 23:59:22 +0000
(09:59 +1000)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bo.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 03d842a06b045508ae4967723baf74d15f28ada8..4e813638bdb75784096c7dd2ad71e8d4fd78b889 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bo.c
@@
-454,10
+454,15
@@
nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
if (ret)
return ret;
- ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,
- evict || (nvbo->channel &&
- nvbo->channel != chan),
+ if (nvbo->channel) {
+ ret = nouveau_fence_sync(fence, nvbo->channel);
+ if (ret)
+ goto out;
+ }
+
+ ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict,
no_wait_reserve, no_wait_gpu, new_mem);
+out:
nouveau_fence_unref((void *)&fence);
return ret;
}
This page took
0.03026 seconds
and
5
git commands to generate.