projects
/
platform
/
upstream
/
xf86-video-intel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
64f1fbb
)
sna: Prefer using userptr for PutImage into large GPU bo
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 28 Nov 2013 13:03:54 +0000
(13:03 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 28 Nov 2013 13:03:54 +0000
(13:03 +0000)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/sna_accel.c
patch
|
blob
|
history
diff --git
a/src/sna/sna_accel.c
b/src/sna/sna_accel.c
index
8abdf84
..
9b54c5e
100644
(file)
--- a/
src/sna/sna_accel.c
+++ b/
src/sna/sna_accel.c
@@
-4209,7
+4209,9
@@
try_upload_blt(PixmapPtr pixmap, RegionRec *region,
assert(priv->gpu_bo);
assert(priv->gpu_bo->proxy == NULL);
- if (!__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo)) {
+ if ((priv->create & (KGEM_CAN_CREATE_GTT | KGEM_CAN_CREATE_LARGE)) == KGEM_CAN_CREATE_GTT &&
+ kgem_bo_can_map(&sna->kgem, priv->gpu_bo) &&
+ !__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo)) {
DBG(("%s: no, target is idle\n", __FUNCTION__));
return false;
}