[Intel-gfx] [PATCH v2 3/7] drm/i915: use the memcpy_from_wc call from the drm

[Balasubramani Vivekanandan]

memcpy_from_wc functions in i915_memcpy.c will be removed and replaced
by the implementation in drm_cache.c.
Updated to use the functions provided by drm_cache.c.

Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanan...@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demar...@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_object.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c 
b/drivers/gpu/drm/i915/gem/i915_gem_object.c
index 372bc220faeb..5de657c3190e 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
@@ -438,6 +438,8 @@ i915_gem_object_read_from_page_iomap(struct 
drm_i915_gem_object *obj, u64 offset
 {
        void __iomem *src_map;
        void __iomem *src_ptr;
+       struct iosys_map src;
+
        dma_addr_t dma = i915_gem_object_get_dma_address(obj, offset >> 
PAGE_SHIFT);
 
        src_map = io_mapping_map_wc(&obj->mm.region->iomap,
@@ -445,8 +447,8 @@ i915_gem_object_read_from_page_iomap(struct 
drm_i915_gem_object *obj, u64 offset
                                    PAGE_SIZE);
 
        src_ptr = src_map + offset_in_page(offset);
-       if (!i915_memcpy_from_wc(dst, (void __force *)src_ptr, size))
-               memcpy_fromio(dst, src_ptr, size);
+       iosys_map_set_vaddr_iomem(&src, src_ptr);
+       drm_memcpy_from_wc_vaddr(dst, &src, size);
 
        io_mapping_unmap(src_map);
 }
-- 
2.25.1