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))) {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to