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

[linux-block.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 3c0b157e2a355dd25945e73b52706cc2fee4c131..01fe89afe8c08554208cfa8ea51619a9e3699517 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -35,7 +35,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
         * to handle all possible callers, and given typical object sizes,
         * the alignment of the buddy allocation will naturally match.
         */
-       vaddr = dma_alloc_coherent(&obj->base.dev->pdev->dev,
+       vaddr = dma_alloc_coherent(obj->base.dev->dev,
                                   roundup_pow_of_two(obj->base.size),
                                   &dma, GFP_KERNEL);
        if (!vaddr)
@@ -83,7 +83,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
 err_st:
        kfree(st);
 err_pci:
-       dma_free_coherent(&obj->base.dev->pdev->dev,
+       dma_free_coherent(obj->base.dev->dev,
                          roundup_pow_of_two(obj->base.size),
                          vaddr, dma);
        return -ENOMEM;
@@ -129,7 +129,7 @@ i915_gem_object_put_pages_phys(struct drm_i915_gem_object *obj,
        sg_free_table(pages);
        kfree(pages);
 
-       dma_free_coherent(&obj->base.dev->pdev->dev,
+       dma_free_coherent(obj->base.dev->dev,
                          roundup_pow_of_two(obj->base.size),
                          vaddr, dma);
 }