Commit ea9f879d authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi
Browse files

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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent ba11f1b7

drivers/gpu/drm/xe/xe_bb.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/xe/xe_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Copyright © 2021 Intel Corporation

 */





#include "xe_bo.h"



#include <linux/dma-buf.h>

drivers/gpu/drm/xe/xe_bo_evict.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/xe/xe_debugfs.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/xe/xe_device.c

+4 −4
Original line number Diff line number Diff line
@@ -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"
@@ -20,8 +20,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"