diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-05-28 05:22:05 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-31 19:37:53 -0400 |
commit | 316ab13ae2ad603fd5e3a909524e68d98db1b1b6 (patch) | |
tree | a9a703faa698703959d2110ee908faf1ebf3fc39 | |
parent | 792778e8e058471e1909b78d7c5e6ab94962ff8e (diff) |
drm/vmwgfx: Print warnings in kernel log about bo pinning that fails.
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 06f431442e92..181f47222580 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
@@ -630,6 +630,10 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv, | |||
630 | goto err_unlock; | 630 | goto err_unlock; |
631 | 631 | ||
632 | ret = ttm_bo_validate(bo, &ne_placement, false, false, false); | 632 | ret = ttm_bo_validate(bo, &ne_placement, false, false, false); |
633 | |||
634 | /* Could probably bug on */ | ||
635 | WARN_ON(bo->offset != 0); | ||
636 | |||
633 | ttm_bo_unreserve(bo); | 637 | ttm_bo_unreserve(bo); |
634 | err_unlock: | 638 | err_unlock: |
635 | ttm_write_unlock(&vmw_priv->active_master->lock); | 639 | ttm_write_unlock(&vmw_priv->active_master->lock); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 250282fee9c8..b78dcf001858 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
@@ -640,6 +640,8 @@ static int vmw_framebuffer_dmabuf_pin(struct vmw_framebuffer *vfb) | |||
640 | 640 | ||
641 | vmw_overlay_resume_all(dev_priv); | 641 | vmw_overlay_resume_all(dev_priv); |
642 | 642 | ||
643 | WARN_ON(ret != 0); | ||
644 | |||
643 | return 0; | 645 | return 0; |
644 | } | 646 | } |
645 | 647 | ||