From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 2/4] drm/i915: Unbind the fb Date: Fri, 31 May 2013 11:28:46 -0700 Message-ID: <1370024928-3553-2-git-send-email-ben@bwidawsk.net> References: <1370024928-3553-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from shiva.localdomain (unknown [209.20.75.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BBE1E5CE2 for ; Fri, 31 May 2013 11:26:17 -0700 (PDT) In-Reply-To: <1370024928-3553-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel GFX Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org This is the only place I could find where we don't already unbind the object before freeing it. This change will allow us to have a nice assertion on free about whether or not an object still has pinned pages. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_fb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 6b7c3ca..cd92889 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -209,6 +209,7 @@ static void intel_fbdev_destroy(struct drm_device *dev, drm_framebuffer_unregister_private(&ifb->base); drm_framebuffer_cleanup(&ifb->base); if (ifb->obj) { + i915_gem_object_unbind(to_intel_bo(&ifb->obj->base)); drm_gem_object_unreference_unlocked(&ifb->obj->base); ifb->obj = NULL; } -- 1.8.3