| Message ID | 679db22381c8aa9c8c533779044ad6f6d89a45d4.1695924021.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: i915_drv.h and i915_gpu_error.h include diet | expand |
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c index 3198b64ad7db..a12047897650 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c @@ -5,10 +5,11 @@ #include <uapi/drm/i915_drm.h> -#include "intel_memory_region.h" -#include "gem/i915_gem_region.h" #include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_object.h" +#include "gem/i915_gem_region.h" #include "i915_drv.h" +#include "intel_memory_region.h" void __iomem * i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj, diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c index ad649523d5e0..b9f02de8c1bb 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c @@ -10,6 +10,7 @@ #include "intel_memory_region.h" #include "intel_region_ttm.h" +#include "gem/i915_gem_object.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_ttm.h" #include "gem/i915_gem_ttm_move.h" diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c index d38b914d1206..0724ce39744a 100644 --- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c +++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c @@ -5,6 +5,7 @@ #include "gen7_renderclear.h" #include "i915_drv.h" +#include "i915_vma.h" #include "intel_gpu_commands.h" #include "intel_gt_regs.h" diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cd4d55f5f8de..fb7139514e18 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -45,7 +45,6 @@ #include "gt/intel_region_lmem.h" #include "gt/intel_workarounds.h" -#include "gt/uc/intel_uc.h" #include "soc/intel_pch.h" diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index 613decd47760..6226ce924562 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -30,6 +30,8 @@ #include <linux/stat.h> #include <linux/sysfs.h> +#include <drm/drm_file.h> + #include "gt/intel_gt_regs.h" #include "gt/intel_rc6.h" #include "gt/intel_rps.h" diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index c61066498bf2..039b0a849c81 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -26,6 +26,7 @@ #define __I915_UTILS_H #include <linux/list.h> +#include <linux/delay.h> #include <linux/overflow.h> #include <linux/sched.h> #include <linux/string_helpers.h> diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915_vgpu.c index c97323973f9b..91f07b778eda 100644 --- a/drivers/gpu/drm/i915/i915_vgpu.c +++ b/drivers/gpu/drm/i915/i915_vgpu.c @@ -21,7 +21,9 @@ * SOFTWARE. */ +#include "gt/intel_gtt.h" #include "i915_drv.h" +#include "i915_gem_gtt.h" #include "i915_pvinfo.h" #include "i915_vgpu.h" diff --git a/drivers/gpu/drm/i915/intel_region_ttm.c b/drivers/gpu/drm/i915/intel_region_ttm.c index bf6097e7433d..d1fbd476a435 100644 --- a/drivers/gpu/drm/i915/intel_region_ttm.c +++ b/drivers/gpu/drm/i915/intel_region_ttm.c @@ -11,8 +11,10 @@ #include "intel_region_ttm.h" +#include "gem/i915_gem_object.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_ttm.h" /* For the funcs/ops export only */ + /** * DOC: TTM support structure *
Turns out it's not needed, except implicitly in a handful of places. Make them explicit. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 5 +++-- drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 1 + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ drivers/gpu/drm/i915/i915_utils.h | 1 + drivers/gpu/drm/i915/i915_vgpu.c | 2 ++ drivers/gpu/drm/i915/intel_region_ttm.c | 2 ++ 8 files changed, 12 insertions(+), 3 deletions(-)