* [PATCH 1/2] drm/i915/gvt: rename kvmgt.c to kvmgt_module.c
@ 2026-11-20 15:57 Jani Nikula
2026-11-20 15:57 ` [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2026-11-20 15:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Make space for building the kvmgt.ko within gvt/. Otherwise, the names
would clash.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/gvt/Makefile | 2 +-
drivers/gpu/drm/i915/gvt/{kvmgt.c => kvmgt_module.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/gpu/drm/i915/gvt/{kvmgt.c => kvmgt_module.c} (100%)
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
index 1699f644298e..47f4f6f43c15 100644
--- a/drivers/gpu/drm/i915/gvt/Makefile
+++ b/drivers/gpu/drm/i915/gvt/Makefile
@@ -14,7 +14,7 @@ kvmgt-$(CONFIG_DRM_I915_GVT) += \
gvt/gtt.o \
gvt/handlers.o \
gvt/interrupt.o \
- gvt/kvmgt.o \
+ gvt/kvmgt_module.o \
gvt/mmio.o \
gvt/mmio_context.o \
gvt/opregion.o \
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt_module.c
similarity index 100%
rename from drivers/gpu/drm/i915/gvt/kvmgt.c
rename to drivers/gpu/drm/i915/gvt/kvmgt_module.c
--
2.47.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include
2026-11-20 15:57 [PATCH 1/2] drm/i915/gvt: rename kvmgt.c to kvmgt_module.c Jani Nikula
@ 2026-11-20 15:57 ` Jani Nikula
2026-11-20 16:12 ` Ville Syrjälä
0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2026-11-20 15:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Treat the gvt/ subdirectory and Makefile like a regular kernel driver
directory, and descend to it through kbuild, not Makefile include.
The main change is that the resulting kvmgt.ko is also placed in the
gvt/ subdirectory in the build directory.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 4 +--
drivers/gpu/drm/i915/gvt/Makefile | 48 ++++++++++++++++---------------
2 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index d4e7764621e1..ba7eecfffdca 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -433,10 +433,10 @@ i915-y += \
i915-$(CONFIG_DRM_I915_GVT) += \
intel_gvt.o \
intel_gvt_mmio_table.o
-include $(src)/gvt/Makefile
obj-$(CONFIG_DRM_I915) += i915.o
-obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
+
+obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/
# kernel-doc test
#
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
index 47f4f6f43c15..dfbf813f672c 100644
--- a/drivers/gpu/drm/i915/gvt/Makefile
+++ b/drivers/gpu/drm/i915/gvt/Makefile
@@ -1,25 +1,27 @@
# SPDX-License-Identifier: GPL-2.0
-kvmgt-$(CONFIG_DRM_I915_GVT) += \
- gvt/aperture_gm.o \
- gvt/cfg_space.o \
- gvt/cmd_parser.o \
- gvt/debugfs.o \
- gvt/display.o \
- gvt/dmabuf.o \
- gvt/edid.o \
- gvt/execlist.o \
- gvt/fb_decoder.o \
- gvt/firmware.o \
- gvt/gtt.o \
- gvt/handlers.o \
- gvt/interrupt.o \
- gvt/kvmgt_module.o \
- gvt/mmio.o \
- gvt/mmio_context.o \
- gvt/opregion.o \
- gvt/page_track.o \
- gvt/sched_policy.o \
- gvt/scheduler.o \
- gvt/trace_points.o \
- gvt/vgpu.o
+kvmgt-y += \
+ aperture_gm.o \
+ cfg_space.o \
+ cmd_parser.o \
+ debugfs.o \
+ display.o \
+ dmabuf.o \
+ edid.o \
+ execlist.o \
+ fb_decoder.o \
+ firmware.o \
+ gtt.o \
+ handlers.o \
+ interrupt.o \
+ kvmgt_module.o \
+ mmio.o \
+ mmio_context.o \
+ opregion.o \
+ page_track.o \
+ sched_policy.o \
+ scheduler.o \
+ trace_points.o \
+ vgpu.o
+
+obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
--
2.47.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include
2026-11-20 15:57 ` [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include Jani Nikula
@ 2026-11-20 16:12 ` Ville Syrjälä
2026-11-20 17:04 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2026-11-20 16:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Nov 20, 2026 at 05:57:34PM +0200, Jani Nikula wrote:
> Treat the gvt/ subdirectory and Makefile like a regular kernel driver
> directory, and descend to it through kbuild, not Makefile include.
>
> The main change is that the resulting kvmgt.ko is also placed in the
> gvt/ subdirectory in the build directory.
Does this also change where the module gets installed finally?
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/Makefile | 4 +--
> drivers/gpu/drm/i915/gvt/Makefile | 48 ++++++++++++++++---------------
> 2 files changed, 27 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index d4e7764621e1..ba7eecfffdca 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -433,10 +433,10 @@ i915-y += \
> i915-$(CONFIG_DRM_I915_GVT) += \
> intel_gvt.o \
> intel_gvt_mmio_table.o
> -include $(src)/gvt/Makefile
>
> obj-$(CONFIG_DRM_I915) += i915.o
> -obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
> +
> +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/
>
> # kernel-doc test
> #
> diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
> index 47f4f6f43c15..dfbf813f672c 100644
> --- a/drivers/gpu/drm/i915/gvt/Makefile
> +++ b/drivers/gpu/drm/i915/gvt/Makefile
> @@ -1,25 +1,27 @@
> # SPDX-License-Identifier: GPL-2.0
>
> -kvmgt-$(CONFIG_DRM_I915_GVT) += \
> - gvt/aperture_gm.o \
> - gvt/cfg_space.o \
> - gvt/cmd_parser.o \
> - gvt/debugfs.o \
> - gvt/display.o \
> - gvt/dmabuf.o \
> - gvt/edid.o \
> - gvt/execlist.o \
> - gvt/fb_decoder.o \
> - gvt/firmware.o \
> - gvt/gtt.o \
> - gvt/handlers.o \
> - gvt/interrupt.o \
> - gvt/kvmgt_module.o \
> - gvt/mmio.o \
> - gvt/mmio_context.o \
> - gvt/opregion.o \
> - gvt/page_track.o \
> - gvt/sched_policy.o \
> - gvt/scheduler.o \
> - gvt/trace_points.o \
> - gvt/vgpu.o
> +kvmgt-y += \
> + aperture_gm.o \
> + cfg_space.o \
> + cmd_parser.o \
> + debugfs.o \
> + display.o \
> + dmabuf.o \
> + edid.o \
> + execlist.o \
> + fb_decoder.o \
> + firmware.o \
> + gtt.o \
> + handlers.o \
> + interrupt.o \
> + kvmgt_module.o \
> + mmio.o \
> + mmio_context.o \
> + opregion.o \
> + page_track.o \
> + sched_policy.o \
> + scheduler.o \
> + trace_points.o \
> + vgpu.o
> +
> +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
> --
> 2.47.3
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include
2026-11-20 16:12 ` Ville Syrjälä
@ 2026-11-20 17:04 ` Jani Nikula
2026-11-20 17:30 ` Ville Syrjälä
0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2026-11-20 17:04 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Fri, 20 Nov 2026, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Nov 20, 2026 at 05:57:34PM +0200, Jani Nikula wrote:
>> Treat the gvt/ subdirectory and Makefile like a regular kernel driver
>> directory, and descend to it through kbuild, not Makefile include.
>>
>> The main change is that the resulting kvmgt.ko is also placed in the
>> gvt/ subdirectory in the build directory.
>
> Does this also change where the module gets installed finally?
Probably. If anyone depends on the exact location, they'll be hosed.
BR,
Jani.
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/Makefile | 4 +--
>> drivers/gpu/drm/i915/gvt/Makefile | 48 ++++++++++++++++---------------
>> 2 files changed, 27 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
>> index d4e7764621e1..ba7eecfffdca 100644
>> --- a/drivers/gpu/drm/i915/Makefile
>> +++ b/drivers/gpu/drm/i915/Makefile
>> @@ -433,10 +433,10 @@ i915-y += \
>> i915-$(CONFIG_DRM_I915_GVT) += \
>> intel_gvt.o \
>> intel_gvt_mmio_table.o
>> -include $(src)/gvt/Makefile
>>
>> obj-$(CONFIG_DRM_I915) += i915.o
>> -obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
>> +
>> +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/
>>
>> # kernel-doc test
>> #
>> diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
>> index 47f4f6f43c15..dfbf813f672c 100644
>> --- a/drivers/gpu/drm/i915/gvt/Makefile
>> +++ b/drivers/gpu/drm/i915/gvt/Makefile
>> @@ -1,25 +1,27 @@
>> # SPDX-License-Identifier: GPL-2.0
>>
>> -kvmgt-$(CONFIG_DRM_I915_GVT) += \
>> - gvt/aperture_gm.o \
>> - gvt/cfg_space.o \
>> - gvt/cmd_parser.o \
>> - gvt/debugfs.o \
>> - gvt/display.o \
>> - gvt/dmabuf.o \
>> - gvt/edid.o \
>> - gvt/execlist.o \
>> - gvt/fb_decoder.o \
>> - gvt/firmware.o \
>> - gvt/gtt.o \
>> - gvt/handlers.o \
>> - gvt/interrupt.o \
>> - gvt/kvmgt_module.o \
>> - gvt/mmio.o \
>> - gvt/mmio_context.o \
>> - gvt/opregion.o \
>> - gvt/page_track.o \
>> - gvt/sched_policy.o \
>> - gvt/scheduler.o \
>> - gvt/trace_points.o \
>> - gvt/vgpu.o
>> +kvmgt-y += \
>> + aperture_gm.o \
>> + cfg_space.o \
>> + cmd_parser.o \
>> + debugfs.o \
>> + display.o \
>> + dmabuf.o \
>> + edid.o \
>> + execlist.o \
>> + fb_decoder.o \
>> + firmware.o \
>> + gtt.o \
>> + handlers.o \
>> + interrupt.o \
>> + kvmgt_module.o \
>> + mmio.o \
>> + mmio_context.o \
>> + opregion.o \
>> + page_track.o \
>> + sched_policy.o \
>> + scheduler.o \
>> + trace_points.o \
>> + vgpu.o
>> +
>> +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
>> --
>> 2.47.3
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include
2026-11-20 17:04 ` Jani Nikula
@ 2026-11-20 17:30 ` Ville Syrjälä
0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2026-11-20 17:30 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Nov 20, 2026 at 07:04:22PM +0200, Jani Nikula wrote:
> On Fri, 20 Nov 2026, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> > On Fri, Nov 20, 2026 at 05:57:34PM +0200, Jani Nikula wrote:
> >> Treat the gvt/ subdirectory and Makefile like a regular kernel driver
> >> directory, and descend to it through kbuild, not Makefile include.
> >>
> >> The main change is that the resulting kvmgt.ko is also placed in the
> >> gvt/ subdirectory in the build directory.
> >
> > Does this also change where the module gets installed finally?
>
> Probably. If anyone depends on the exact location, they'll be hosed.
I suspect this thing is niche enough that we can go for it without
fear of drowning in bug reports afterwards.
Should highlight the change in installation directory in the commit
message regardless.
With that, the series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> BR,
> Jani.
>
>
> >
> >>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >> ---
> >> drivers/gpu/drm/i915/Makefile | 4 +--
> >> drivers/gpu/drm/i915/gvt/Makefile | 48 ++++++++++++++++---------------
> >> 2 files changed, 27 insertions(+), 25 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> >> index d4e7764621e1..ba7eecfffdca 100644
> >> --- a/drivers/gpu/drm/i915/Makefile
> >> +++ b/drivers/gpu/drm/i915/Makefile
> >> @@ -433,10 +433,10 @@ i915-y += \
> >> i915-$(CONFIG_DRM_I915_GVT) += \
> >> intel_gvt.o \
> >> intel_gvt_mmio_table.o
> >> -include $(src)/gvt/Makefile
> >>
> >> obj-$(CONFIG_DRM_I915) += i915.o
> >> -obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
> >> +
> >> +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/
> >>
> >> # kernel-doc test
> >> #
> >> diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
> >> index 47f4f6f43c15..dfbf813f672c 100644
> >> --- a/drivers/gpu/drm/i915/gvt/Makefile
> >> +++ b/drivers/gpu/drm/i915/gvt/Makefile
> >> @@ -1,25 +1,27 @@
> >> # SPDX-License-Identifier: GPL-2.0
> >>
> >> -kvmgt-$(CONFIG_DRM_I915_GVT) += \
> >> - gvt/aperture_gm.o \
> >> - gvt/cfg_space.o \
> >> - gvt/cmd_parser.o \
> >> - gvt/debugfs.o \
> >> - gvt/display.o \
> >> - gvt/dmabuf.o \
> >> - gvt/edid.o \
> >> - gvt/execlist.o \
> >> - gvt/fb_decoder.o \
> >> - gvt/firmware.o \
> >> - gvt/gtt.o \
> >> - gvt/handlers.o \
> >> - gvt/interrupt.o \
> >> - gvt/kvmgt_module.o \
> >> - gvt/mmio.o \
> >> - gvt/mmio_context.o \
> >> - gvt/opregion.o \
> >> - gvt/page_track.o \
> >> - gvt/sched_policy.o \
> >> - gvt/scheduler.o \
> >> - gvt/trace_points.o \
> >> - gvt/vgpu.o
> >> +kvmgt-y += \
> >> + aperture_gm.o \
> >> + cfg_space.o \
> >> + cmd_parser.o \
> >> + debugfs.o \
> >> + display.o \
> >> + dmabuf.o \
> >> + edid.o \
> >> + execlist.o \
> >> + fb_decoder.o \
> >> + firmware.o \
> >> + gtt.o \
> >> + handlers.o \
> >> + interrupt.o \
> >> + kvmgt_module.o \
> >> + mmio.o \
> >> + mmio_context.o \
> >> + opregion.o \
> >> + page_track.o \
> >> + sched_policy.o \
> >> + scheduler.o \
> >> + trace_points.o \
> >> + vgpu.o
> >> +
> >> +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o
> >> --
> >> 2.47.3
>
> --
> Jani Nikula, Intel
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-11-20 17:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 15:57 [PATCH 1/2] drm/i915/gvt: rename kvmgt.c to kvmgt_module.c Jani Nikula
2026-11-20 15:57 ` [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include Jani Nikula
2026-11-20 16:12 ` Ville Syrjälä
2026-11-20 17:04 ` Jani Nikula
2026-11-20 17:30 ` Ville Syrjälä
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.