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 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_resource.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index
941e5ff
..
252501a
100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@
-972,7
+972,7
@@
void vmw_resource_unreserve(struct vmw_resource *res,
if (new_backup)
res->backup_offset = new_backup_offset;
- if (!res->func->may_evict)
+ if (!res->func->may_evict
|| res->id == -1
)
return;
write_lock(&dev_priv->resource_lock);