From c2fa94409f05ef38117041b6683f0afc40b13a01 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Fri, 1 Oct 2010 10:21:51 +0200 Subject: [PATCH] --- yaml --- r: 211215 b: refs/heads/master c: abb295f3b3db602f91accf58b526b30b48673af1 h: refs/heads/master i: 211213: b2cf9acaea45a9ea743a3fe0b36a7a36cc6f2d6c 211211: 31b8c317a043a6d1047016681ef57eaa3886e92e 211207: 7719823f48ee01a84011cfa9f90e17eb5c9060c1 211199: c08a8cbfbee65c8454b884ebb433b589c69f0f30 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0ee8823bdbca..da6e93e46a9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a28ee238bddfa48c5233543926af65a4445bf6 +refs/heads/master: abb295f3b3db602f91accf58b526b30b48673af1 diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 870967a97c15..409e172f4abf 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/trunk/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 */