drm/ttm: cleanup BO size handling v3

[linux-2.6-microblaze.git] / drivers / gpu / drm / vmwgfx / vmwgfx_execbuf.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index e67e2e8..6c01600 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -1042,7 +1042,7 @@ static int vmw_query_bo_switch_prepare(struct vmw_private *dev_priv,
 
        if (unlikely(new_query_bo != sw_context->cur_query_bo)) {
 
-               if (unlikely(new_query_bo->base.num_pages > 4)) {
+               if (unlikely(new_query_bo->base.mem.num_pages > 4)) {
                        VMW_DEBUG_USER("Query buffer too large.\n");
                        return -EINVAL;
                }
@@ -1541,7 +1541,7 @@ static int vmw_cmd_dma(struct vmw_private *dev_priv,
                return ret;
 
        /* Make sure DMA doesn't cross BO boundaries. */
-       bo_size = vmw_bo->base.num_pages * PAGE_SIZE;
+       bo_size = vmw_bo->base.base.size;
        if (unlikely(cmd->body.guest.ptr.offset > bo_size)) {
                VMW_DEBUG_USER("Invalid DMA offset.\n");
                return -EINVAL;