Merge tag 'ceph-for-5.12-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / intel_memory_region.h

diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 232490d..6ffc067 100644 (file)
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -51,21 +51,16 @@ enum intel_region_id {
        for (id = 0; id < ARRAY_SIZE((i915)->mm.regions); id++) \
                for_each_if((mr) = (i915)->mm.regions[id])
 
-/**
- * Memory regions encoded as type | instance
- */
-extern const u32 intel_region_map[];
-
 struct intel_memory_region_ops {
        unsigned int flags;
 
        int (*init)(struct intel_memory_region *mem);
        void (*release)(struct intel_memory_region *mem);
 
-       struct drm_i915_gem_object *
-       (*create_object)(struct intel_memory_region *mem,
-                        resource_size_t size,
-                        unsigned int flags);
+       int (*init_object)(struct intel_memory_region *mem,
+                          struct drm_i915_gem_object *obj,
+                          resource_size_t size,
+                          unsigned int flags);
 };
 
 struct intel_memory_region {