From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 11/12] drm/i915: Takedown drm_mm on failed
 gtt setup
Date: Tue, 26 Nov 2013 10:21:09 +0100
Message-ID: <20131126092109.GH27344@phenom.ffwll.local>
References: <1385402083-8719-1-git-send-email-benjamin.widawsky@intel.com>
	<1385402083-8719-12-git-send-email-benjamin.widawsky@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com
	[209.85.215.171])
	by gabe.freedesktop.org (Postfix) with ESMTP id 3F6AC105818
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 26 Nov 2013 01:20:28 -0800 (PST)
Received: by mail-ea0-f171.google.com with SMTP id h10so3317570eak.30
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 26 Nov 2013 01:20:27 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <1385402083-8719-12-git-send-email-benjamin.widawsky@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>, Ben Widawsky <ben@bwidawsk.net>
List-Id: intel-gfx@lists.freedesktop.org

On Mon, Nov 25, 2013 at 09:54:42AM -0800, Ben Widawsky wrote:
> This was found by code inspection. If the GTT setup fails then we are
> left without properly tearing down the drm_mm.
> 
> Hopefully this never happens.
> 
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 6388706..d85bc3e 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4504,6 +4504,7 @@ int i915_gem_init(struct drm_device *dev)
>  	mutex_unlock(&dev->struct_mutex);
>  	if (ret) {
>  		i915_gem_cleanup_aliasing_ppgtt(dev);
> +		drm_mm_takedown(&dev_priv->gtt.base.mm);

Sprinkling stuff all over the place feels bad, I guess our gem init code
is ripe for an overhaul. I've pulled this in anyway.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch