Re: [PATCH 2/5] drm/i915/gvt: include sched_policy.h only where needed

[Nautiyal, Ankit K]

On 12/31/2025 4:56 PM, Jani Nikula wrote:

Not everything needs sched_policy.h. Drop it from gvt.h, and include
where needed.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>

Reviewed-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>

---
  drivers/gpu/drm/i915/gvt/gvt.h          | 1 -
  drivers/gpu/drm/i915/gvt/handlers.c     | 1 +
  drivers/gpu/drm/i915/gvt/kvmgt.c        | 1 +
  drivers/gpu/drm/i915/gvt/sched_policy.c | 1 +
  drivers/gpu/drm/i915/gvt/scheduler.c    | 1 +
  drivers/gpu/drm/i915/gvt/vgpu.c         | 1 +
  6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 965d94610d56..9adcdecadaa8 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -54,7 +54,6 @@
  #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 04cfe0997cde..68afd9b046d4 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -69,6 +69,7 @@
  #include "i915_pvinfo.h"
  #include "i915_reg.h"
  #include "intel_mchbar_regs.h"
+#include "sched_policy.h"

/* XXX FIXME i915 has changed PP_XXX definition */

  #define PCH_PP_STATUS  _MMIO(0xc7200)
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index b3739c9fcc48..009aa2df7958 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -52,6 +52,7 @@
  #include "gvt.h"
  #include "i915_drv.h"
  #include "intel_gvt.h"
+#include "sched_policy.h"

MODULE_IMPORT_NS("DMA_BUF");

  MODULE_IMPORT_NS("I915_GVT");
diff --git a/drivers/gpu/drm/i915/gvt/sched_policy.c 
b/drivers/gpu/drm/i915/gvt/sched_policy.c
index df787472b1cf..9736a15a896f 100644
--- a/drivers/gpu/drm/i915/gvt/sched_policy.c
+++ b/drivers/gpu/drm/i915/gvt/sched_policy.c
@@ -33,6 +33,7 @@

#include "gvt.h"

  #include "i915_drv.h"
+#include "sched_policy.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 a91accfd371d..6b5ee40a4386 100644
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -49,6 +49,7 @@
  #include "i915_drv.h"
  #include "i915_gem_gtt.h"
  #include "i915_perf_oa_regs.h"
+#include "sched_policy.h"

#define RING_CTX_OFF(x) \

        offsetof(struct execlist_ring_context, x)
diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
index a12011410874..96d0bd1fa337 100644
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -38,6 +38,7 @@
  #include "gvt.h"
  #include "i915_drv.h"
  #include "i915_pvinfo.h"
+#include "sched_policy.h"

void populate_pvinfo_page(struct intel_vgpu *vgpu)

  {