From patchwork Fri May 31 18:28:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 2645231 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 4433A3FD4E for ; Fri, 31 May 2013 18:26:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3704BE5F8B for ; Fri, 31 May 2013 11:26:53 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) Received: by shiva.localdomain (Postfix, from userid 1005) id 134BE8874E; Fri, 31 May 2013 18:26:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on shiva.chad-versace.us X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=unavailable version=3.3.2 Received: from lundgren.jf.intel.com (jfdmzpr05-ext.jf.intel.com [134.134.139.74]) by shiva.localdomain (Postfix) with ESMTPSA id 3FFC288748; Fri, 31 May 2013 18:26:14 +0000 (UTC) From: Ben Widawsky To: Intel GFX Date: Fri, 31 May 2013 11:28:46 -0700 Message-Id: <1370024928-3553-2-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1370024928-3553-1-git-send-email-ben@bwidawsk.net> References: <1370024928-3553-1-git-send-email-ben@bwidawsk.net> Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 2/4] drm/i915: Unbind the fb X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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; }