diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-10-01 10:21:51 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-01 13:08:55 +0200 |
| commit | abb295f3b3db602f91accf58b526b30b48673af1 (patch) | |
| tree | a4882b7f01e7e5808a5023ac9897d289fe8b4e29 /drivers | |
| parent | vmwgfx: Remove initialisation of dev::devname (diff) | |
| download | linux-abb295f3b3db602f91accf58b526b30b48673af1.tar.xz linux-abb295f3b3db602f91accf58b526b30b48673af1.zip | |
vmwgfx: Fix fb VRAM pinning failure due to fragmentation
If the soon-to-be scanout buffer is partly covering the intended
VRAM region, move and pin will fail. In that case, just move it out
to system before attempting to move it in again.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 870967a97c15..409e172f4abf 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c @@ -615,6 +615,11 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv, if (unlikely(ret != 0)) goto err_unlock; + if (bo->mem.mem_type == TTM_PL_VRAM && + bo->mem.mm_node->start < bo->num_pages) + (void) ttm_bo_validate(bo, &vmw_sys_placement, false, + false, false); + ret = ttm_bo_validate(bo, &ne_placement, false, false, false); /* Could probably bug on */ |