From: Thomas Hellstrom Subject: [PATCH 12/13] drm/vmwgfx: Print warnings in kernel log about bo pinning that fails. Date: Fri, 28 May 2010 11:22:05 +0200 Message-ID: <1275038526-3932-13-git-send-email-thellstrom@vmware.com> References: <1275038526-3932-1-git-send-email-thellstrom@vmware.com> <1275038526-3932-2-git-send-email-thellstrom@vmware.com> <1275038526-3932-3-git-send-email-thellstrom@vmware.com> <1275038526-3932-4-git-send-email-thellstrom@vmware.com> <1275038526-3932-5-git-send-email-thellstrom@vmware.com> <1275038526-3932-6-git-send-email-thellstrom@vmware.com> <1275038526-3932-7-git-send-email-thellstrom@vmware.com> <1275038526-3932-8-git-send-email-thellstrom@vmware.com> <1275038526-3932-9-git-send-email-thellstrom@vmware.com> <1275038526-3932-10-git-send-email-thellstrom@vmware.com> <1275038526-3932-11-git-send-email-thellstrom@vmware.com> <1275038526-3932-12-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [65.115.85.69]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FBEE9EF8F for ; Fri, 28 May 2010 02:23:34 -0700 (PDT) In-Reply-To: <1275038526-3932-12-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: airlied@redhat.com Cc: Thomas Hellstrom , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org From: Jakob Bornecrantz Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 ++++ 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 06f4314..181f472 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, goto err_unlock; ret = ttm_bo_validate(bo, &ne_placement, false, false, false); + + /* Could probably bug on */ + WARN_ON(bo->offset != 0); + ttm_bo_unreserve(bo); err_unlock: 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 250282f..b78dcf0 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) vmw_overlay_resume_all(dev_priv); + WARN_ON(ret != 0); + return 0; } -- 1.6.2.5