drm/i915: remove unnecessary includes of intel_display_types.h header
authorJani Nikula <jani.nikula@intel.com>
Tue, 6 Aug 2019 10:07:30 +0000 (13:07 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 7 Aug 2019 09:43:55 +0000 (12:43 +0300)
With its original name intel_drv.h the intel_display_types.h header was
superfluously cargo-cult included all over the place, while it's really
mostly about display internals. Remove the unnecessary includes.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e3d737f0ab87c55969e62c1e077e15c04c238297.1565085692.git.jani.nikula@intel.com
14 files changed:
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
drivers/gpu/drm/i915/gem/i915_gem_mman.c
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
drivers/gpu/drm/i915/gem/i915_gem_userptr.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/i915_gem_fence_reg.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/i915_sysfs.c
drivers/gpu/drm/i915/i915_vgpu.c
drivers/gpu/drm/i915/intel_sideband.c
drivers/gpu/drm/i915/intel_uncore.c

index 2f7a3736c2e56eb5b039db3a8c950f03db2183ee..de6616bdb3a6d81ca3e52df04fa9e9d58fd9df4c 100644 (file)
@@ -3,8 +3,7 @@
  * Copyright © 2019 Intel Corporation
  */
 
-#include "display/intel_display_types.h"
-
+#include "i915_drv.h"
 #include "i915_gem_client_blt.h"
 #include "i915_gem_object_blt.h"
 
index 4592c7da6007e388afea2cfd488c4770f385116c..566e8a4844cf5f0586707f31e8dcebc509a1f9cb 100644 (file)
@@ -12,7 +12,6 @@
 #include <drm/drm_syncobj.h>
 #include <drm/i915_drm.h>
 
-#include "display/intel_display_types.h"
 #include "display/intel_frontbuffer.h"
 
 #include "gem/i915_gem_ioctls.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 
-#include "i915_gem_ioctls.h"
+#include "i915_drv.h"
 #include "i915_gem_clflush.h"
 #include "i915_gem_context.h"
+#include "i915_gem_ioctls.h"
 #include "i915_trace.h"
 
 enum {
index 7b40ceb7566bd36990638ec3e8366a7481607a99..cfaedb4b70bd1b0d95208f1fe9238aec29888a47 100644 (file)
@@ -7,7 +7,6 @@
 #include <linux/mman.h>
 #include <linux/sizes.h>
 
-#include "display/intel_display_types.h"
 #include "gt/intel_gt.h"
 
 #include "i915_drv.h"
index e6133880f9d05323eb749cd9efd317f5b369cd75..837dd6636dd1fab022ede6c41b82555e18a0b544 100644 (file)
@@ -3,10 +3,9 @@
  * Copyright © 2019 Intel Corporation
  */
 
-#include "display/intel_display_types.h"
-
-#include "i915_gem_object_blt.h"
+#include "i915_drv.h"
 #include "i915_gem_clflush.h"
+#include "i915_gem_object_blt.h"
 
 int intel_emit_vma_fill_blt(struct i915_request *rq,
                            struct i915_vma *vma,
index 51720b733cfe92347dcbf71119f2857a7f97c026..74da35611d7c010cfc9d1269b4b132f8994f1c3d 100644 (file)
 
 #include <drm/i915_drm.h>
 
-#include "display/intel_display_types.h"
-
+#include "i915_drv.h"
 #include "i915_gem_ioctls.h"
 #include "i915_gem_object.h"
 #include "i915_scatterlist.h"
-#include "i915_trace.h"
 
 struct i915_mm_struct {
        struct mm_struct *mm;
index 6e22a8ddacc81f17c6ff73673dd8c9d4b89f8086..3f888d6d6a77a9c08298dfe890a0c11d5f2e0772 100644 (file)
@@ -39,7 +39,6 @@
 #include <linux/mman.h>
 
 #include "display/intel_display.h"
-#include "display/intel_display_types.h"
 #include "display/intel_frontbuffer.h"
 
 #include "gem/i915_gem_clflush.h"
index ca5040761376a701ec68f7191b0fab195fc7d462..1796391bc598081ed33cb4d289e5d655253877ea 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <drm/i915_drm.h>
 
-#include "display/intel_display_types.h"
 #include "gem/i915_gem_context.h"
 
 #include "i915_drv.h"
index 45c34b1c4d93e280a2fb48a94776fa3813afb214..bcac359ec66194f06953879bb06567f5b1317945 100644 (file)
@@ -23,8 +23,6 @@
 
 #include <drm/i915_drm.h>
 
-#include "display/intel_display_types.h"
-
 #include "i915_drv.h"
 #include "i915_scatterlist.h"
 #include "i915_vgpu.h"
index c19e4fa70a4f6c5abc314324474c6fa03327b783..83a02e773c5876c661a9ccb466ceb3e18b32d352 100644 (file)
@@ -35,7 +35,6 @@
 
 #include <drm/i915_drm.h>
 
-#include "display/intel_display_types.h"
 #include "display/intel_frontbuffer.h"
 #include "gt/intel_gt.h"
 
index 9b95084737c1e7270874d6e517cacae522263fe5..e41cf73a973700f7b69b47a8c96926f46f0f987f 100644 (file)
 
 #include <drm/i915_drm.h>
 
-#include "display/intel_display_types.h"
 #include "display/intel_fbc.h"
 #include "display/intel_gmbus.h"
 
+#include "i915_drv.h"
 #include "i915_reg.h"
 
 static void i915_save_display(struct drm_i915_private *dev_priv)
index 1a356a68af9387b060f31e0cffa70c65088984c7..013c80aa848ead932b883679f45033e28de9af87 100644 (file)
@@ -30,8 +30,6 @@
 #include <linux/stat.h>
 #include <linux/sysfs.h>
 
-#include "display/intel_display_types.h"
-
 #include "i915_drv.h"
 #include "intel_pm.h"
 #include "intel_sideband.h"
index 4982428f9af380eac032005f4c0f724fe5dc1b2a..bf2b837a414670707b876caee8acafa5c7ee5f9d 100644 (file)
@@ -21,7 +21,6 @@
  * SOFTWARE.
  */
 
-#include "display/intel_display_types.h"
 #include "i915_vgpu.h"
 
 /**
index 9e82e98bb7898c4bf1477c7ec85613b1f6213a69..e06b35b844a0f4413cdf3a28d45ccd3eb0ac65ac 100644 (file)
@@ -24,8 +24,6 @@
 
 #include <asm/iosf_mbi.h>
 
-#include "display/intel_display_types.h"
-
 #include "i915_drv.h"
 #include "intel_sideband.h"
 
index 4a584ee4327938402bfbe9cefe594e1124db4f53..39e8710afdd9a427b2d2d843572763a3e1a9099e 100644 (file)
@@ -24,8 +24,6 @@
 #include <linux/pm_runtime.h>
 #include <asm/iosf_mbi.h>
 
-#include "display/intel_display_types.h"
-
 #include "i915_drv.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"