git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_overlay.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
index
5b6eabe
..
ad566c8
100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
@@
-118,7
+118,7
@@
static int vmw_dmabuf_pin_in_vram(struct vmw_private *dev_priv,
if (pin)
overlay_placement = &vmw_vram_ne_placement;
- ret = ttm_bo_validate(bo, overlay_placement, interruptible, false);
+ ret = ttm_bo_validate(bo, overlay_placement, interruptible, false
, false
);
ttm_bo_unreserve(bo);