From: sourab.gupta@intel.com Subject: [PATCH 3/3] drm/i915: Memory node free handling on truncation of stolen obj Date: Fri, 7 Mar 2014 15:29:27 +0530 Message-ID: <1394186367-20339-4-git-send-email-sourab.gupta@intel.com> References: <1394186367-20339-1-git-send-email-sourab.gupta@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 01B6BFAE93 for ; Fri, 7 Mar 2014 01:59:30 -0800 (PST) In-Reply-To: <1394186367-20339-1-git-send-email-sourab.gupta@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , Sourab Gupta , Chris Wilson List-Id: intel-gfx@lists.freedesktop.org From: Sourab Gupta While we are freeing the purgeable stolen object, the memory node has to be freed so as to make space for the new object. Signed-off-by: Sourab Gupta --- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index d092bf3..ae12074 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -411,10 +411,8 @@ found: ret = i915_gem_object_put_pages(obj); if (ret == 0) { + i915_gem_object_release_stolen(obj); obj->madv = __I915_MADV_PURGED; - - kfree(obj->stolen); - obj->stolen = NULL; } else i915_gem_object_pin_pages(obj); } -- 1.7.9.5