From patchwork Mon Dec 10 23:07:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1860511 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 CEB233FCA5 for ; Mon, 10 Dec 2012 23:08:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C92EE62A9 for ; Mon, 10 Dec 2012 15:08:03 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C4FDE6246 for ; Mon, 10 Dec 2012 15:07:53 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so1860636eek.36 for ; Mon, 10 Dec 2012 15:07:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=uLou8Fsh0D8K1PaF3C4fI+IXNRm49QE6iIkDsU4Tzqg=; b=X5nFySVE6fhyUzcWJuBZmC/u80dVAWoKzElZ/SL4cief7GyylTK9FiRpzT4xwRV6YN 0VHSXD4Uaw7w6Md3wSAcQFkEiMVnheXkUdQjA4KFpmg5Kdnyx3/SUFm/zvk0B2wiVGo+ qbP0Z/IWlEaJkN9DHXsW/PTIr1xArRd50V+FA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=uLou8Fsh0D8K1PaF3C4fI+IXNRm49QE6iIkDsU4Tzqg=; b=DJv+ovf4YopZJhBRBhAWK+MfdnPGndbSMCC0GlVYyIj5d7RO0izG6XJVe0BbD+isKw nmerzLB4khk3wUrU97exrTjNOKbTkuuZe0sLjriT4yLWQL2nOO/GIJkp7GXOrpbmTDm3 t33hwq3foAh8l0HSo8fkD0kbQ28tAgWBAiwdAzJd+7+acQSsQdD53cMJy2+QRXIY9zkR 9nteXQZi+arwXl2Pp3lA/QciaTKCh4rMktlHYO2GmDwawC5+/QiRMTrmIELJt5Jgg0bg BKyTKK/GNnMbtdu+zEXzu7mldcszrGh49XZSW4h9Co3cl7cf7WjlN2uIQzSKhb/88Ic3 7wVQ== Received: by 10.14.199.5 with SMTP id w5mr54429060een.31.1355180872008; Mon, 10 Dec 2012 15:07:52 -0800 (PST) Received: from biers.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id l3sm28045895eem.14.2012.12.10.15.07.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Dec 2012 15:07:50 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 11 Dec 2012 00:07:45 +0100 Message-Id: <1355180865-3455-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQl6ye8FtjhZ47oxydYQNEgQ574i2IuPQy6uAcYLIJi9A7sKhcDH86s+Yy4GaxWJqt1baEsO Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: fixup overlay stolen memory leak 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 We need to clean up the overlay first, before taking down the stolen memory allocator. This regression has been introducec in commit 8040513870399f1cb032cb8bc805df5042fedcdf Author: Chris Wilson Date: Thu Nov 15 11:32:29 2012 +0000 drm/i915: Allocate overlay registers from stolen memory Cc: Chris Wilson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index ad488f6..532ad39 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1720,9 +1720,9 @@ int i915_driver_unload(struct drm_device *dev) mutex_unlock(&dev->struct_mutex); i915_gem_cleanup_aliasing_ppgtt(dev); i915_gem_cleanup_stolen(dev); - drm_mm_takedown(&dev_priv->mm.stolen); intel_cleanup_overlay(dev); + drm_mm_takedown(&dev_priv->mm.stolen); if (!I915_NEED_GFX_HWS(dev)) i915_free_hws(dev);