Message ID | 20130807075157.GQ22035@phenom.ffwll.local (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org> X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D59BFBF535 for <patchwork-dri-devel@patchwork.kernel.org>; Wed, 7 Aug 2013 07:52:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF716201ED for <patchwork-dri-devel@patchwork.kernel.org>; Wed, 7 Aug 2013 07:52:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DA734201EB for <patchwork-dri-devel@patchwork.kernel.org>; Wed, 7 Aug 2013 07:52:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D24A4E5DBC for <patchwork-dri-devel@patchwork.kernel.org>; Wed, 7 Aug 2013 00:52:06 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTP id F0816E5DBC for <dri-devel@lists.freedesktop.org>; Wed, 7 Aug 2013 00:51:51 -0700 (PDT) Received: by mail-wg0-f53.google.com with SMTP id c11so1219212wgh.20 for <dri-devel@lists.freedesktop.org>; Wed, 07 Aug 2013 00:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=Mkw0sEGpiMYIG84jQP3RzvszB8q0vDpcCXxktNrpOuE=; b=aBVDG9YquWgRTJqlrqIzRCr/Af7jSpHaQM822OymlHBnEjFehabSy/E/1fMYw0i9rR IcLasXwEtgsv+89mc+jShbx8wCmZi9pf0foDUegb3hMa/nXnwJrc3/zYRYk1fNBcdJIn k3YJ+zvjQZ47ZwzWy5bZvJUGqlK/cK6yXWhDs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=Mkw0sEGpiMYIG84jQP3RzvszB8q0vDpcCXxktNrpOuE=; b=ci/rdSIPHmXaJH0ttPzOYzaAmEyQoAIjfhuVxZaJScr5QFnn0YzvPvyycGs4AKo6Ln +QJJcLmW0WhJFEtt8SL3onqcJud8z+Kno4i7W35+93xq4LK5uTEdlsF0ALcEchJkprnW H91rpbVKBb1AfyehOIRZZS1Gm1twpopu2mmMW23tq7QGDsfNvkLZbiFelrHUx0hueSYs QU9SwOOL/7NFU7qpOKDjuNtIuBD2eu1e0VYbPadx5nFQ4JasvZNoSE0EYoiders7lAdA 1Z0OF3QauS5A+P/Bz4B63KLprrxs4jsUn+IAjtC981Ph3GqYiots1bj1Phw5xZv0bY4c 4rxA== X-Gm-Message-State: ALoCoQnvbXclv3QC6glOOEhxI8WOYShcvjfn9MW9GRIRfsbgxRc4t7ytHWjTrHUPnhY6JW/npHfi X-Received: by 10.180.11.233 with SMTP id t9mr1280593wib.41.1375861910823; Wed, 07 Aug 2013 00:51:50 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id a8sm10508780wie.6.2013.08.07.00.51.48 for <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 07 Aug 2013 00:51:49 -0700 (PDT) Date: Wed, 7 Aug 2013 09:51:57 +0200 From: Daniel Vetter <daniel@ffwll.ch> To: Dave Airlie <airlied@gmail.com> Subject: Re: [PULL] drm-intel-next Message-ID: <20130807075157.GQ22035@phenom.ffwll.local> References: <20130804192455.GA22035@phenom.ffwll.local> <CAPM=9tySQX2QT1wZZgRPbLu9VBFcJJg73XE3WCxkD2GzRQ7tHA@mail.gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <CAPM=9tySQX2QT1wZZgRPbLu9VBFcJJg73XE3WCxkD2GzRQ7tHA@mail.gmail.com> X-Operating-System: Linux phenom 3.11.0-rc2+ User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, DRI Development <dri-devel@lists.freedesktop.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <http://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 0d0a3b1..ba4dabc 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -423,7 +423,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, return obj; err_out: - drm_mm_put_block(stolen); + drm_mm_remove_node(stolen); + kfree(stolen); drm_gem_object_unreference(&obj->base); return NULL; }