drm/i915/gem: Support discontiguous lmem object maps

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gem / i915_gem_lmem.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 520cc9c..70543c8 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -16,46 +16,6 @@ const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = {
        .release = i915_gem_object_release_memory_region,
 };
 
-/* XXX: Time to vfunc your life up? */
-void __iomem *
-i915_gem_object_lmem_io_map_page(struct drm_i915_gem_object *obj,
-                                unsigned long n)
-{
-       resource_size_t offset;
-
-       offset = i915_gem_object_get_dma_address(obj, n);
-       offset -= obj->mm.region->region.start;
-
-       return io_mapping_map_wc(&obj->mm.region->iomap, offset, PAGE_SIZE);
-}
-
-void __iomem *
-i915_gem_object_lmem_io_map_page_atomic(struct drm_i915_gem_object *obj,
-                                       unsigned long n)
-{
-       resource_size_t offset;
-
-       offset = i915_gem_object_get_dma_address(obj, n);
-       offset -= obj->mm.region->region.start;
-
-       return io_mapping_map_atomic_wc(&obj->mm.region->iomap, offset);
-}
-
-void __iomem *
-i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,
-                           unsigned long n,
-                           unsigned long size)
-{
-       resource_size_t offset;
-
-       GEM_BUG_ON(!i915_gem_object_is_contiguous(obj));
-
-       offset = i915_gem_object_get_dma_address(obj, n);
-       offset -= obj->mm.region->region.start;
-
-       return io_mapping_map_wc(&obj->mm.region->iomap, offset, size);
-}
-
 bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
 {
        return obj->ops == &i915_gem_lmem_obj_ops;