Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 0 deletions

diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index b174620cc9b3..0a0001b9dc78 100644
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -15,6 +15,10 @@ const struct intel_gtt {
         unsigned int needs_dmar : 1;
         /* Whether we idle the gpu before mapping/unmapping */
         unsigned int do_idle_maps : 1;
+        /* Share the scratch page dma with ppgtts. */
+        dma_addr_t scratch_page_dma;
+        /* for ppgtt PDE access */
+        u32 __iomem *gtt;
 } *intel_gtt_get(void);
 
 void intel_gtt_chipset_flush(void);