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

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_ggtt.c

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index efcd5aeac9360229dd95f60fed621942bc506158..10c23a749a950e1f0bcee2b2a4ab443f2feed997 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -18,6 +18,7 @@
 #include "i915_vgpu.h"
 
 #include "intel_gtt.h"
+#include "gen8_ppgtt.h"
 
 static int
 i915_get_ggtt_vma_pages(struct i915_vma *vma);
@@ -187,9 +188,9 @@ static void gmch_ggtt_invalidate(struct i915_ggtt *ggtt)
        intel_gtt_chipset_flush();
 }
 
-static u64 gen8_ggtt_pte_encode(dma_addr_t addr,
-                               enum i915_cache_level level,
-                               u32 flags)
+u64 gen8_ggtt_pte_encode(dma_addr_t addr,
+                        enum i915_cache_level level,
+                        u32 flags)
 {
        gen8_pte_t pte = addr | _PAGE_PRESENT;