diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
| commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
| tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |
| parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
| parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) | |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_resource.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index bc784254e78e..407d7f9fe8a8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -970,7 +970,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); |