From owner-svn-src-all@freebsd.org  Fri Mar 11 21:00:15 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C41F1ACD9F9;
 Fri, 11 Mar 2016 21:00:15 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 94B801513;
 Fri, 11 Mar 2016 21:00:15 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BL0EiP058960;
 Fri, 11 Mar 2016 21:00:14 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BL0EXP058959;
 Fri, 11 Mar 2016 21:00:14 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201603112100.u2BL0EXP058959@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
Date: Fri, 11 Mar 2016 21:00:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296681 - head/sys/dev/drm2/i915
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2016 21:00:15 -0000

Author: dumbbell
Date: Fri Mar 11 21:00:14 2016
New Revision: 296681
URL: https://svnweb.freebsd.org/changeset/base/296681

Log:
  drm/i915: Fix malloc type in i915_gem_object_bind_to_gtt()
  
  drm_mm.c expects DRM_MEM_MM, not DRM_I915_GEM.

Modified:
  head/sys/dev/drm2/i915/i915_gem.c

Modified: head/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem.c	Fri Mar 11 20:43:02 2016	(r296680)
+++ head/sys/dev/drm2/i915/i915_gem.c	Fri Mar 11 21:00:14 2016	(r296681)
@@ -3263,7 +3263,7 @@ i915_gem_object_bind_to_gtt(struct drm_i
 
 	i915_gem_object_pin_pages(obj);
 
-	node = malloc(sizeof(*node), DRM_I915_GEM, M_NOWAIT | M_ZERO);
+	node = malloc(sizeof(*node), DRM_MEM_MM, M_NOWAIT | M_ZERO);
 	if (node == NULL) {
 		i915_gem_object_unpin_pages(obj);
 		return -ENOMEM;
@@ -3286,7 +3286,7 @@ i915_gem_object_bind_to_gtt(struct drm_i
 			goto search_free;
 
 		i915_gem_object_unpin_pages(obj);
-		free(node, DRM_I915_GEM);
+		free(node, DRM_MEM_MM);
 		return ret;
 	}
 	if (WARN_ON(!i915_gem_valid_gtt_space(dev, node, obj->cache_level))) {