Commit 6da4a2c4 authored by Jani Nikula's avatar Jani Nikula

drm/i915: remove unnecessary includes of intel_display_types.h header

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e3d737f0ab87c55969e62c1e077e15c04c238297.1565085692.git.jani.nikula@intel.com
parent 1d455f8d
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
* Copyright © 2019 Intel Corporation * Copyright © 2019 Intel Corporation
*/ */
#include "display/intel_display_types.h" #include "i915_drv.h"
#include "i915_gem_client_blt.h" #include "i915_gem_client_blt.h"
#include "i915_gem_object_blt.h" #include "i915_gem_object_blt.h"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <drm/drm_syncobj.h> #include <drm/drm_syncobj.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "display/intel_display_types.h"
#include "display/intel_frontbuffer.h" #include "display/intel_frontbuffer.h"
#include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_ioctls.h"
...@@ -21,9 +20,10 @@ ...@@ -21,9 +20,10 @@
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h" #include "gt/intel_gt_pm.h"
#include "i915_gem_ioctls.h" #include "i915_drv.h"
#include "i915_gem_clflush.h" #include "i915_gem_clflush.h"
#include "i915_gem_context.h" #include "i915_gem_context.h"
#include "i915_gem_ioctls.h"
#include "i915_trace.h" #include "i915_trace.h"
enum { enum {
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include "display/intel_display_types.h"
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
#include "i915_drv.h" #include "i915_drv.h"
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
* Copyright © 2019 Intel Corporation * Copyright © 2019 Intel Corporation
*/ */
#include "display/intel_display_types.h" #include "i915_drv.h"
#include "i915_gem_object_blt.h"
#include "i915_gem_clflush.h" #include "i915_gem_clflush.h"
#include "i915_gem_object_blt.h"
int intel_emit_vma_fill_blt(struct i915_request *rq, int intel_emit_vma_fill_blt(struct i915_request *rq,
struct i915_vma *vma, struct i915_vma *vma,
......
...@@ -12,12 +12,10 @@ ...@@ -12,12 +12,10 @@
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "display/intel_display_types.h" #include "i915_drv.h"
#include "i915_gem_ioctls.h" #include "i915_gem_ioctls.h"
#include "i915_gem_object.h" #include "i915_gem_object.h"
#include "i915_scatterlist.h" #include "i915_scatterlist.h"
#include "i915_trace.h"
struct i915_mm_struct { struct i915_mm_struct {
struct mm_struct *mm; struct mm_struct *mm;
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <linux/mman.h> #include <linux/mman.h>
#include "display/intel_display.h" #include "display/intel_display.h"
#include "display/intel_display_types.h"
#include "display/intel_frontbuffer.h" #include "display/intel_frontbuffer.h"
#include "gem/i915_gem_clflush.h" #include "gem/i915_gem_clflush.h"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "display/intel_display_types.h"
#include "gem/i915_gem_context.h" #include "gem/i915_gem_context.h"
#include "i915_drv.h" #include "i915_drv.h"
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "display/intel_display_types.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_scatterlist.h" #include "i915_scatterlist.h"
#include "i915_vgpu.h" #include "i915_vgpu.h"
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "display/intel_display_types.h"
#include "display/intel_frontbuffer.h" #include "display/intel_frontbuffer.h"
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "display/intel_display_types.h"
#include "display/intel_fbc.h" #include "display/intel_fbc.h"
#include "display/intel_gmbus.h" #include "display/intel_gmbus.h"
#include "i915_drv.h"
#include "i915_reg.h" #include "i915_reg.h"
static void i915_save_display(struct drm_i915_private *dev_priv) static void i915_save_display(struct drm_i915_private *dev_priv)
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include "display/intel_display_types.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_pm.h" #include "intel_pm.h"
#include "intel_sideband.h" #include "intel_sideband.h"
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include "display/intel_display_types.h"
#include "i915_vgpu.h" #include "i915_vgpu.h"
/** /**
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <asm/iosf_mbi.h> #include <asm/iosf_mbi.h>
#include "display/intel_display_types.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_sideband.h" #include "intel_sideband.h"
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <asm/iosf_mbi.h> #include <asm/iosf_mbi.h>
#include "display/intel_display_types.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_trace.h" #include "i915_trace.h"
#include "i915_vgpu.h" #include "i915_vgpu.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