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

[linux-block.git] / drivers / gpu / drm / i915 / gem / i915_gem_shmem.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index cf83c208688cbfd4bd288b002b04de1c2fc497f9..680b370a8ef303443f5156b7f4573b6d5ce05796 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -172,7 +172,7 @@ rebuild_st:
                        max_segment = PAGE_SIZE;
                        goto rebuild_st;
                } else {
-                       dev_warn(&i915->drm.pdev->dev,
+                       dev_warn(i915->drm.dev,
                                 "Failed to DMA remap %lu pages\n",
                                 page_count);
                        goto err_pages;