projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/nouveau: always wait for the exclusive fence
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_fence.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index
e5dcbf6
..
05d0b3e
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_fence.c
@@
-355,10
+355,10
@@
nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e
return ret;
}
return ret;
}
- fobj = dma_resv_
get
_list(resv);
- fence = dma_resv_
get_excl
(resv);
+ fobj = dma_resv_
shared
_list(resv);
+ fence = dma_resv_
excl_fence
(resv);
- if (fence
&& (!exclusive || !fobj || !fobj->shared_count)
) {
+ if (fence) {
struct nouveau_channel *prev = NULL;
bool must_wait = true;
struct nouveau_channel *prev = NULL;
bool must_wait = true;