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>

diff --git a/drivers/gpu/drm/i915/gvt/aperture_gm.c b/drivers/gpu/drm/i915/gvt/aperture_gm.c
index 8cc6e712b0f72c33d9b59d68a067c828ee84596b..253b41789be910f71bb535e44a375000c882dd34 100644 (file)
--- 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 "i915_drv.h"
-#include "i915_reg.h"
 #include "gt/intel_ggtt_fencing.h"
+
 #include "gvt.h"
+#include "i915_drv.h"
+#include "i915_reg.h"
 
 static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm)
 {

diff --git a/drivers/gpu/drm/i915/gvt/cfg_space.c b/drivers/gpu/drm/i915/gvt/cfg_space.c
index 295a7b5e1d7ccd97637ac7b5e93788e5892cdae5..1937e04d37915cecc19a88dfdf317a59de18a57f 100644 (file)
--- 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 {

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index e5301733f4e446d97677f958c44ef27f1214b2c6..bf7c3d3f5f8a2b9dfd94aba7337eed3e80718f70 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -38,27 +38,29 @@
 
 #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 "display_helpers.h"
 #include "gvt.h"
+#include "i915_drv.h"
 #include "i915_pvinfo.h"
+#include "i915_reg.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"
-
 #define INVALID_OP    (~0U)
 
 #define OP_LEN_MI           9

diff --git a/drivers/gpu/drm/i915/gvt/debugfs.c b/drivers/gpu/drm/i915/gvt/debugfs.c
index 415422b5943cc7664ce8d70f44c67f73775f64d3..ae3fd2c3cd238d62f747e7db8b227d41a73bba81 100644 (file)
--- 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;

diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
index f230b07a12ae17c4118a5f2a0efc5006d932ab44..21341842c0a939594b1b87ced72abbed59f7cfaf 100644 (file)
--- 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);

diff --git a/drivers/gpu/drm/i915/gvt/display.h b/drivers/gpu/drm/i915/gvt/display.h
index bc7f05f9a2711307e1985d34ba1d8e6743abfe15..41a3b053663ad4196e39eff8db1c424a15f57c7c 100644 (file)
--- 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;

diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c
index 92506c80322d419d7a0e8171c9829a42c364f6b0..8e76869b352c8c0934f308d41351c6d0de3c3114 100644 (file)
--- 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))
 

diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.h b/drivers/gpu/drm/i915/gvt/dmabuf.h
index 3dcdb6570edae32d8be99de0deeed5785a17e8fe..06445e1cf3cf5ecf836076549061d901ed71ffb3 100644 (file)
--- 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 {

diff --git a/drivers/gpu/drm/i915/gvt/edid.c b/drivers/gpu/drm/i915/gvt/edid.c
index 30e414381af36e7ec730bf2cbd1e84ab4456f64c..021afff1cd5d44e713d0820fb0ed16ff0d0463c5 100644 (file)
--- 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"

diff --git a/drivers/gpu/drm/i915/gvt/execlist.c b/drivers/gpu/drm/i915/gvt/execlist.c
index 274c6ef42400b26c0829bd899a5a515982181b4b..29147a9f162e53712dc5b58e6ca595d11bbcf86a 100644 (file)
--- 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

diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.c b/drivers/gpu/drm/i915/gvt/fb_decoder.c
index 3d1a7e5c8cd3c4067befcde4e44b749dd24efcec..d7abf38df532eb7b2496e3275db81d60d09ebd34 100644 (file)
--- 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 "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_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"
 
 #define PRIMARY_FORMAT_NUM     16
 struct pixel_format {

diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index 221a3ae81baf5bec39108cfd4c6ed55e269e87b9..e452298991be47bff68134558e39ad34175ba8b9 100644 (file)
--- 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)

diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 076d9139edc6cb5af5ae5d571c4d594fc3f834f3..49028e7ef1e05383fe66a7c960e23375b8fc1e08 100644 (file)
--- 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

diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 1d10c16e6465d3af5779d2d5bfa72f644008f778..965d94610d562f0b3675153b713a56b3c7449ec3 100644 (file)
--- 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
 

diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index 7063d3c7756239d306f8992fb623f5433de78efe..04cfe0997cdea693a12d0905464d03d69beb0974 100644 (file)
--- 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)

