diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-10 21:18:13 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-10 21:18:13 -0500 |
| commit | 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch) | |
| tree | a8506b9b15ed9a31c2171fc7b461ef52453307b0 /drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |
| parent | 9ba874506b7b3883d78b8cad61eba39c4bb09885 (diff) | |
| parent | a6c7fdd29350a74ba5f76809436de9c3d6763009 (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_fb.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 641dde76ada1..4f4f6432be8b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
| @@ -649,14 +649,6 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv, | |||
| 649 | if (unlikely(ret != 0)) | 649 | if (unlikely(ret != 0)) |
| 650 | goto err_unlock; | 650 | goto err_unlock; |
| 651 | 651 | ||
| 652 | if (vmw_bo->gmr_bound) { | ||
| 653 | vmw_gmr_unbind(vmw_priv, vmw_bo->gmr_id); | ||
| 654 | spin_lock(&bo->glob->lru_lock); | ||
| 655 | ida_remove(&vmw_priv->gmr_ida, vmw_bo->gmr_id); | ||
| 656 | spin_unlock(&bo->glob->lru_lock); | ||
| 657 | vmw_bo->gmr_bound = NULL; | ||
| 658 | } | ||
| 659 | |||
| 660 | ret = ttm_bo_validate(bo, &ne_placement, false, false); | 652 | ret = ttm_bo_validate(bo, &ne_placement, false, false); |
| 661 | ttm_bo_unreserve(bo); | 653 | ttm_bo_unreserve(bo); |
| 662 | err_unlock: | 654 | err_unlock: |