[Intel-xe] [PATCH v4 02/12] drm/xe: Sort includes
Lucas De Marchi
lucas.demarchi at intel.com
Sat Feb 25 00:15:38 UTC 2023
Sort includes and split them in blocks:
1) .h corresponding to the .c. Example: xe_bb.c should have a "#include
"xe_bb.h" first.
2) #include <linux/...>
3) #include <drm/...>
4) local includes
5) i915 includes
This is accomplished by running
`clang-format --style=file -i --sort-includes drivers/gpu/drm/xe/*.[ch]`
and ignoring all the changes after the includes. There are also some
manual tweaks to split the blocks.
v2: Also sort includes in headers
Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
Reviewed-by: Matthew Auld <matthew.auld at intel.com>
---
drivers/gpu/drm/xe/xe_bb.c | 3 ++-
drivers/gpu/drm/xe/xe_bo.c | 1 -
drivers/gpu/drm/xe/xe_bo_evict.c | 3 ++-
drivers/gpu/drm/xe/xe_debugfs.c | 3 ++-
drivers/gpu/drm/xe/xe_device.c | 8 ++++----
drivers/gpu/drm/xe/xe_device.h | 2 +-
drivers/gpu/drm/xe/xe_device_types.h | 2 +-
drivers/gpu/drm/xe/xe_display.c | 12 ++++++------
drivers/gpu/drm/xe/xe_display.h | 2 +-
drivers/gpu/drm/xe/xe_dma_buf.c | 9 ++++-----
drivers/gpu/drm/xe/xe_engine.c | 3 ++-
drivers/gpu/drm/xe/xe_exec.c | 3 ++-
drivers/gpu/drm/xe/xe_execlist.c | 10 +++++-----
drivers/gpu/drm/xe/xe_force_wake.c | 5 +++--
drivers/gpu/drm/xe/xe_ggtt.c | 6 +++---
drivers/gpu/drm/xe/xe_gt.c | 3 ++-
drivers/gpu/drm/xe/xe_gt_clock.c | 7 ++++---
drivers/gpu/drm/xe/xe_gt_debugfs.c | 3 ++-
drivers/gpu/drm/xe/xe_gt_mcr.c | 3 ++-
drivers/gpu/drm/xe/xe_gt_pagefault.c | 3 ++-
drivers/gpu/drm/xe/xe_gt_sysfs.c | 5 ++++-
drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 3 ++-
drivers/gpu/drm/xe/xe_gt_topology.c | 3 ++-
drivers/gpu/drm/xe/xe_guc.c | 14 ++++++++------
drivers/gpu/drm/xe/xe_guc.h | 2 +-
drivers/gpu/drm/xe/xe_guc_ads.c | 6 ++++--
drivers/gpu/drm/xe/xe_guc_ct.c | 5 +++--
drivers/gpu/drm/xe/xe_guc_ct_types.h | 2 +-
drivers/gpu/drm/xe/xe_guc_debugfs.c | 3 ++-
drivers/gpu/drm/xe/xe_guc_fwif.h | 4 ++--
drivers/gpu/drm/xe/xe_guc_hwconfig.c | 3 ++-
drivers/gpu/drm/xe/xe_guc_log.c | 3 ++-
drivers/gpu/drm/xe/xe_guc_pc.c | 13 ++++++++-----
drivers/gpu/drm/xe/xe_guc_pc_types.h | 2 +-
drivers/gpu/drm/xe/xe_guc_submit.c | 7 ++++---
drivers/gpu/drm/xe/xe_huc.c | 3 ++-
drivers/gpu/drm/xe/xe_huc_debugfs.c | 3 ++-
drivers/gpu/drm/xe/xe_hw_engine.c | 2 +-
drivers/gpu/drm/xe/xe_hw_fence_types.h | 2 +-
drivers/gpu/drm/xe/xe_irq.c | 6 ++++--
drivers/gpu/drm/xe/xe_lrc.c | 6 +++---
drivers/gpu/drm/xe/xe_migrate.c | 12 +++++++-----
drivers/gpu/drm/xe/xe_mmio.c | 2 +-
drivers/gpu/drm/xe/xe_mocs.c | 5 +++--
drivers/gpu/drm/xe/xe_module.c | 2 ++
drivers/gpu/drm/xe/xe_pci.c | 4 ++--
drivers/gpu/drm/xe/xe_pcode.c | 9 ++++-----
drivers/gpu/drm/xe/xe_pm.c | 5 +++--
drivers/gpu/drm/xe/xe_preempt_fence.c | 3 ++-
drivers/gpu/drm/xe/xe_pt.c | 5 +++--
drivers/gpu/drm/xe/xe_query.c | 12 +++++++-----
drivers/gpu/drm/xe/xe_reg_sr.c | 4 ++--
drivers/gpu/drm/xe/xe_reg_sr_types.h | 2 +-
drivers/gpu/drm/xe/xe_reg_whitelist.c | 6 +++---
drivers/gpu/drm/xe/xe_ring_ops.c | 5 +++--
drivers/gpu/drm/xe/xe_rtp.h | 2 +-
drivers/gpu/drm/xe/xe_sa.c | 4 +++-
drivers/gpu/drm/xe/xe_sync.c | 5 +++--
drivers/gpu/drm/xe/xe_trace.h | 4 ++--
drivers/gpu/drm/xe/xe_ttm_gtt_mgr.c | 2 +-
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 2 +-
drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 2 +-
drivers/gpu/drm/xe/xe_tuning.c | 2 +-
drivers/gpu/drm/xe/xe_uc.c | 5 +++--
drivers/gpu/drm/xe/xe_uc_fw.h | 4 ++--
drivers/gpu/drm/xe/xe_uc_fw_abi.h | 2 +-
drivers/gpu/drm/xe/xe_vm.c | 2 +-
drivers/gpu/drm/xe/xe_vm_madvise.c | 8 +++++---
drivers/gpu/drm/xe/xe_wopcm.c | 3 ++-
69 files changed, 179 insertions(+), 132 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_bb.c b/drivers/gpu/drm/xe/xe_bb.c
index 8b9209571fd0..d10448d1b4d7 100644
--- a/drivers/gpu/drm/xe/xe_bb.c
+++ b/drivers/gpu/drm/xe/xe_bb.c
@@ -4,10 +4,11 @@
*/
#include "xe_bb.h"
-#include "xe_sa.h"
+
#include "xe_device.h"
#include "xe_engine_types.h"
#include "xe_hw_fence.h"
+#include "xe_sa.h"
#include "xe_sched_job.h"
#include "xe_vm_types.h"
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 4173c1418b63..da6df74e71b9 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -3,7 +3,6 @@
* Copyright © 2021 Intel Corporation
*/
-
#include "xe_bo.h"
#include <linux/dma-buf.h>
diff --git a/drivers/gpu/drm/xe/xe_bo_evict.c b/drivers/gpu/drm/xe/xe_bo_evict.c
index 3fb3c8c77efa..bbf89a58cdf5 100644
--- a/drivers/gpu/drm/xe/xe_bo_evict.c
+++ b/drivers/gpu/drm/xe/xe_bo_evict.c
@@ -3,8 +3,9 @@
* Copyright © 2022 Intel Corporation
*/
-#include "xe_bo.h"
#include "xe_bo_evict.h"
+
+#include "xe_bo.h"
#include "xe_device.h"
#include "xe_ggtt.h"
#include "xe_gt.h"
diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
index b0f8b157ffa3..7827a785b020 100644
--- a/drivers/gpu/drm/xe/xe_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_debugfs.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_debugfs.h"
+
#include <linux/string_helpers.h>
#include <drm/drm_debugfs.h>
#include "xe_bo.h"
#include "xe_device.h"
-#include "xe_debugfs.h"
#include "xe_gt_debugfs.h"
#include "xe_step.h"
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index a028efa8eebe..45e3c740fda2 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -5,12 +5,12 @@
#include "xe_device.h"
-#include <drm/drm_gem_ttm_helper.h>
#include <drm/drm_aperture.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_gem_ttm_helper.h>
#include <drm/drm_ioctl.h>
-#include <drm/xe_drm.h>
#include <drm/drm_managed.h>
-#include <drm/drm_atomic_helper.h>
+#include <drm/xe_drm.h>
#include "xe_bo.h"
#include "xe_debugfs.h"
@@ -21,8 +21,8 @@
#include "xe_exec.h"
#include "xe_gt.h"
#include "xe_irq.h"
-#include "xe_module.h"
#include "xe_mmio.h"
+#include "xe_module.h"
#include "xe_pcode.h"
#include "xe_pm.h"
#include "xe_query.h"
diff --git a/drivers/gpu/drm/xe/xe_device.h b/drivers/gpu/drm/xe/xe_device.h
index 88d55671b068..ed55ef567d18 100644
--- a/drivers/gpu/drm/xe/xe_device.h
+++ b/drivers/gpu/drm/xe/xe_device.h
@@ -12,8 +12,8 @@ struct xe_file;
#include <drm/drm_util.h>
#include "xe_device_types.h"
-#include "xe_macros.h"
#include "xe_force_wake.h"
+#include "xe_macros.h"
#include "gt/intel_gpu_commands.h"
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index d3bfe5ed4dd9..9743987fc883 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -17,9 +17,9 @@
#include "xe_step_types.h"
/* For display substruct */
-#include "display/intel_display_core.h"
#include "display/ext/intel_device_info.h"
#include "display/ext/intel_pch.h"
+#include "display/intel_display_core.h"
#define XE_BO_INVALID_OFFSET LONG_MAX
diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
index 47a16a3f85fa..6e7b6cfce4d9 100644
--- a/drivers/gpu/drm/xe/xe_display.c
+++ b/drivers/gpu/drm/xe/xe_display.c
@@ -6,12 +6,16 @@
#if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
#include "xe_display.h"
-#include "xe_module.h"
+
+#include <linux/fb.h>
#include <drm/drm_aperture.h>
#include <drm/drm_managed.h>
#include <drm/xe_drm.h>
+#include "display/ext/i915_irq.h"
+#include "display/ext/intel_dram.h"
+#include "display/ext/intel_pm.h"
#include "display/intel_acpi.h"
#include "display/intel_audio.h"
#include "display/intel_bw.h"
@@ -22,11 +26,7 @@
#include "display/intel_hdcp.h"
#include "display/intel_hotplug.h"
#include "display/intel_opregion.h"
-#include "display/ext/i915_irq.h"
-#include "display/ext/intel_dram.h"
-#include "display/ext/intel_pm.h"
-
-#include <linux/fb.h>
+#include "xe_module.h"
/* Xe device functions */
diff --git a/drivers/gpu/drm/xe/xe_display.h b/drivers/gpu/drm/xe/xe_display.h
index 03117a7067dc..262cd5442489 100644
--- a/drivers/gpu/drm/xe/xe_display.h
+++ b/drivers/gpu/drm/xe/xe_display.h
@@ -11,8 +11,8 @@
#include "xe_device.h"
-#include "display/intel_opregion.h"
#include "display/ext/i915_irq.h"
+#include "display/intel_opregion.h"
int xe_display_enable(struct pci_dev *pdev, struct drm_driver *driver);
diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c
index d09ff25bd940..9b252cc782b7 100644
--- a/drivers/gpu/drm/xe/xe_dma_buf.c
+++ b/drivers/gpu/drm/xe/xe_dma_buf.c
@@ -3,20 +3,19 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_dma_buf.h"
+
+#include <kunit/test.h>
#include <linux/dma-buf.h>
+#include <linux/pci-p2pdma.h>
#include <drm/drm_device.h>
#include <drm/drm_prime.h>
-
#include <drm/ttm/ttm_tt.h>
-#include <kunit/test.h>
-#include <linux/pci-p2pdma.h>
-
#include "tests/xe_test.h"
#include "xe_bo.h"
#include "xe_device.h"
-#include "xe_dma_buf.h"
#include "xe_ttm_vram_mgr.h"
#include "xe_vm.h"
diff --git a/drivers/gpu/drm/xe/xe_engine.c b/drivers/gpu/drm/xe/xe_engine.c
index e478d0417e49..f1e0f700d96c 100644
--- a/drivers/gpu/drm/xe/xe_engine.c
+++ b/drivers/gpu/drm/xe/xe_engine.c
@@ -5,10 +5,11 @@
#include "xe_engine.h"
+#include <linux/nospec.h>
+
#include <drm/drm_device.h>
#include <drm/drm_file.h>
#include <drm/xe_drm.h>
-#include <linux/nospec.h>
#include "xe_device.h"
#include "xe_gt.h"
diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c
index 00f298acc436..97fd1a311f2d 100644
--- a/drivers/gpu/drm/xe/xe_exec.c
+++ b/drivers/gpu/drm/xe/xe_exec.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_exec.h"
+
#include <drm/drm_device.h>
#include <drm/drm_file.h>
#include <drm/xe_drm.h>
@@ -10,7 +12,6 @@
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_engine.h"
-#include "xe_exec.h"
#include "xe_macros.h"
#include "xe_sched_job.h"
#include "xe_sync.h"
diff --git a/drivers/gpu/drm/xe/xe_execlist.c b/drivers/gpu/drm/xe/xe_execlist.c
index d555d77cbf49..366379d3dfa8 100644
--- a/drivers/gpu/drm/xe/xe_execlist.c
+++ b/drivers/gpu/drm/xe/xe_execlist.c
@@ -3,15 +3,15 @@
* Copyright © 2021 Intel Corporation
*/
-#include <drm/drm_managed.h>
-
#include "xe_execlist.h"
+#include <drm/drm_managed.h>
+
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_engine.h"
-#include "xe_hw_fence.h"
#include "xe_gt.h"
+#include "xe_hw_fence.h"
#include "xe_lrc.h"
#include "xe_macros.h"
#include "xe_mmio.h"
@@ -19,11 +19,11 @@
#include "xe_ring_ops_types.h"
#include "xe_sched_job.h"
-#include "i915_reg.h"
+#include "gt/intel_engine_regs.h"
#include "gt/intel_gpu_commands.h"
#include "gt/intel_gt_regs.h"
#include "gt/intel_lrc_reg.h"
-#include "gt/intel_engine_regs.h"
+#include "i915_reg.h"
#define XE_EXECLIST_HANG_LIMIT 1
diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c
index 5bd87118ac73..60b7e4a3e9fe 100644
--- a/drivers/gpu/drm/xe/xe_force_wake.c
+++ b/drivers/gpu/drm/xe/xe_force_wake.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_force_wake.h"
+
#include <drm/drm_util.h>
-#include "xe_force_wake.h"
#include "xe_gt.h"
#include "xe_mmio.h"
-#include "gt/intel_gt_regs.h"
+#include "gt/intel_gt_regs.h"
#define XE_FORCE_WAKE_ACK_TIMEOUT_MS 50
diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index d5bd9bc18c57..03880f2c9692 100644
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -6,20 +6,20 @@
#include "xe_ggtt.h"
#include <linux/sizes.h>
-#include <drm/i915_drm.h>
#include <drm/drm_managed.h>
+#include <drm/i915_drm.h>
-#include "xe_device.h"
#include "xe_bo.h"
+#include "xe_device.h"
#include "xe_gt.h"
#include "xe_gt_tlb_invalidation.h"
#include "xe_map.h"
#include "xe_mmio.h"
#include "xe_wopcm.h"
-#include "i915_reg.h"
#include "gt/intel_gt_regs.h"
+#include "i915_reg.h"
/* FIXME: Common file, preferably auto-gen */
#define MTL_GGTT_PTE_PAT0 BIT_ULL(52)
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 5a3c8fd5936a..74e9445befe4 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_gt.h"
+
#include <linux/minmax.h>
#include <drm/drm_managed.h>
@@ -14,7 +16,6 @@
#include "xe_execlist.h"
#include "xe_force_wake.h"
#include "xe_ggtt.h"
-#include "xe_gt.h"
#include "xe_gt_clock.h"
#include "xe_gt_mcr.h"
#include "xe_gt_pagefault.h"
diff --git a/drivers/gpu/drm/xe/xe_gt_clock.c b/drivers/gpu/drm/xe/xe_gt_clock.c
index 575433e9718a..2d9f2aa42bad 100644
--- a/drivers/gpu/drm/xe/xe_gt_clock.c
+++ b/drivers/gpu/drm/xe/xe_gt_clock.c
@@ -3,15 +3,16 @@
* Copyright © 2022 Intel Corporation
*/
-#include "i915_reg.h"
-#include "gt/intel_gt_regs.h"
+#include "xe_gt_clock.h"
#include "xe_device.h"
#include "xe_gt.h"
-#include "xe_gt_clock.h"
#include "xe_macros.h"
#include "xe_mmio.h"
+#include "gt/intel_gt_regs.h"
+#include "i915_reg.h"
+
static u32 read_reference_ts_freq(struct xe_gt *gt)
{
u32 ts_override = xe_mmio_read32(gt, GEN9_TIMESTAMP_OVERRIDE.reg);
diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index c320e58810ce..78942e12e76c 100644
--- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_gt_debugfs.h"
+
#include <drm/drm_debugfs.h>
#include <drm/drm_managed.h>
@@ -10,7 +12,6 @@
#include "xe_force_wake.h"
#include "xe_ggtt.h"
#include "xe_gt.h"
-#include "xe_gt_debugfs.h"
#include "xe_gt_mcr.h"
#include "xe_gt_topology.h"
#include "xe_hw_engine.h"
diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c
index 7617f0340879..8fa59988d08e 100644
--- a/drivers/gpu/drm/xe/xe_gt_mcr.c
+++ b/drivers/gpu/drm/xe/xe_gt_mcr.c
@@ -3,8 +3,9 @@
* Copyright © 2022 Intel Corporation
*/
-#include "xe_gt.h"
#include "xe_gt_mcr.h"
+
+#include "xe_gt.h"
#include "xe_gt_topology.h"
#include "xe_gt_types.h"
#include "xe_mmio.h"
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index ce79eb48feb8..0e7047b89a83 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_gt_pagefault.h"
+
#include <linux/circ_buf.h>
#include <drm/drm_managed.h>
@@ -10,7 +12,6 @@
#include "xe_bo.h"
#include "xe_gt.h"
-#include "xe_gt_pagefault.h"
#include "xe_gt_tlb_invalidation.h"
#include "xe_guc.h"
#include "xe_guc_ct.h"
diff --git a/drivers/gpu/drm/xe/xe_gt_sysfs.c b/drivers/gpu/drm/xe/xe_gt_sysfs.c
index 2d966d935b8e..c01cc689058c 100644
--- a/drivers/gpu/drm/xe/xe_gt_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_sysfs.c
@@ -3,11 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_gt_sysfs.h"
+
#include <linux/kobject.h>
#include <linux/sysfs.h>
+
#include <drm/drm_managed.h>
+
#include "xe_gt.h"
-#include "xe_gt_sysfs.h"
static void xe_gt_sysfs_kobj_release(struct kobject *kobj)
{
diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
index 2521c8a65690..f279e21300aa 100644
--- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
+++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
@@ -3,8 +3,9 @@
* Copyright © 2023 Intel Corporation
*/
-#include "xe_gt.h"
#include "xe_gt_tlb_invalidation.h"
+
+#include "xe_gt.h"
#include "xe_guc.h"
#include "xe_guc_ct.h"
#include "xe_trace.h"
diff --git a/drivers/gpu/drm/xe/xe_gt_topology.c b/drivers/gpu/drm/xe/xe_gt_topology.c
index 3dd7cbbff071..c76aaea1887c 100644
--- a/drivers/gpu/drm/xe/xe_gt_topology.c
+++ b/drivers/gpu/drm/xe/xe_gt_topology.c
@@ -3,10 +3,11 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_gt_topology.h"
+
#include <linux/bitmap.h>
#include "xe_gt.h"
-#include "xe_gt_topology.h"
#include "xe_mmio.h"
#define XE_MAX_DSS_FUSE_BITS (32 * XE_MAX_DSS_FUSE_REGS)
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index 32bcc40463e1..db3d8c947603 100644
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -3,24 +3,26 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc.h"
+
#include "xe_bo.h"
#include "xe_device.h"
-#include "xe_guc.h"
+#include "xe_force_wake.h"
+#include "xe_gt.h"
#include "xe_guc_ads.h"
#include "xe_guc_ct.h"
#include "xe_guc_hwconfig.h"
#include "xe_guc_log.h"
-#include "xe_guc_reg.h"
#include "xe_guc_pc.h"
+#include "xe_guc_reg.h"
#include "xe_guc_submit.h"
-#include "xe_gt.h"
+#include "xe_mmio.h"
#include "xe_platform_types.h"
#include "xe_uc_fw.h"
#include "xe_wopcm.h"
-#include "xe_mmio.h"
-#include "xe_force_wake.h"
-#include "i915_reg_defs.h"
+
#include "gt/intel_gt_regs.h"
+#include "i915_reg_defs.h"
/* TODO: move to common file */
#define GUC_PVC_MOCS_INDEX_MASK REG_GENMASK(25, 24)
diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h
index 7be33458eef6..74a74051f354 100644
--- a/drivers/gpu/drm/xe/xe_guc.h
+++ b/drivers/gpu/drm/xe/xe_guc.h
@@ -6,8 +6,8 @@
#ifndef _XE_GUC_H_
#define _XE_GUC_H_
-#include "xe_hw_engine_types.h"
#include "xe_guc_types.h"
+#include "xe_hw_engine_types.h"
#include "xe_macros.h"
struct drm_printer;
diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
index 0c08cecaca40..a4e947f0c557 100644
--- a/drivers/gpu/drm/xe/xe_guc_ads.c
+++ b/drivers/gpu/drm/xe/xe_guc_ads.c
@@ -3,20 +3,22 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_ads.h"
+
#include <drm/drm_managed.h>
#include "xe_bo.h"
#include "xe_gt.h"
#include "xe_guc.h"
-#include "xe_guc_ads.h"
#include "xe_guc_reg.h"
#include "xe_hw_engine.h"
#include "xe_lrc.h"
#include "xe_map.h"
#include "xe_mmio.h"
#include "xe_platform_types.h"
-#include "gt/intel_gt_regs.h"
+
#include "gt/intel_engine_regs.h"
+#include "gt/intel_gt_regs.h"
/* Slack of a few additional entries per engine */
#define ADS_REGSET_EXTRA_MAX 8
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 84d4302d4e72..5e00b75d3ca2 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_ct.h"
+
#include <linux/bitfield.h>
#include <linux/circ_buf.h>
#include <linux/delay.h>
@@ -12,10 +14,9 @@
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_gt.h"
-#include "xe_guc.h"
-#include "xe_guc_ct.h"
#include "xe_gt_pagefault.h"
#include "xe_gt_tlb_invalidation.h"
+#include "xe_guc.h"
#include "xe_guc_submit.h"
#include "xe_map.h"
#include "xe_trace.h"
diff --git a/drivers/gpu/drm/xe/xe_guc_ct_types.h b/drivers/gpu/drm/xe/xe_guc_ct_types.h
index 17b148bf3735..e0f9063e9b65 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct_types.h
+++ b/drivers/gpu/drm/xe/xe_guc_ct_types.h
@@ -6,8 +6,8 @@
#ifndef _XE_GUC_CT_TYPES_H_
#define _XE_GUC_CT_TYPES_H_
-#include <linux/iosys-map.h>
#include <linux/interrupt.h>
+#include <linux/iosys-map.h>
#include <linux/spinlock_types.h>
#include <linux/wait.h>
#include <linux/xarray.h>
diff --git a/drivers/gpu/drm/xe/xe_guc_debugfs.c b/drivers/gpu/drm/xe/xe_guc_debugfs.c
index 916e9633b322..6b72db4d5bb2 100644
--- a/drivers/gpu/drm/xe/xe_guc_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_guc_debugfs.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_debugfs.h"
+
#include <drm/drm_debugfs.h>
#include <drm/drm_managed.h>
@@ -10,7 +12,6 @@
#include "xe_gt.h"
#include "xe_guc.h"
#include "xe_guc_ct.h"
-#include "xe_guc_debugfs.h"
#include "xe_guc_log.h"
#include "xe_macros.h"
diff --git a/drivers/gpu/drm/xe/xe_guc_fwif.h b/drivers/gpu/drm/xe/xe_guc_fwif.h
index f562404a6cf7..20155ba4ef07 100644
--- a/drivers/gpu/drm/xe/xe_guc_fwif.h
+++ b/drivers/gpu/drm/xe/xe_guc_fwif.h
@@ -10,9 +10,9 @@
#include "abi/guc_actions_abi.h"
#include "abi/guc_actions_slpc_abi.h"
-#include "abi/guc_errors_abi.h"
-#include "abi/guc_communication_mmio_abi.h"
#include "abi/guc_communication_ctb_abi.h"
+#include "abi/guc_communication_mmio_abi.h"
+#include "abi/guc_errors_abi.h"
#include "abi/guc_klvs_abi.h"
#include "abi/guc_messages_abi.h"
diff --git a/drivers/gpu/drm/xe/xe_guc_hwconfig.c b/drivers/gpu/drm/xe/xe_guc_hwconfig.c
index 57640d608787..a6982f323ed1 100644
--- a/drivers/gpu/drm/xe/xe_guc_hwconfig.c
+++ b/drivers/gpu/drm/xe/xe_guc_hwconfig.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_hwconfig.h"
+
#include <drm/drm_managed.h>
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_gt.h"
#include "xe_guc.h"
-#include "xe_guc_hwconfig.h"
#include "xe_map.h"
static struct xe_gt *
diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
index 7ec1b2bb1f8e..9a7b5d5906c1 100644
--- a/drivers/gpu/drm/xe/xe_guc_log.c
+++ b/drivers/gpu/drm/xe/xe_guc_log.c
@@ -3,11 +3,12 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_log.h"
+
#include <drm/drm_managed.h>
#include "xe_bo.h"
#include "xe_gt.h"
-#include "xe_guc_log.h"
#include "xe_map.h"
#include "xe_module.h"
diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index 3ba0c8a35109..28b86e8f3f6e 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -3,21 +3,24 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_pc.h"
+
+#include <linux/delay.h>
+
#include <drm/drm_managed.h>
+
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_gt.h"
-#include "xe_gt_types.h"
#include "xe_gt_sysfs.h"
+#include "xe_gt_types.h"
#include "xe_guc_ct.h"
#include "xe_map.h"
#include "xe_mmio.h"
#include "xe_pcode.h"
-#include "i915_reg_defs.h"
-#include "i915_reg.h"
-
-#include <linux/delay.h>
+#include "i915_reg.h"
+#include "i915_reg_defs.h"
#include "intel_mchbar_regs.h"
/* For GEN6_RP_STATE_CAP.reg to be merged when the definition moves to Xe */
diff --git a/drivers/gpu/drm/xe/xe_guc_pc_types.h b/drivers/gpu/drm/xe/xe_guc_pc_types.h
index 39548e03acf4..2afd0dbc3542 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc_types.h
+++ b/drivers/gpu/drm/xe/xe_guc_pc_types.h
@@ -6,8 +6,8 @@
#ifndef _XE_GUC_PC_TYPES_H_
#define _XE_GUC_PC_TYPES_H_
-#include <linux/types.h>
#include <linux/mutex.h>
+#include <linux/types.h>
/**
* struct xe_guc_pc - GuC Power Conservation (PC)
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index a54f7f82d04d..aca41ecedf7d 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_guc_submit.h"
+
#include <linux/bitfield.h>
#include <linux/bitmap.h>
#include <linux/circ_buf.h>
@@ -13,12 +15,11 @@
#include "xe_device.h"
#include "xe_engine.h"
+#include "xe_force_wake.h"
+#include "xe_gt.h"
#include "xe_guc.h"
#include "xe_guc_ct.h"
#include "xe_guc_engine_types.h"
-#include "xe_guc_submit.h"
-#include "xe_gt.h"
-#include "xe_force_wake.h"
#include "xe_hw_engine.h"
#include "xe_hw_fence.h"
#include "xe_lrc.h"
diff --git a/drivers/gpu/drm/xe/xe_huc.c b/drivers/gpu/drm/xe/xe_huc.c
index 82e7fb3a6292..a9448c6f6418 100644
--- a/drivers/gpu/drm/xe/xe_huc.c
+++ b/drivers/gpu/drm/xe/xe_huc.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_huc.h"
+
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_force_wake.h"
#include "xe_gt.h"
#include "xe_guc.h"
#include "xe_guc_reg.h"
-#include "xe_huc.h"
#include "xe_mmio.h"
#include "xe_uc_fw.h"
diff --git a/drivers/gpu/drm/xe/xe_huc_debugfs.c b/drivers/gpu/drm/xe/xe_huc_debugfs.c
index 268bac36336a..ee3d8315036a 100644
--- a/drivers/gpu/drm/xe/xe_huc_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_huc_debugfs.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_huc_debugfs.h"
+
#include <drm/drm_debugfs.h>
#include <drm/drm_managed.h>
#include "xe_device.h"
#include "xe_gt.h"
#include "xe_huc.h"
-#include "xe_huc_debugfs.h"
#include "xe_macros.h"
static struct xe_gt *
diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index fd89dd90131c..1ca7a89b4fbd 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -22,8 +22,8 @@
#include "xe_wa.h"
#include "gt/intel_engine_regs.h"
-#include "i915_reg.h"
#include "gt/intel_gt_regs.h"
+#include "i915_reg.h"
#define MAX_MMIO_BASES 3
struct engine_info {
diff --git a/drivers/gpu/drm/xe/xe_hw_fence_types.h b/drivers/gpu/drm/xe/xe_hw_fence_types.h
index a78e50eb3cb8..b33c4956e8ea 100644
--- a/drivers/gpu/drm/xe/xe_hw_fence_types.h
+++ b/drivers/gpu/drm/xe/xe_hw_fence_types.h
@@ -6,8 +6,8 @@
#ifndef _XE_HW_FENCE_TYPES_H_
#define _XE_HW_FENCE_TYPES_H_
-#include <linux/iosys-map.h>
#include <linux/dma-fence.h>
+#include <linux/iosys-map.h>
#include <linux/irq_work.h>
#include <linux/list.h>
#include <linux/spinlock.h>
diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c
index 89401c663274..1428796d87d8 100644
--- a/drivers/gpu/drm/xe/xe_irq.c
+++ b/drivers/gpu/drm/xe/xe_irq.c
@@ -3,6 +3,8 @@
* Copyright © 2021 Intel Corporation
*/
+#include "xe_irq.h"
+
#include <linux/sched/clock.h>
#include <drm/drm_managed.h>
@@ -10,13 +12,13 @@
#include "xe_device.h"
#include "xe_display.h"
#include "xe_drv.h"
-#include "xe_guc.h"
#include "xe_gt.h"
+#include "xe_guc.h"
#include "xe_hw_engine.h"
#include "xe_mmio.h"
-#include "i915_reg.h"
#include "gt/intel_gt_regs.h"
+#include "i915_reg.h"
static void gen3_assert_iir_is_zero(struct xe_gt *gt, i915_reg_t reg)
{
diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 347ff9b34494..ed6fcf7620e1 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -9,15 +9,15 @@
#include "xe_device.h"
#include "xe_engine_types.h"
#include "xe_gt.h"
-#include "xe_map.h"
#include "xe_hw_fence.h"
+#include "xe_map.h"
#include "xe_vm.h"
-#include "i915_reg.h"
+#include "gt/intel_engine_regs.h"
#include "gt/intel_gpu_commands.h"
#include "gt/intel_gt_regs.h"
#include "gt/intel_lrc_reg.h"
-#include "gt/intel_engine_regs.h"
+#include "i915_reg.h"
#define GEN8_CTX_VALID (1 << 0)
#define GEN8_CTX_L3LLC_COHERENT (1 << 5)
diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index cbcc355cd391..a3f35fec1b67 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -2,8 +2,15 @@
/*
* Copyright © 2020 Intel Corporation
*/
+
#include "xe_migrate.h"
+#include <linux/sizes.h>
+
+#include <drm/drm_managed.h>
+#include <drm/ttm/ttm_tt.h>
+#include <drm/xe_drm.h>
+
#include "xe_bb.h"
#include "xe_bo.h"
#include "xe_engine.h"
@@ -20,11 +27,6 @@
#include "xe_trace.h"
#include "xe_vm.h"
-#include <linux/sizes.h>
-#include <drm/drm_managed.h>
-#include <drm/ttm/ttm_tt.h>
-#include <drm/xe_drm.h>
-
#include "gt/intel_gpu_commands.h"
/**
diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
index c414ece6dfe3..a117437f8482 100644
--- a/drivers/gpu/drm/xe/xe_mmio.c
+++ b/drivers/gpu/drm/xe/xe_mmio.c
@@ -14,9 +14,9 @@
#include "xe_macros.h"
#include "xe_module.h"
-#include "i915_reg.h"
#include "gt/intel_engine_regs.h"
#include "gt/intel_gt_regs.h"
+#include "i915_reg.h"
#define XEHP_MTCFG_ADDR _MMIO(0x101800)
#define TILE_COUNT REG_GENMASK(15, 8)
diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c
index 86b966fffbe5..d91054c78702 100644
--- a/drivers/gpu/drm/xe/xe_mocs.c
+++ b/drivers/gpu/drm/xe/xe_mocs.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_mocs.h"
+
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_engine.h"
#include "xe_gt.h"
-#include "xe_platform_types.h"
#include "xe_mmio.h"
-#include "xe_mocs.h"
+#include "xe_platform_types.h"
#include "xe_step_types.h"
#include "gt/intel_gt_regs.h"
diff --git a/drivers/gpu/drm/xe/xe_module.c b/drivers/gpu/drm/xe/xe_module.c
index 9cd1663f83f6..5a51a9959eff 100644
--- a/drivers/gpu/drm/xe/xe_module.c
+++ b/drivers/gpu/drm/xe/xe_module.c
@@ -3,6 +3,8 @@
* Copyright © 2021 Intel Corporation
*/
+#include "xe_module.h"
+
#include <linux/init.h>
#include <linux/module.h>
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 522c71d4c674..29270cce7a46 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -10,12 +10,12 @@
#include <linux/pci.h>
#include <linux/pm_runtime.h>
-#include <drm/drm_drv.h>
#include <drm/drm_color_mgmt.h>
+#include <drm/drm_drv.h>
#include <drm/xe_pciids.h>
-#include "xe_drv.h"
#include "xe_device.h"
+#include "xe_drv.h"
#include "xe_macros.h"
#include "xe_module.h"
#include "xe_pm.h"
diff --git a/drivers/gpu/drm/xe/xe_pcode.c b/drivers/gpu/drm/xe/xe_pcode.c
index 1a76fe478853..fb1ce2d49bec 100644
--- a/drivers/gpu/drm/xe/xe_pcode.c
+++ b/drivers/gpu/drm/xe/xe_pcode.c
@@ -3,15 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
-#include "xe_pcode_api.h"
#include "xe_pcode.h"
-#include "xe_gt.h"
-#include "xe_mmio.h"
-
+#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/delay.h>
+#include "xe_gt.h"
+#include "xe_mmio.h"
+#include "xe_pcode_api.h"
/**
* DOC: PCODE
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 769f380cf1d4..b7b57f10ba25 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_pm.h"
+
#include <linux/pm_runtime.h>
#include <drm/ttm/ttm_placement.h>
@@ -11,9 +13,8 @@
#include "xe_bo_evict.h"
#include "xe_device.h"
#include "xe_display.h"
-#include "xe_pm.h"
-#include "xe_gt.h"
#include "xe_ggtt.h"
+#include "xe_gt.h"
#include "xe_irq.h"
#include "xe_pcode.h"
diff --git a/drivers/gpu/drm/xe/xe_preempt_fence.c b/drivers/gpu/drm/xe/xe_preempt_fence.c
index 6ab9ff442766..78ad8c209873 100644
--- a/drivers/gpu/drm/xe/xe_preempt_fence.c
+++ b/drivers/gpu/drm/xe/xe_preempt_fence.c
@@ -3,10 +3,11 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_preempt_fence.h"
+
#include <linux/slab.h>
#include "xe_engine.h"
-#include "xe_preempt_fence.h"
#include "xe_vm.h"
static void preempt_fence_work_func(struct work_struct *w)
diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index 435cc30d88c9..06fc7b206997 100644
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_pt.h"
+
#include <drm/drm_pt_walk.h>
#include "xe_bo.h"
@@ -10,12 +12,11 @@
#include "xe_gt.h"
#include "xe_gt_tlb_invalidation.h"
#include "xe_migrate.h"
-#include "xe_pt.h"
#include "xe_pt_types.h"
-#include "xe_vm.h"
#include "xe_res_cursor.h"
#include "xe_trace.h"
#include "xe_ttm_stolen_mgr.h"
+#include "xe_vm.h"
struct xe_pt_dir {
struct xe_pt pt;
diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index f9f21bd1bfd7..0f70945176f6 100644
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -3,17 +3,19 @@
* Copyright © 2022 Intel Corporation
*/
-#include <drm/xe_drm.h>
-#include <drm/ttm/ttm_placement.h>
+#include "xe_query.h"
+
#include <linux/nospec.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/xe_drm.h>
+
#include "xe_bo.h"
#include "xe_device.h"
-#include "xe_gt.h"
-#include "xe_macros.h"
-#include "xe_query.h"
#include "xe_ggtt.h"
+#include "xe_gt.h"
#include "xe_guc_hwconfig.h"
+#include "xe_macros.h"
static const enum xe_engine_class xe_to_user_engine_class[] = {
[XE_ENGINE_CLASS_RENDER] = DRM_XE_ENGINE_CLASS_RENDER,
diff --git a/drivers/gpu/drm/xe/xe_reg_sr.c b/drivers/gpu/drm/xe/xe_reg_sr.c
index f7eceb84e647..2de576c5fa74 100644
--- a/drivers/gpu/drm/xe/xe_reg_sr.c
+++ b/drivers/gpu/drm/xe/xe_reg_sr.c
@@ -9,16 +9,16 @@
#include <linux/string_helpers.h>
#include <linux/xarray.h>
-#include <drm/drm_print.h>
#include <drm/drm_managed.h>
+#include <drm/drm_print.h>
-#include "xe_rtp_types.h"
#include "xe_device_types.h"
#include "xe_force_wake.h"
#include "xe_gt.h"
#include "xe_gt_mcr.h"
#include "xe_macros.h"
#include "xe_mmio.h"
+#include "xe_rtp_types.h"
#include "gt/intel_engine_regs.h"
#include "gt/intel_gt_regs.h"
diff --git a/drivers/gpu/drm/xe/xe_reg_sr_types.h b/drivers/gpu/drm/xe/xe_reg_sr_types.h
index 2fa7ff3966ba..b234a8673e54 100644
--- a/drivers/gpu/drm/xe/xe_reg_sr_types.h
+++ b/drivers/gpu/drm/xe/xe_reg_sr_types.h
@@ -6,8 +6,8 @@
#ifndef _XE_REG_SR_TYPES_
#define _XE_REG_SR_TYPES_
-#include <linux/xarray.h>
#include <linux/types.h>
+#include <linux/xarray.h>
#include "i915_reg_defs.h"
diff --git a/drivers/gpu/drm/xe/xe_reg_whitelist.c b/drivers/gpu/drm/xe/xe_reg_whitelist.c
index a34617a642ec..f6ce801215e7 100644
--- a/drivers/gpu/drm/xe/xe_reg_whitelist.c
+++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c
@@ -5,12 +5,12 @@
#include "xe_reg_whitelist.h"
-#include "xe_platform_types.h"
#include "xe_gt_types.h"
+#include "xe_platform_types.h"
#include "xe_rtp.h"
-#include "../i915/gt/intel_engine_regs.h"
-#include "../i915/gt/intel_gt_regs.h"
+#include "gt/intel_engine_regs.h"
+#include "gt/intel_gt_regs.h"
#undef _MMIO
#undef MCR_REG
diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c
index 370ab1e729fa..ec58d01924cb 100644
--- a/drivers/gpu/drm/xe/xe_ring_ops.c
+++ b/drivers/gpu/drm/xe/xe_ring_ops.c
@@ -3,18 +3,19 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_ring_ops.h"
+
#include "xe_engine_types.h"
#include "xe_gt.h"
#include "xe_lrc.h"
#include "xe_macros.h"
-#include "xe_ring_ops.h"
#include "xe_sched_job.h"
#include "xe_vm_types.h"
-#include "i915_reg.h"
#include "gt/intel_gpu_commands.h"
#include "gt/intel_gt_regs.h"
#include "gt/intel_lrc_reg.h"
+#include "i915_reg.h"
static u32 preparser_disable(bool state)
{
diff --git a/drivers/gpu/drm/xe/xe_rtp.h b/drivers/gpu/drm/xe/xe_rtp.h
index 1ac3fd1c0734..d6ba0b7e5042 100644
--- a/drivers/gpu/drm/xe/xe_rtp.h
+++ b/drivers/gpu/drm/xe/xe_rtp.h
@@ -6,8 +6,8 @@
#ifndef _XE_RTP_
#define _XE_RTP_
-#include <linux/xarray.h>
#include <linux/types.h>
+#include <linux/xarray.h>
#include "xe_rtp_types.h"
diff --git a/drivers/gpu/drm/xe/xe_sa.c b/drivers/gpu/drm/xe/xe_sa.c
index e432f40b9bfe..79dc090433ff 100644
--- a/drivers/gpu/drm/xe/xe_sa.c
+++ b/drivers/gpu/drm/xe/xe_sa.c
@@ -3,14 +3,16 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_sa.h"
+
#include <linux/kernel.h>
+
#include <drm/drm_managed.h>
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_gt.h"
#include "xe_map.h"
-#include "xe_sa.h"
static void xe_sa_bo_manager_fini(struct drm_device *drm, void *arg)
{
diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
index 0fbd8d0978cf..99f1ed87196d 100644
--- a/drivers/gpu/drm/xe/xe_sync.c
+++ b/drivers/gpu/drm/xe/xe_sync.c
@@ -8,13 +8,14 @@
#include <linux/kthread.h>
#include <linux/sched/mm.h>
#include <linux/uaccess.h>
-#include <drm/xe_drm.h>
+
#include <drm/drm_print.h>
#include <drm/drm_syncobj.h>
+#include <drm/xe_drm.h>
#include "xe_device_types.h"
-#include "xe_sched_job_types.h"
#include "xe_macros.h"
+#include "xe_sched_job_types.h"
#define SYNC_FLAGS_TYPE_MASK 0x3
#define SYNC_FLAGS_FENCE_INSTALLED 0x10000
diff --git a/drivers/gpu/drm/xe/xe_trace.h b/drivers/gpu/drm/xe/xe_trace.h
index 1774658b18b7..2f8eb7ebe9a7 100644
--- a/drivers/gpu/drm/xe/xe_trace.h
+++ b/drivers/gpu/drm/xe/xe_trace.h
@@ -9,13 +9,13 @@
#if !defined(_XE_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
#define _XE_TRACE_H_
-#include <linux/types.h>
#include <linux/tracepoint.h>
+#include <linux/types.h>
#include "xe_bo_types.h"
#include "xe_engine_types.h"
-#include "xe_gt_types.h"
#include "xe_gt_tlb_invalidation_types.h"
+#include "xe_gt_types.h"
#include "xe_guc_engine_types.h"
#include "xe_sched_job.h"
#include "xe_vm_types.h"
diff --git a/drivers/gpu/drm/xe/xe_ttm_gtt_mgr.c b/drivers/gpu/drm/xe/xe_ttm_gtt_mgr.c
index a0ba8bba84d1..8075781070f2 100644
--- a/drivers/gpu/drm/xe/xe_ttm_gtt_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_gtt_mgr.c
@@ -6,8 +6,8 @@
#include <drm/drm_managed.h>
-#include <drm/ttm/ttm_range_manager.h>
#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_range_manager.h>
#include <drm/ttm/ttm_tt.h>
#include "xe_bo.h"
diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
index 097454f78286..fe0f707ad054 100644
--- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
@@ -8,8 +8,8 @@
#include <drm/drm_mm.h>
#include <drm/ttm/ttm_device.h>
-#include <drm/ttm/ttm_range_manager.h>
#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_range_manager.h>
#include "../i915/i915_reg.h"
diff --git a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
index c7e21673b8fd..643365b18bc7 100644
--- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
@@ -6,8 +6,8 @@
#include <drm/drm_managed.h>
-#include <drm/ttm/ttm_range_manager.h>
#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_range_manager.h>
#include "xe_bo.h"
#include "xe_device.h"
diff --git a/drivers/gpu/drm/xe/xe_tuning.c b/drivers/gpu/drm/xe/xe_tuning.c
index 595eb2de90ad..a3872f0330cb 100644
--- a/drivers/gpu/drm/xe/xe_tuning.c
+++ b/drivers/gpu/drm/xe/xe_tuning.c
@@ -5,8 +5,8 @@
#include "xe_tuning.h"
-#include "xe_platform_types.h"
#include "xe_gt_types.h"
+#include "xe_platform_types.h"
#include "xe_rtp.h"
#include "gt/intel_gt_regs.h"
diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
index 7886c8b85397..4ccf2b3435e1 100644
--- a/drivers/gpu/drm/xe/xe_uc.c
+++ b/drivers/gpu/drm/xe/xe_uc.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_uc.h"
+
#include "xe_device.h"
-#include "xe_huc.h"
#include "xe_gt.h"
#include "xe_guc.h"
#include "xe_guc_pc.h"
#include "xe_guc_submit.h"
-#include "xe_uc.h"
+#include "xe_huc.h"
#include "xe_uc_fw.h"
#include "xe_wopcm.h"
diff --git a/drivers/gpu/drm/xe/xe_uc_fw.h b/drivers/gpu/drm/xe/xe_uc_fw.h
index b0df5064b27d..ca64d379bb5e 100644
--- a/drivers/gpu/drm/xe/xe_uc_fw.h
+++ b/drivers/gpu/drm/xe/xe_uc_fw.h
@@ -8,9 +8,9 @@
#include <linux/errno.h>
-#include "xe_uc_fw_types.h"
-#include "xe_uc_fw_abi.h"
#include "xe_macros.h"
+#include "xe_uc_fw_abi.h"
+#include "xe_uc_fw_types.h"
struct drm_printer;
diff --git a/drivers/gpu/drm/xe/xe_uc_fw_abi.h b/drivers/gpu/drm/xe/xe_uc_fw_abi.h
index fc7b1855ee90..89e994ed4e00 100644
--- a/drivers/gpu/drm/xe/xe_uc_fw_abi.h
+++ b/drivers/gpu/drm/xe/xe_uc_fw_abi.h
@@ -6,8 +6,8 @@
#ifndef _XE_UC_FW_ABI_H
#define _XE_UC_FW_ABI_H
-#include <linux/types.h>
#include <linux/build_bug.h>
+#include <linux/types.h>
/**
* DOC: Firmware Layout
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 7276a375e2e0..a0e35627e45e 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -25,8 +25,8 @@
#include "xe_preempt_fence.h"
#include "xe_pt.h"
#include "xe_res_cursor.h"
-#include "xe_trace.h"
#include "xe_sync.h"
+#include "xe_trace.h"
#define TEST_VM_ASYNC_OPS_ERROR
diff --git a/drivers/gpu/drm/xe/xe_vm_madvise.c b/drivers/gpu/drm/xe/xe_vm_madvise.c
index 1e4e3a1b0631..29815852985a 100644
--- a/drivers/gpu/drm/xe/xe_vm_madvise.c
+++ b/drivers/gpu/drm/xe/xe_vm_madvise.c
@@ -3,13 +3,15 @@
* Copyright © 2021 Intel Corporation
*/
-#include <drm/xe_drm.h>
-#include <drm/ttm/ttm_tt.h>
+#include "xe_vm_madvise.h"
+
#include <linux/nospec.h>
+#include <drm/ttm/ttm_tt.h>
+#include <drm/xe_drm.h>
+
#include "xe_bo.h"
#include "xe_vm.h"
-#include "xe_vm_madvise.h"
static int madvise_preferred_mem_class(struct xe_device *xe, struct xe_vm *vm,
struct xe_vma **vmas, int num_vmas,
diff --git a/drivers/gpu/drm/xe/xe_wopcm.c b/drivers/gpu/drm/xe/xe_wopcm.c
index 8fe182afa06c..7bb880355f6b 100644
--- a/drivers/gpu/drm/xe/xe_wopcm.c
+++ b/drivers/gpu/drm/xe/xe_wopcm.c
@@ -3,13 +3,14 @@
* Copyright © 2022 Intel Corporation
*/
+#include "xe_wopcm.h"
+
#include "xe_device.h"
#include "xe_force_wake.h"
#include "xe_gt.h"
#include "xe_guc_reg.h"
#include "xe_mmio.h"
#include "xe_uc_fw.h"
-#include "xe_wopcm.h"
/**
* DOC: Write Once Protected Content Memory (WOPCM) Layout
--
2.39.0
More information about the Intel-xe
mailing list