diff --git a/drivers/gpu/drm/i915/gvt/interrupt.c b/drivers/gpu/drm/i915/gvt/interrupt.c
index 3e66269bc4ee100747828a8383bb13d1a0e736f3..91d22b1c62e20213077b395968b83db03b5b4815 100644 (file)
--- 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 "i915_drv.h"
-#include "i915_reg.h"
 #include "display/intel_display_regs.h"
+
 #include "gvt.h"
+#include "i915_drv.h"
+#include "i915_reg.h"
 #include "trace.h"
 
 struct intel_gvt_irq_info {

diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 3abc9206f1a8a78804b0bcdc2022132307de0545..b3739c9fcc485c70901bac9c3288532d6792aa05 100644 (file)
--- 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/debugfs.h>
+#include <linux/eventfd.h>
 #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/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");

diff --git a/drivers/gpu/drm/i915/gvt/mmio.c b/drivers/gpu/drm/i915/gvt/mmio.c
index 214eb7effa3118b1b2f742a777832ff82b32ad65..9e98db2d4f6749f5658940fe3636441f00727cea 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/mmio.c
+++ b/drivers/gpu/drm/i915/gvt/mmio.c
@@ -37,15 +37,16 @@
 
 #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/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"
+
 /**
  * intel_vgpu_gpa_to_mmio_offset - translate a GPA to MMIO offset
  * @vgpu: a vGPU

diff --git a/drivers/gpu/drm/i915/gvt/opregion.c b/drivers/gpu/drm/i915/gvt/opregion.c
index dbad4d853d3ade73cb4a91c9f06ec324fb6a1101..d6e76ba31d6066b30058c7f0f337a8306dd511d8 100644 (file)
--- 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

diff --git a/drivers/gpu/drm/i915/gvt/page_track.c b/drivers/gpu/drm/i915/gvt/page_track.c
index 20c3cd807488e063bd9c61492eef55fa83a1539b..b22ef801963ec2a20513dcc9eb8a08266fb6544f 100644 (file)
--- 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

diff --git a/drivers/gpu/drm/i915/gvt/sched_policy.c b/drivers/gpu/drm/i915/gvt/sched_policy.c
index 6c2d68e8826604a78ab3af7697cb7a8bdc3af0e5..df787472b1cfc997a1598df746daf703f8402d67 100644 (file)
--- 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)
 {

diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
index 63ad1fed525ae205b8a9c305031ac5c121afccf9..a91accfd371d009be94e004c11cc69ae524a0938 100644 (file)
--- 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)

diff --git a/drivers/gpu/drm/i915/gvt/trace.h b/drivers/gpu/drm/i915/gvt/trace.h
index 63874d385c6f1b9444c3f173da9b3274eb660b3a..8cd0601e478fd26f95ed3e21c3ca04f20c5d7739 100644 (file)
--- 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

diff --git a/drivers/gpu/drm/i915/gvt/trace_points.c b/drivers/gpu/drm/i915/gvt/trace_points.c
index fe552e877e096911a37cda531e8ae7abdbecfa34..79b75356d6224043aa4091012899eca97518c35c 100644 (file)
--- 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

diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
index c49e4bf95a30b34440609a3f391a9fb415ad7b38..a1201141087454c0754592defbc2eeaf5bf52ba9 100644 (file)
--- 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)
 {

diff --git a/drivers/gpu/drm/i915/intel_gvt.c b/drivers/gpu/drm/i915/intel_gvt.c
index 5f615ec0e580c90c71c81da2b18a51bd7864868e..6b43713899b81a5719e7e6820f3cf5314d4f01fa 100644 (file)
--- 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 "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>
+
+#include "i915_drv.h"
+#include "i915_vgpu.h"
+#include "intel_gvt.h"
 
 /**
  * DOC: Intel GVT-g host support

diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
index ca57a3dd3148bc366f03bfab09505eaae24e04b4..478d00f89a4bf6ea4663231a799feace31c809ba 100644 (file)
--- 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"