diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2019-08-06 13:07:30 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-08-07 12:43:55 +0300 |
| commit | 6da4a2c411e8d9be6f848f9207beb69f13113546 (patch) | |
| tree | 2700ae3e90313d403c82ec5f0dadd1869d37757d /drivers/gpu/drm/i915/gem | |
| parent | drm/i915: rename intel_drv.h to display/intel_display_types.h (diff) | |
| download | linux-dev-6da4a2c411e8d9be6f848f9207beb69f13113546.tar.xz linux-dev-6da4a2c411e8d9be6f848f9207beb69f13113546.zip | |
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: 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
Diffstat (limited to 'drivers/gpu/drm/i915/gem')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 4 |
5 files changed, 6 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c index 2f7a3736c2e5..de6616bdb3a6 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c @@ -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" diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 4592c7da6007..566e8a4844cf 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -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" @@ -21,9 +20,10 @@ #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 { diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c index 7b40ceb7566b..cfaedb4b70bd 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c @@ -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" diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c index e6133880f9d0..837dd6636dd1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c @@ -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, diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 51720b733cfe..74da35611d7c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -12,12 +12,10 @@ #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; |