Skip to content

Commit ea9f879

Browse files
lucasdemarchirodrigovivi
authored andcommitted
drm/xe: Sort includes
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 <[email protected]> Reviewed-by: Matthew Auld <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent ba11f1b commit ea9f879

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+172
-125
lines changed

drivers/gpu/drm/xe/xe_bb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
*/
55

66
#include "xe_bb.h"
7-
#include "xe_sa.h"
7+
88
#include "xe_device.h"
99
#include "xe_engine_types.h"
1010
#include "xe_hw_fence.h"
11+
#include "xe_sa.h"
1112
#include "xe_sched_job.h"
1213
#include "xe_vm_types.h"
1314

drivers/gpu/drm/xe/xe_bo.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © 2021 Intel Corporation
44
*/
55

6-
76
#include "xe_bo.h"
87

98
#include <linux/dma-buf.h>

drivers/gpu/drm/xe/xe_bo_evict.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* Copyright © 2022 Intel Corporation
44
*/
55

6-
#include "xe_bo.h"
76
#include "xe_bo_evict.h"
7+
8+
#include "xe_bo.h"
89
#include "xe_device.h"
910
#include "xe_ggtt.h"
1011
#include "xe_gt.h"

drivers/gpu/drm/xe/xe_debugfs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
* Copyright © 2022 Intel Corporation
44
*/
55

6+
#include "xe_debugfs.h"
7+
68
#include <linux/string_helpers.h>
79

810
#include <drm/drm_debugfs.h>
911

1012
#include "xe_bo.h"
1113
#include "xe_device.h"
12-
#include "xe_debugfs.h"
1314
#include "xe_gt_debugfs.h"
1415
#include "xe_step.h"
1516

drivers/gpu/drm/xe/xe_device.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
#include "xe_device.h"
77

8-
#include <drm/drm_gem_ttm_helper.h>
98
#include <drm/drm_aperture.h>
9+
#include <drm/drm_atomic_helper.h>
10+
#include <drm/drm_gem_ttm_helper.h>
1011
#include <drm/drm_ioctl.h>
11-
#include <drm/xe_drm.h>
1212
#include <drm/drm_managed.h>
13-
#include <drm/drm_atomic_helper.h>
13+
#include <drm/xe_drm.h>
1414

1515
#include "xe_bo.h"
1616
#include "xe_debugfs.h"
@@ -20,8 +20,8 @@
2020
#include "xe_exec.h"
2121
#include "xe_gt.h"
2222
#include "xe_irq.h"
23-
#include "xe_module.h"
2423
#include "xe_mmio.h"
24+
#include "xe_module.h"
2525
#include "xe_pcode.h"
2626
#include "xe_pm.h"
2727
#include "xe_query.h"

drivers/gpu/drm/xe/xe_device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ struct xe_file;
1212
#include <drm/drm_util.h>
1313

1414
#include "xe_device_types.h"
15-
#include "xe_macros.h"
1615
#include "xe_force_wake.h"
16+
#include "xe_macros.h"
1717

1818
#include "gt/intel_gpu_commands.h"
1919

drivers/gpu/drm/xe/xe_dma_buf.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
* Copyright © 2022 Intel Corporation
44
*/
55

6+
#include "xe_dma_buf.h"
7+
8+
#include <kunit/test.h>
69
#include <linux/dma-buf.h>
10+
#include <linux/pci-p2pdma.h>
711

812
#include <drm/drm_device.h>
913
#include <drm/drm_prime.h>
10-
1114
#include <drm/ttm/ttm_tt.h>
1215

13-
#include <kunit/test.h>
14-
#include <linux/pci-p2pdma.h>
15-
1616
#include "tests/xe_test.h"
1717
#include "xe_bo.h"
1818
#include "xe_device.h"
19-
#include "xe_dma_buf.h"
2019
#include "xe_ttm_vram_mgr.h"
2120
#include "xe_vm.h"
2221

drivers/gpu/drm/xe/xe_engine.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
#include "xe_engine.h"
77

8+
#include <linux/nospec.h>
9+
810
#include <drm/drm_device.h>
911
#include <drm/drm_file.h>
1012
#include <drm/xe_drm.h>
11-
#include <linux/nospec.h>
1213

1314
#include "xe_device.h"
1415
#include "xe_gt.h"

drivers/gpu/drm/xe/xe_exec.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
* Copyright © 2022 Intel Corporation
44
*/
55

6+
#include "xe_exec.h"
7+
68
#include <drm/drm_device.h>
79
#include <drm/drm_file.h>
810
#include <drm/xe_drm.h>
911

1012
#include "xe_bo.h"
1113
#include "xe_device.h"
1214
#include "xe_engine.h"
13-
#include "xe_exec.h"
1415
#include "xe_macros.h"
1516
#include "xe_sched_job.h"
1617
#include "xe_sync.h"

drivers/gpu/drm/xe/xe_execlist.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
* Copyright © 2021 Intel Corporation
44
*/
55

6-
#include <drm/drm_managed.h>
7-
86
#include "xe_execlist.h"
97

8+
#include <drm/drm_managed.h>
9+
1010
#include "xe_bo.h"
1111
#include "xe_device.h"
1212
#include "xe_engine.h"
13-
#include "xe_hw_fence.h"
1413
#include "xe_gt.h"
14+
#include "xe_hw_fence.h"
1515
#include "xe_lrc.h"
1616
#include "xe_macros.h"
1717
#include "xe_mmio.h"
1818
#include "xe_mocs.h"
1919
#include "xe_ring_ops_types.h"
2020
#include "xe_sched_job.h"
2121

22-
#include "i915_reg.h"
22+
#include "gt/intel_engine_regs.h"
2323
#include "gt/intel_gpu_commands.h"
2424
#include "gt/intel_gt_regs.h"
2525
#include "gt/intel_lrc_reg.h"
26-
#include "gt/intel_engine_regs.h"
26+
#include "i915_reg.h"
2727

2828
#define XE_EXECLIST_HANG_LIMIT 1
2929

0 commit comments

Comments
 (0)