Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

+113 -91
+3 -2
drivers/gpu/drm/i915/gvt/aperture_gm.c
··· 36 36 37 37 #include <drm/drm_print.h> 38 38 39 + #include "gt/intel_ggtt_fencing.h" 40 + 41 + #include "gvt.h" 39 42 #include "i915_drv.h" 40 43 #include "i915_reg.h" 41 - #include "gt/intel_ggtt_fencing.h" 42 - #include "gvt.h" 43 44 44 45 static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm) 45 46 {
+1 -1
drivers/gpu/drm/i915/gvt/cfg_space.c
··· 33 33 34 34 #include <drm/drm_print.h> 35 35 36 - #include "i915_drv.h" 37 36 #include "gvt.h" 37 + #include "i915_drv.h" 38 38 #include "intel_pci_config.h" 39 39 40 40 enum {
+13 -11
drivers/gpu/drm/i915/gvt/cmd_parser.c
··· 38 38 39 39 #include <drm/drm_print.h> 40 40 41 - #include "i915_drv.h" 42 - #include "i915_reg.h" 41 + #include "display/i9xx_plane_regs.h" 43 42 #include "display/intel_display_regs.h" 43 + #include "display/intel_sprite_regs.h" 44 + 45 + #include "gem/i915_gem_context.h" 46 + #include "gem/i915_gem_pm.h" 47 + 48 + #include "gt/intel_context.h" 44 49 #include "gt/intel_engine_regs.h" 45 50 #include "gt/intel_gpu_commands.h" 46 51 #include "gt/intel_gt_regs.h" 52 + #include "gt/intel_gt_requests.h" 47 53 #include "gt/intel_lrc.h" 48 54 #include "gt/intel_ring.h" 49 - #include "gt/intel_gt_requests.h" 50 55 #include "gt/shmem_utils.h" 51 - #include "gvt.h" 52 - #include "i915_pvinfo.h" 53 - #include "trace.h" 54 56 55 - #include "display/i9xx_plane_regs.h" 56 - #include "display/intel_sprite_regs.h" 57 - #include "gem/i915_gem_context.h" 58 - #include "gem/i915_gem_pm.h" 59 - #include "gt/intel_context.h" 60 57 #include "display_helpers.h" 58 + #include "gvt.h" 59 + #include "i915_drv.h" 60 + #include "i915_pvinfo.h" 61 + #include "i915_reg.h" 62 + #include "trace.h" 61 63 62 64 #define INVALID_OP (~0U) 63 65
+3 -1
drivers/gpu/drm/i915/gvt/debugfs.c
··· 20 20 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 21 21 * SOFTWARE. 22 22 */ 23 + 23 24 #include <linux/debugfs.h> 24 25 #include <linux/list_sort.h> 25 - #include "i915_drv.h" 26 + 26 27 #include "gvt.h" 28 + #include "i915_drv.h" 27 29 28 30 struct mmio_diff_param { 29 31 struct intel_vgpu *vgpu;
+6 -6
drivers/gpu/drm/i915/gvt/display.c
··· 35 35 #include <drm/display/drm_dp.h> 36 36 #include <drm/drm_print.h> 37 37 38 - #include "i915_drv.h" 39 - #include "i915_reg.h" 40 - #include "display/intel_display_regs.h" 41 - #include "gvt.h" 42 - 43 38 #include "display/bxt_dpio_phy_regs.h" 44 39 #include "display/i9xx_plane_regs.h" 45 40 #include "display/intel_crt_regs.h" 46 41 #include "display/intel_cursor_regs.h" 47 42 #include "display/intel_display.h" 48 - #include "display_helpers.h" 43 + #include "display/intel_display_regs.h" 49 44 #include "display/intel_dpio_phy.h" 50 45 #include "display/intel_dpll_mgr.h" 51 46 #include "display/intel_sprite_regs.h" 47 + 48 + #include "display_helpers.h" 49 + #include "gvt.h" 50 + #include "i915_drv.h" 51 + #include "i915_reg.h" 52 52 53 53 static int get_edp_pipe(struct intel_vgpu *vgpu) 54 54 {
+1 -1
drivers/gpu/drm/i915/gvt/display.h
··· 35 35 #ifndef _GVT_DISPLAY_H_ 36 36 #define _GVT_DISPLAY_H_ 37 37 38 - #include <linux/types.h> 39 38 #include <linux/hrtimer.h> 39 + #include <linux/types.h> 40 40 41 41 struct intel_gvt; 42 42 struct intel_vgpu;
+3 -3
drivers/gpu/drm/i915/gvt/dmabuf.c
··· 35 35 #include <drm/drm_plane.h> 36 36 #include <drm/drm_print.h> 37 37 38 + #include "display/skl_universal_plane_regs.h" 39 + 38 40 #include "gem/i915_gem_dmabuf.h" 39 41 40 - #include "i915_drv.h" 41 42 #include "gvt.h" 42 - 43 - #include "display/skl_universal_plane_regs.h" 43 + #include "i915_drv.h" 44 44 45 45 #define GEN8_DECODE_PTE(pte) (pte & GENMASK_ULL(63, 12)) 46 46
+1
drivers/gpu/drm/i915/gvt/dmabuf.h
··· 30 30 31 31 #ifndef _GVT_DMABUF_H_ 32 32 #define _GVT_DMABUF_H_ 33 + 33 34 #include <linux/vfio.h> 34 35 35 36 struct intel_vgpu_fb_info {
+1
drivers/gpu/drm/i915/gvt/edid.c
··· 38 38 #include "display/intel_dp_aux_regs.h" 39 39 #include "display/intel_gmbus.h" 40 40 #include "display/intel_gmbus_regs.h" 41 + 41 42 #include "gvt.h" 42 43 #include "i915_drv.h" 43 44 #include "i915_reg.h"
+1 -1
drivers/gpu/drm/i915/gvt/execlist.c
··· 32 32 * 33 33 */ 34 34 35 - #include "i915_drv.h" 36 35 #include "gvt.h" 36 + #include "i915_drv.h" 37 37 38 38 #define _EL_OFFSET_STATUS 0x234 39 39 #define _EL_OFFSET_STATUS_BUF 0x370
+7 -7
drivers/gpu/drm/i915/gvt/fb_decoder.c
··· 35 35 36 36 #include <uapi/drm/drm_fourcc.h> 37 37 38 + #include "display/i9xx_plane_regs.h" 39 + #include "display/intel_cursor_regs.h" 40 + #include "display/intel_display_regs.h" 41 + #include "display/intel_sprite_regs.h" 42 + #include "display/skl_universal_plane_regs.h" 43 + 44 + #include "display_helpers.h" 38 45 #include "gvt.h" 39 46 #include "i915_drv.h" 40 47 #include "i915_pvinfo.h" 41 48 #include "i915_reg.h" 42 - #include "display/intel_display_regs.h" 43 - 44 - #include "display/i9xx_plane_regs.h" 45 - #include "display/intel_cursor_regs.h" 46 - #include "display/intel_sprite_regs.h" 47 - #include "display/skl_universal_plane_regs.h" 48 - #include "display_helpers.h" 49 49 50 50 #define PRIMARY_FORMAT_NUM 16 51 51 struct pixel_format {
+2 -2
drivers/gpu/drm/i915/gvt/firmware.c
··· 28 28 * 29 29 */ 30 30 31 - #include <linux/firmware.h> 32 31 #include <linux/crc32.h> 32 + #include <linux/firmware.h> 33 33 #include <linux/vmalloc.h> 34 34 35 - #include "i915_drv.h" 36 35 #include "gvt.h" 36 + #include "i915_drv.h" 37 37 #include "i915_pvinfo.h" 38 38 39 39 #define FIRMWARE_VERSION (0x0)
+5 -4
drivers/gpu/drm/i915/gvt/gtt.c
··· 33 33 * 34 34 */ 35 35 36 + #include <linux/vmalloc.h> 37 + 36 38 #include <drm/drm_print.h> 37 39 38 - #include "i915_drv.h" 40 + #include "gt/intel_gt_regs.h" 41 + 39 42 #include "gvt.h" 43 + #include "i915_drv.h" 40 44 #include "i915_pvinfo.h" 41 45 #include "trace.h" 42 - 43 - #include "gt/intel_gt_regs.h" 44 - #include <linux/vmalloc.h> 45 46 46 47 #if defined(VERBOSE_DEBUG) 47 48 #define gvt_vdbg_mm(fmt, args...) gvt_dbg_mm(fmt, ##args)
+11 -12
drivers/gpu/drm/i915/gvt/gvt.h
··· 34 34 #define _GVT_H_ 35 35 36 36 #include <uapi/linux/pci_regs.h> 37 - #include <linux/vfio.h> 38 37 #include <linux/mdev.h> 39 - 38 + #include <linux/vfio.h> 40 39 #include <asm/kvm_page_track.h> 41 40 42 41 #include "gt/intel_gt.h" 43 - #include "intel_gvt.h" 44 42 43 + #include "cmd_parser.h" 45 44 #include "debug.h" 46 - #include "mmio.h" 47 - #include "reg.h" 48 - #include "interrupt.h" 49 - #include "gtt.h" 50 45 #include "display.h" 46 + #include "dmabuf.h" 51 47 #include "edid.h" 52 48 #include "execlist.h" 53 - #include "scheduler.h" 54 - #include "sched_policy.h" 55 - #include "mmio_context.h" 56 - #include "cmd_parser.h" 57 49 #include "fb_decoder.h" 58 - #include "dmabuf.h" 50 + #include "gtt.h" 51 + #include "intel_gvt.h" 52 + #include "interrupt.h" 53 + #include "mmio.h" 54 + #include "mmio_context.h" 59 55 #include "page_track.h" 56 + #include "reg.h" 57 + #include "sched_policy.h" 58 + #include "scheduler.h" 60 59 61 60 #define GVT_MAX_VGPU 8 62 61
+10 -7
drivers/gpu/drm/i915/gvt/handlers.c
··· 36 36 37 37 */ 38 38 39 + #include <linux/vmalloc.h> 40 + 39 41 #include <drm/display/drm_dp.h> 40 42 #include <drm/drm_print.h> 41 43 42 - #include "i915_drv.h" 43 - #include "i915_reg.h" 44 - #include "display/intel_display_regs.h" 45 - #include "gvt.h" 46 - #include "i915_pvinfo.h" 47 - #include "intel_mchbar_regs.h" 48 44 #include "display/bxt_dpio_phy_regs.h" 49 45 #include "display/i9xx_plane_regs.h" 50 46 #include "display/intel_crt_regs.h" 51 47 #include "display/intel_cursor_regs.h" 48 + #include "display/intel_display_regs.h" 52 49 #include "display/intel_display_types.h" 53 50 #include "display/intel_dmc_regs.h" 54 51 #include "display/intel_dp_aux_regs.h" ··· 60 63 #include "display/skl_universal_plane_regs.h" 61 64 #include "display/skl_watermark_regs.h" 62 65 #include "display/vlv_dsi_pll_regs.h" 66 + 63 67 #include "gt/intel_gt_regs.h" 64 - #include <linux/vmalloc.h> 68 + 65 69 #include "display_helpers.h" 70 + #include "gvt.h" 71 + #include "i915_drv.h" 72 + #include "i915_pvinfo.h" 73 + #include "i915_reg.h" 74 + #include "intel_mchbar_regs.h" 66 75 67 76 /* XXX FIXME i915 has changed PP_XXX definition */ 68 77 #define PCH_PP_STATUS _MMIO(0xc7200)
+3 -2
drivers/gpu/drm/i915/gvt/interrupt.c
··· 33 33 34 34 #include <drm/drm_print.h> 35 35 36 + #include "display/intel_display_regs.h" 37 + 38 + #include "gvt.h" 36 39 #include "i915_drv.h" 37 40 #include "i915_reg.h" 38 - #include "display/intel_display_regs.h" 39 - #include "gvt.h" 40 41 #include "trace.h" 41 42 42 43 struct intel_gvt_irq_info {
+11 -12
drivers/gpu/drm/i915/gvt/kvmgt.c
··· 33 33 * Zhi Wang <zhi.a.wang@intel.com> 34 34 */ 35 35 36 - #include <linux/init.h> 37 - #include <linux/mm.h> 38 - #include <linux/kthread.h> 39 - #include <linux/sched/mm.h> 40 - #include <linux/types.h> 41 - #include <linux/list.h> 42 - #include <linux/rbtree.h> 43 - #include <linux/spinlock.h> 44 - #include <linux/eventfd.h> 45 - #include <linux/mdev.h> 46 36 #include <linux/debugfs.h> 47 - 37 + #include <linux/eventfd.h> 38 + #include <linux/init.h> 39 + #include <linux/kthread.h> 40 + #include <linux/list.h> 41 + #include <linux/mdev.h> 42 + #include <linux/mm.h> 48 43 #include <linux/nospec.h> 44 + #include <linux/rbtree.h> 45 + #include <linux/sched/mm.h> 46 + #include <linux/spinlock.h> 47 + #include <linux/types.h> 49 48 50 49 #include <drm/drm_edid.h> 51 50 #include <drm/drm_print.h> 52 51 52 + #include "gvt.h" 53 53 #include "i915_drv.h" 54 54 #include "intel_gvt.h" 55 - #include "gvt.h" 56 55 57 56 MODULE_IMPORT_NS("DMA_BUF"); 58 57 MODULE_IMPORT_NS("I915_GVT");
+7 -6
drivers/gpu/drm/i915/gvt/mmio.c
··· 37 37 38 38 #include <drm/drm_print.h> 39 39 40 + #include "display/bxt_dpio_phy_regs.h" 41 + #include "display/intel_display_regs.h" 42 + #include "display/intel_dpio_phy.h" 43 + 44 + #include "gt/intel_gt_regs.h" 45 + 46 + #include "gvt.h" 40 47 #include "i915_drv.h" 41 48 #include "i915_reg.h" 42 - #include "display/intel_display_regs.h" 43 - #include "gvt.h" 44 - 45 - #include "display/bxt_dpio_phy_regs.h" 46 - #include "display/intel_dpio_phy.h" 47 - #include "gt/intel_gt_regs.h" 48 49 49 50 /** 50 51 * intel_vgpu_gpa_to_mmio_offset - translate a GPA to MMIO offset
+2 -1
drivers/gpu/drm/i915/gvt/opregion.c
··· 22 22 */ 23 23 24 24 #include <linux/acpi.h> 25 - #include "i915_drv.h" 25 + 26 26 #include "gvt.h" 27 + #include "i915_drv.h" 27 28 28 29 /* 29 30 * Note: Only for GVT-g virtual VBT generation, other usage must
+2 -1
drivers/gpu/drm/i915/gvt/page_track.c
··· 20 20 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 21 21 * SOFTWARE. 22 22 */ 23 - #include "i915_drv.h" 23 + 24 24 #include "gvt.h" 25 + #include "i915_drv.h" 25 26 26 27 /** 27 28 * intel_vgpu_find_page_track - find page track rcord of guest page
+1 -1
drivers/gpu/drm/i915/gvt/sched_policy.c
··· 31 31 * 32 32 */ 33 33 34 - #include "i915_drv.h" 35 34 #include "gvt.h" 35 + #include "i915_drv.h" 36 36 37 37 static bool vgpu_has_pending_workload(struct intel_vgpu *vgpu) 38 38 {
+2 -1
drivers/gpu/drm/i915/gvt/scheduler.c
··· 38 38 #include <drm/drm_print.h> 39 39 40 40 #include "gem/i915_gem_pm.h" 41 + 41 42 #include "gt/intel_context.h" 42 43 #include "gt/intel_execlists_submission.h" 43 44 #include "gt/intel_gt_regs.h" 44 45 #include "gt/intel_lrc.h" 45 46 #include "gt/intel_ring.h" 46 47 48 + #include "gvt.h" 47 49 #include "i915_drv.h" 48 50 #include "i915_gem_gtt.h" 49 51 #include "i915_perf_oa_regs.h" 50 - #include "gvt.h" 51 52 52 53 #define RING_CTX_OFF(x) \ 53 54 offsetof(struct execlist_ring_context, x)
+1 -1
drivers/gpu/drm/i915/gvt/trace.h
··· 31 31 #if !defined(_GVT_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) 32 32 #define _GVT_TRACE_H_ 33 33 34 - #include <linux/types.h> 35 34 #include <linux/stringify.h> 36 35 #include <linux/tracepoint.h> 36 + #include <linux/types.h> 37 37 #include <asm/tsc.h> 38 38 39 39 #undef TRACE_SYSTEM
+2
drivers/gpu/drm/i915/gvt/trace_points.c
··· 30 30 31 31 #ifndef __CHECKER__ 32 32 #define CREATE_TRACE_POINTS 33 + 33 34 #include "trace.h" 35 + 34 36 #endif
+3 -2
drivers/gpu/drm/i915/gvt/vgpu.c
··· 31 31 * 32 32 */ 33 33 34 + #include <linux/vmalloc.h> 35 + 34 36 #include <drm/drm_print.h> 35 37 36 - #include "i915_drv.h" 37 38 #include "gvt.h" 39 + #include "i915_drv.h" 38 40 #include "i915_pvinfo.h" 39 - #include <linux/vmalloc.h> 40 41 41 42 void populate_pvinfo_page(struct intel_vgpu *vgpu) 42 43 {
+8 -5
drivers/gpu/drm/i915/intel_gvt.c
··· 21 21 * SOFTWARE. 22 22 */ 23 23 24 + #include <linux/vmalloc.h> 25 + 24 26 #include <drm/drm_print.h> 27 + 28 + #include "gem/i915_gem_dmabuf.h" 29 + 30 + #include "gt/intel_context.h" 31 + #include "gt/intel_ring.h" 32 + #include "gt/shmem_utils.h" 25 33 26 34 #include "i915_drv.h" 27 35 #include "i915_vgpu.h" 28 36 #include "intel_gvt.h" 29 - #include "gem/i915_gem_dmabuf.h" 30 - #include "gt/intel_context.h" 31 - #include "gt/intel_ring.h" 32 - #include "gt/shmem_utils.h" 33 - #include <linux/vmalloc.h> 34 37 35 38 /** 36 39 * DOC: Intel GVT-g host support
+3 -1
drivers/gpu/drm/i915/intel_gvt_mmio_table.c
··· 12 12 #include "display/intel_crt_regs.h" 13 13 #include "display/intel_cursor_regs.h" 14 14 #include "display/intel_display_core.h" 15 + #include "display/intel_display_regs.h" 15 16 #include "display/intel_display_types.h" 16 17 #include "display/intel_dmc_regs.h" 17 18 #include "display/intel_dp_aux_regs.h" ··· 28 27 #include "display/skl_universal_plane_regs.h" 29 28 #include "display/skl_watermark_regs.h" 30 29 #include "display/vlv_dsi_pll_regs.h" 30 + 31 31 #include "gt/intel_engine_regs.h" 32 32 #include "gt/intel_gt_regs.h" 33 + 33 34 #include "gvt/reg.h" 34 35 35 36 #include "i915_drv.h" 36 37 #include "i915_pvinfo.h" 37 38 #include "i915_reg.h" 38 - #include "display/intel_display_regs.h" 39 39 #include "intel_gvt.h" 40 40 #include "intel_mchbar_regs.h" 41 41