Commit 5f2ec909 authored by Jani Nikula's avatar Jani Nikula

drm/i915: don't include drm_cache.h in i915_drv.h

Include it only in files that use it.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/14edab4a193ea3f73f387a88e3836c8555401871.1644507885.git.jani.nikula@intel.com
parent 5472b3f2
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
* Copyright © 2016 Intel Corporation * Copyright © 2016 Intel Corporation
*/ */
#include <drm/drm_cache.h>
#include "display/intel_frontbuffer.h" #include "display/intel_frontbuffer.h"
#include "i915_drv.h" #include "i915_drv.h"
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/nospec.h> #include <linux/nospec.h>
#include <drm/drm_cache.h>
#include <drm/drm_syncobj.h> #include <drm/drm_syncobj.h>
#include "gt/gen6_ppgtt.h" #include "gt/gen6_ppgtt.h"
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include <linux/pfn_t.h> #include <linux/pfn_t.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <drm/drm_cache.h>
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
#include "gt/intel_gt_requests.h" #include "gt/intel_gt_requests.h"
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#include <drm/drm_cache.h>
#include "display/intel_frontbuffer.h" #include "display/intel_frontbuffer.h"
#include "pxp/intel_pxp.h" #include "pxp/intel_pxp.h"
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
* Copyright © 2014-2016 Intel Corporation * Copyright © 2014-2016 Intel Corporation
*/ */
#include <drm/drm_cache.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_gem_object.h" #include "i915_gem_object.h"
#include "i915_scatterlist.h" #include "i915_scatterlist.h"
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#include <linux/pagevec.h> #include <linux/pagevec.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <drm/drm_cache.h>
#include "gem/i915_gem_region.h" #include "gem/i915_gem_region.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_gemfs.h" #include "i915_gemfs.h"
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
* Copyright © 2008-2021 Intel Corporation * Copyright © 2008-2021 Intel Corporation
*/ */
#include <drm/drm_cache.h>
#include "gem/i915_gem_internal.h" #include "gem/i915_gem_internal.h"
#include "gen2_engine_cs.h" #include "gen2_engine_cs.h"
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
* Copyright © 2016-2018 Intel Corporation * Copyright © 2016-2018 Intel Corporation
*/ */
#include <drm/drm_cache.h>
#include "gem/i915_gem_internal.h" #include "gem/i915_gem_internal.h"
#include "i915_active.h" #include "i915_active.h"
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
* Copyright © 2021 Intel Corporation * Copyright © 2021 Intel Corporation
*/ */
#include <drm/drm_cache.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h" #include "i915_reg.h"
#include "intel_guc_slpc.h" #include "intel_guc_slpc.h"
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#include <linux/bitfield.h> #include <linux/bitfield.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <drm/drm_cache.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_lmem.h"
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
* *
*/ */
#include <drm/drm_cache.h>
#include "gt/intel_engine.h" #include "gt/intel_engine.h"
#include "gt/intel_engine_regs.h" #include "gt/intel_engine_regs.h"
#include "gt/intel_gpu_commands.h" #include "gt/intel_gpu_commands.h"
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_auth.h> #include <drm/drm_auth.h>
#include <drm/drm_cache.h>
#include <drm/drm_util.h> #include <drm/drm_util.h>
#include <drm/drm_dsc.h> #include <drm/drm_dsc.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
* *
*/ */
#include <drm/drm_vma_manager.h>
#include <linux/dma-fence-array.h> #include <linux/dma-fence-array.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/dma-resv.h> #include <linux/dma-resv.h>
...@@ -37,6 +36,9 @@ ...@@ -37,6 +36,9 @@
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include <linux/mman.h> #include <linux/mman.h>
#include <drm/drm_cache.h>
#include <drm/drm_vma_manager.h>
#include "display/intel_display.h" #include "display/intel_display.h"
#include "display/intel_frontbuffer.h" #include "display/intel_frontbuffer.h"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/utsname.h> #include <linux/utsname.h>
#include <linux/zlib.h> #include <linux/zlib.h>
#include <drm/drm_cache.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include "display/intel_dmc.h" #include "display/intel_dmc.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment