Merge drm/drm-next into drm-intel-next-queued

[uclinux-h8/linux.git] / drivers / gpu / drm / i915 / gem / i915_gem_phys.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 7fe9831..28147aa 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -27,7 +27,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
        void *dst;
        int i;
 
-       if (WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
+       if (GEM_WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
                return -EINVAL;
 
        /*
@@ -140,6 +140,7 @@ static void phys_release(struct drm_i915_gem_object *obj)
 }
 
 static const struct drm_i915_gem_object_ops i915_gem_phys_ops = {
+       .name = "i915_gem_object_phys",
        .get_pages = i915_gem_object_get_pages_phys,
        .put_pages = i915_gem_object_put_pages_phys,