agp/intel-gtt: reduce intel-gtt dependencies more

Don't include stuff on behalf of users if they're not strictly necessary
for the header.

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7bcaa1684587b9b008d3c41468fb40e63c54fbc7.1636977089.git.jani.nikula@intel.com

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 5bfdf222d5f90db87e7eef5b4db454db20d54a52..c53cc9868cd80819ab75007a393b29b5e361aeac 100644 (file)
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/pagemap.h>
 #include <linux/agp_backend.h>
 #include <linux/kernel.h>
 #include <linux/pagemap.h>
 #include <linux/agp_backend.h>

+#include <linux/intel-iommu.h>

 #include <linux/delay.h>
 #include <asm/smp.h>
 #include "agp.h"
 #include <linux/delay.h>
 #include <asm/smp.h>
 #include "agp.h"

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 0c956e5e7fc78d0907441ffaf878dd43952f543b..555111c3bee500ece9487837dcdda6a64d544907 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -3,6 +3,7 @@
  * Copyright © 2020 Intel Corporation
  */
 
  * Copyright © 2020 Intel Corporation
  */
 

+#include <linux/agp_backend.h>

 #include <linux/stop_machine.h>
 
 #include <asm/set_memory.h>
 #include <linux/stop_machine.h>
 
 #include <asm/set_memory.h>

diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index 4e5f8e7e25d0970ef3283f90779eed680e1ea43b..67530bfef129c87a1dbd0b461ee42314cfe1df3a 100644 (file)
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -4,10 +4,9 @@
 #ifndef _DRM_INTEL_GTT_H
 #define        _DRM_INTEL_GTT_H
 
 #ifndef _DRM_INTEL_GTT_H
 #define        _DRM_INTEL_GTT_H
 

-#include <linux/agp_backend.h>
-#include <linux/intel-iommu.h>

 #include <linux/types.h>
 
 #include <linux/types.h>
 

+struct agp_bridge_data;

 struct pci_dev;
 struct sg_table;
 
 struct pci_dev;
 struct sg_table;