drm/i915/gvt: sort and group include directives

The include directives are a bit of a mess in gvt. Sort and group them to make them easier to deal with. Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Link: https://patch.msgid.link/c9f2b5a7367671965a7f5fa4f22b94ce9b980cfd.1767180318.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2026-03-03 18:28:01 +01:00 · 2025-12-31 13:26:07 +02:00
parent 9c4a56a8b7
commit 1bc99cdc1d
27 changed files with 113 additions and 91 deletions
--- a/drivers/gpu/drm/i915/gvt/aperture_gm.c
+++ b/drivers/gpu/drm/i915/gvt/aperture_gm.c
@@ -36,10 +36,11 @@

 #include <drm/drm_print.h>

+#include "gt/intel_ggtt_fencing.h"
+
+#include "gvt.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
-#include "gt/intel_ggtt_fencing.h"
-#include "gvt.h"

 static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm)
 {
--- a/drivers/gpu/drm/i915/gvt/cfg_space.c
+++ b/drivers/gpu/drm/i915/gvt/cfg_space.c
@@ -33,8 +33,8 @@

 #include <drm/drm_print.h>

-#include "i915_drv.h"
 #include "gvt.h"
+#include "i915_drv.h"
 #include "intel_pci_config.h"

 enum {
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -38,26 +38,28 @@

 #include <drm/drm_print.h>

-#include "i915_drv.h"
-#include "i915_reg.h"
+#include "display/i9xx_plane_regs.h"
 #include "display/intel_display_regs.h"
+#include "display/intel_sprite_regs.h"
+
+#include "gem/i915_gem_context.h"
+#include "gem/i915_gem_pm.h"
+
+#include "gt/intel_context.h"
 #include "gt/intel_engine_regs.h"
 #include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt_regs.h"
+#include "gt/intel_gt_requests.h"
 #include "gt/intel_lrc.h"
 #include "gt/intel_ring.h"
-#include "gt/intel_gt_requests.h"
 #include "gt/shmem_utils.h"
-#include "gvt.h"
-#include "i915_pvinfo.h"
-#include "trace.h"

-#include "display/i9xx_plane_regs.h"
-#include "display/intel_sprite_regs.h"
-#include "gem/i915_gem_context.h"
-#include "gem/i915_gem_pm.h"
-#include "gt/intel_context.h"
 #include "display_helpers.h"
+#include "gvt.h"
+#include "i915_drv.h"
+#include "i915_pvinfo.h"
+#include "i915_reg.h"
+#include "trace.h"

 #define INVALID_OP    (~0U)

--- a/drivers/gpu/drm/i915/gvt/debugfs.c
+++ b/drivers/gpu/drm/i915/gvt/debugfs.c
@@ -20,10 +20,12 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
+
 #include <linux/debugfs.h>
 #include <linux/list_sort.h>
-#include "i915_drv.h"
+
 #include "gvt.h"
+#include "i915_drv.h"

 struct mmio_diff_param {
 	struct intel_vgpu *vgpu;
--- a/drivers/gpu/drm/i915/gvt/display.c
+++ b/drivers/gpu/drm/i915/gvt/display.c
@@ -35,21 +35,21 @@
 #include <drm/display/drm_dp.h>
 #include <drm/drm_print.h>

-#include "i915_drv.h"
-#include "i915_reg.h"
-#include "display/intel_display_regs.h"
-#include "gvt.h"
-
 #include "display/bxt_dpio_phy_regs.h"
 #include "display/i9xx_plane_regs.h"
 #include "display/intel_crt_regs.h"
 #include "display/intel_cursor_regs.h"
 #include "display/intel_display.h"
-#include "display_helpers.h"
+#include "display/intel_display_regs.h"
 #include "display/intel_dpio_phy.h"
 #include "display/intel_dpll_mgr.h"
 #include "display/intel_sprite_regs.h"

+#include "display_helpers.h"
+#include "gvt.h"
+#include "i915_drv.h"
+#include "i915_reg.h"
+
 static int get_edp_pipe(struct intel_vgpu *vgpu)
 {
 	u32 data = vgpu_vreg(vgpu, _TRANS_DDI_FUNC_CTL_EDP);
--- a/drivers/gpu/drm/i915/gvt/display.h
+++ b/drivers/gpu/drm/i915/gvt/display.h
@@ -35,8 +35,8 @@
 #ifndef _GVT_DISPLAY_H_
 #define _GVT_DISPLAY_H_

-#include <linux/types.h>
 #include <linux/hrtimer.h>
+#include <linux/types.h>

 struct intel_gvt;
 struct intel_vgpu;
--- a/drivers/gpu/drm/i915/gvt/dmabuf.c
+++ b/drivers/gpu/drm/i915/gvt/dmabuf.c
@@ -35,12 +35,12 @@
 #include <drm/drm_plane.h>
 #include <drm/drm_print.h>

+#include "display/skl_universal_plane_regs.h"
+
 #include "gem/i915_gem_dmabuf.h"

-#include "i915_drv.h"
 #include "gvt.h"
-
-#include "display/skl_universal_plane_regs.h"
+#include "i915_drv.h"

 #define GEN8_DECODE_PTE(pte) (pte & GENMASK_ULL(63, 12))

--- a/drivers/gpu/drm/i915/gvt/dmabuf.h
+++ b/drivers/gpu/drm/i915/gvt/dmabuf.h
@@ -30,6 +30,7 @@

 #ifndef _GVT_DMABUF_H_
 #define _GVT_DMABUF_H_
+
 #include <linux/vfio.h>

 struct intel_vgpu_fb_info {
--- a/drivers/gpu/drm/i915/gvt/edid.c
+++ b/drivers/gpu/drm/i915/gvt/edid.c
@@ -38,6 +38,7 @@
 #include "display/intel_dp_aux_regs.h"
 #include "display/intel_gmbus.h"
 #include "display/intel_gmbus_regs.h"
+
 #include "gvt.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
--- a/drivers/gpu/drm/i915/gvt/execlist.c
+++ b/drivers/gpu/drm/i915/gvt/execlist.c
@@ -32,8 +32,8 @@
 *
 */

-#include "i915_drv.h"
 #include "gvt.h"
+#include "i915_drv.h"

 #define _EL_OFFSET_STATUS       0x234
 #define _EL_OFFSET_STATUS_BUF   0x370
--- a/drivers/gpu/drm/i915/gvt/fb_decoder.c
+++ b/drivers/gpu/drm/i915/gvt/fb_decoder.c
@@ -35,17 +35,17 @@

 #include <uapi/drm/drm_fourcc.h>

+#include "display/i9xx_plane_regs.h"
+#include "display/intel_cursor_regs.h"
+#include "display/intel_display_regs.h"
+#include "display/intel_sprite_regs.h"
+#include "display/skl_universal_plane_regs.h"
+
+#include "display_helpers.h"
 #include "gvt.h"
 #include "i915_drv.h"
 #include "i915_pvinfo.h"
 #include "i915_reg.h"
-#include "display/intel_display_regs.h"
-
-#include "display/i9xx_plane_regs.h"
-#include "display/intel_cursor_regs.h"
-#include "display/intel_sprite_regs.h"
-#include "display/skl_universal_plane_regs.h"
-#include "display_helpers.h"

 #define PRIMARY_FORMAT_NUM	16
 struct pixel_format {
--- a/drivers/gpu/drm/i915/gvt/firmware.c
+++ b/drivers/gpu/drm/i915/gvt/firmware.c
@@ -28,12 +28,12 @@
 *
 */

-#include <linux/firmware.h>
 #include <linux/crc32.h>
+#include <linux/firmware.h>
 #include <linux/vmalloc.h>

-#include "i915_drv.h"
 #include "gvt.h"
+#include "i915_drv.h"
 #include "i915_pvinfo.h"

 #define FIRMWARE_VERSION (0x0)
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -33,16 +33,17 @@
 *
 */

+#include <linux/vmalloc.h>
+
 #include <drm/drm_print.h>

-#include "i915_drv.h"
+#include "gt/intel_gt_regs.h"
+
 #include "gvt.h"
+#include "i915_drv.h"
 #include "i915_pvinfo.h"
 #include "trace.h"

-#include "gt/intel_gt_regs.h"
-#include <linux/vmalloc.h>
-
 #if defined(VERBOSE_DEBUG)
 #define gvt_vdbg_mm(fmt, args...) gvt_dbg_mm(fmt, ##args)
 #else
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -34,29 +34,28 @@
 #define _GVT_H_

 #include <uapi/linux/pci_regs.h>
-#include <linux/vfio.h>
 #include <linux/mdev.h>
-
+#include <linux/vfio.h>
 #include <asm/kvm_page_track.h>

 #include "gt/intel_gt.h"
-#include "intel_gvt.h"

+#include "cmd_parser.h"
 #include "debug.h"
-#include "mmio.h"
-#include "reg.h"
-#include "interrupt.h"
-#include "gtt.h"
 #include "display.h"
+#include "dmabuf.h"
 #include "edid.h"
 #include "execlist.h"
-#include "scheduler.h"
-#include "sched_policy.h"
-#include "mmio_context.h"
-#include "cmd_parser.h"
 #include "fb_decoder.h"
-#include "dmabuf.h"
+#include "gtt.h"
+#include "intel_gvt.h"
+#include "interrupt.h"
+#include "mmio.h"
+#include "mmio_context.h"
 #include "page_track.h"
+#include "reg.h"
+#include "sched_policy.h"
+#include "scheduler.h"

 #define GVT_MAX_VGPU 8

--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -36,19 +36,16 @@

 */

+#include <linux/vmalloc.h>
+
 #include <drm/display/drm_dp.h>
 #include <drm/drm_print.h>

-#include "i915_drv.h"
-#include "i915_reg.h"
-#include "display/intel_display_regs.h"
-#include "gvt.h"
-#include "i915_pvinfo.h"
-#include "intel_mchbar_regs.h"
 #include "display/bxt_dpio_phy_regs.h"
 #include "display/i9xx_plane_regs.h"
 #include "display/intel_crt_regs.h"
 #include "display/intel_cursor_regs.h"
+#include "display/intel_display_regs.h"
 #include "display/intel_display_types.h"
 #include "display/intel_dmc_regs.h"
 #include "display/intel_dp_aux_regs.h"
@@ -63,9 +60,15 @@
 #include "display/skl_universal_plane_regs.h"
 #include "display/skl_watermark_regs.h"
 #include "display/vlv_dsi_pll_regs.h"
+
 #include "gt/intel_gt_regs.h"
-#include <linux/vmalloc.h>
+
 #include "display_helpers.h"
+#include "gvt.h"
+#include "i915_drv.h"
+#include "i915_pvinfo.h"
+#include "i915_reg.h"
+#include "intel_mchbar_regs.h"

 /* XXX FIXME i915 has changed PP_XXX definition */
 #define PCH_PP_STATUS  _MMIO(0xc7200)
--- a/drivers/gpu/drm/i915/gvt/interrupt.c
+++ b/drivers/gpu/drm/i915/gvt/interrupt.c
@@ -33,10 +33,11 @@

 #include <drm/drm_print.h>

+#include "display/intel_display_regs.h"
+
+#include "gvt.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
-#include "display/intel_display_regs.h"
-#include "gvt.h"
 #include "trace.h"

 struct intel_gvt_irq_info {
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -33,26 +33,25 @@
 *    Zhi Wang <zhi.a.wang@intel.com>
 */

-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/kthread.h>
-#include <linux/sched/mm.h>
-#include <linux/types.h>
-#include <linux/list.h>
-#include <linux/rbtree.h>
-#include <linux/spinlock.h>
-#include <linux/eventfd.h>
-#include <linux/mdev.h>
 #include <linux/debugfs.h>
-
+#include <linux/eventfd.h>
+#include <linux/init.h>
+#include <linux/kthread.h>
+#include <linux/list.h>
+#include <linux/mdev.h>
+#include <linux/mm.h>
 #include <linux/nospec.h>
+#include <linux/rbtree.h>
+#include <linux/sched/mm.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>

 #include <drm/drm_edid.h>
 #include <drm/drm_print.h>

+#include "gvt.h"
 #include "i915_drv.h"
 #include "intel_gvt.h"
-#include "gvt.h"

 MODULE_IMPORT_NS("DMA_BUF");
 MODULE_IMPORT_NS("I915_GVT");
--- a/drivers/gpu/drm/i915/gvt/mmio.c
+++ b/drivers/gpu/drm/i915/gvt/mmio.c
@@ -37,14 +37,15 @@

 #include <drm/drm_print.h>

+#include "display/bxt_dpio_phy_regs.h"
+#include "display/intel_display_regs.h"
+#include "display/intel_dpio_phy.h"
+
+#include "gt/intel_gt_regs.h"
+
+#include "gvt.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
-#include "display/intel_display_regs.h"
-#include "gvt.h"
-
-#include "display/bxt_dpio_phy_regs.h"
-#include "display/intel_dpio_phy.h"
-#include "gt/intel_gt_regs.h"

 /**
 * intel_vgpu_gpa_to_mmio_offset - translate a GPA to MMIO offset
--- a/drivers/gpu/drm/i915/gvt/opregion.c
+++ b/drivers/gpu/drm/i915/gvt/opregion.c
@@ -22,8 +22,9 @@
 */

 #include <linux/acpi.h>
-#include "i915_drv.h"
+
 #include "gvt.h"
+#include "i915_drv.h"

 /*
 * Note: Only for GVT-g virtual VBT generation, other usage must
--- a/drivers/gpu/drm/i915/gvt/page_track.c
+++ b/drivers/gpu/drm/i915/gvt/page_track.c
@@ -20,8 +20,9 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-#include "i915_drv.h"
+
 #include "gvt.h"
+#include "i915_drv.h"

 /**
 * intel_vgpu_find_page_track - find page track rcord of guest page
--- a/drivers/gpu/drm/i915/gvt/sched_policy.c
+++ b/drivers/gpu/drm/i915/gvt/sched_policy.c
@@ -31,8 +31,8 @@
 *
 */

-#include "i915_drv.h"
 #include "gvt.h"
+#include "i915_drv.h"

 static bool vgpu_has_pending_workload(struct intel_vgpu *vgpu)
 {
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -38,16 +38,17 @@
 #include <drm/drm_print.h>

 #include "gem/i915_gem_pm.h"
+
 #include "gt/intel_context.h"
 #include "gt/intel_execlists_submission.h"
 #include "gt/intel_gt_regs.h"
 #include "gt/intel_lrc.h"
 #include "gt/intel_ring.h"

+#include "gvt.h"
 #include "i915_drv.h"
 #include "i915_gem_gtt.h"
 #include "i915_perf_oa_regs.h"
-#include "gvt.h"

 #define RING_CTX_OFF(x) \
 	offsetof(struct execlist_ring_context, x)
--- a/drivers/gpu/drm/i915/gvt/trace.h
+++ b/drivers/gpu/drm/i915/gvt/trace.h
@@ -31,9 +31,9 @@
 #if !defined(_GVT_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
 #define _GVT_TRACE_H_

-#include <linux/types.h>
 #include <linux/stringify.h>
 #include <linux/tracepoint.h>
+#include <linux/types.h>
 #include <asm/tsc.h>

 #undef TRACE_SYSTEM
--- a/drivers/gpu/drm/i915/gvt/trace_points.c
+++ b/drivers/gpu/drm/i915/gvt/trace_points.c
@@ -30,5 +30,7 @@

 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
+
 #include "trace.h"
+
 #endif
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -31,12 +31,13 @@
 *
 */

+#include <linux/vmalloc.h>
+
 #include <drm/drm_print.h>

-#include "i915_drv.h"
 #include "gvt.h"
+#include "i915_drv.h"
 #include "i915_pvinfo.h"
-#include <linux/vmalloc.h>

 void populate_pvinfo_page(struct intel_vgpu *vgpu)
 {
--- a/drivers/gpu/drm/i915/intel_gvt.c
+++ b/drivers/gpu/drm/i915/intel_gvt.c
@@ -21,16 +21,19 @@
 * SOFTWARE.
 */

+#include <linux/vmalloc.h>
+
 #include <drm/drm_print.h>

+#include "gem/i915_gem_dmabuf.h"
+
+#include "gt/intel_context.h"
+#include "gt/intel_ring.h"
+#include "gt/shmem_utils.h"
+
 #include "i915_drv.h"
 #include "i915_vgpu.h"
 #include "intel_gvt.h"
-#include "gem/i915_gem_dmabuf.h"
-#include "gt/intel_context.h"
-#include "gt/intel_ring.h"
-#include "gt/shmem_utils.h"
-#include <linux/vmalloc.h>

 /**
 * DOC: Intel GVT-g host support
--- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
@@ -12,6 +12,7 @@
 #include "display/intel_crt_regs.h"
 #include "display/intel_cursor_regs.h"
 #include "display/intel_display_core.h"
+#include "display/intel_display_regs.h"
 #include "display/intel_display_types.h"
 #include "display/intel_dmc_regs.h"
 #include "display/intel_dp_aux_regs.h"
@@ -27,14 +28,15 @@
 #include "display/skl_universal_plane_regs.h"
 #include "display/skl_watermark_regs.h"
 #include "display/vlv_dsi_pll_regs.h"
+
 #include "gt/intel_engine_regs.h"
 #include "gt/intel_gt_regs.h"
+
 #include "gvt/reg.h"

 #include "i915_drv.h"
 #include "i915_pvinfo.h"
 #include "i915_reg.h"
-#include "display/intel_display_regs.h"
 #include "intel_gvt.h"
 #include "intel_mchbar_regs.h"