drm/i915/gtt: Suppress warnings for dma_map_page

As we propagate back the error to the caller for them to handle, we do
not need the lowest level spitting out a redundant warning upon an
allocation failure inside dma_map_page().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706122611.4142-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index a9330de886f8ceee8577636de3e206e190e69fd2..92a06042e0bf7e385d22236a6c259adda1027cb7 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -561,8 +561,10 @@ static int __setup_page_dma(struct i915_address_space *vm,
        if (unlikely(!p->page))
                return -ENOMEM;
 
-       p->daddr = dma_map_page(vm->dma, p->page, 0, PAGE_SIZE,
-                               PCI_DMA_BIDIRECTIONAL);
+       p->daddr = dma_map_page_attrs(vm->dma,
+                                     p->page, 0, PAGE_SIZE,
+                                     PCI_DMA_BIDIRECTIONAL,
+                                     DMA_ATTR_NO_WARN);
        if (unlikely(dma_mapping_error(vm->dma, p->daddr))) {
                vm_free_page(vm, p->page);
                return -ENOMEM;
@@ -643,8 +645,10 @@ setup_scratch_page(struct i915_address_space *vm, gfp_t gfp)
                if (unlikely(!page))
                        goto skip;
 
-               addr = dma_map_page(vm->dma, page, 0, size,
-                                   PCI_DMA_BIDIRECTIONAL);
+               addr = dma_map_page_attrs(vm->dma,
+                                         page, 0, size,
+                                         PCI_DMA_BIDIRECTIONAL,
+                                         DMA_ATTR_NO_WARN);
                if (unlikely(dma_mapping_error(vm->dma, addr)))
                        goto free_page;