From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include
Date: Fri, 20 Nov 2026 17:57:34 +0200 [thread overview]
Message-ID: <20261120155734.259742-2-jani.nikula@intel.com> (raw)
In-Reply-To: <20261120155734.259742-1-jani.nikula@intel.com>
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
next prev parent reply other threads:[~2026-11-20 15:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2026-11-20 16:12 ` [PATCH 2/2] drm/i915/gvt: Descend to GVT Makefile through kbuild, not include Ville Syrjälä
2026-11-20 17:04 ` Jani Nikula
2026-11-20 17:30 ` Ville Syrjälä
2026-11-20 19:35 ` ✓ i915.CI.BAT: success for series starting with [1/2] drm/i915/gvt: rename kvmgt.c to kvmgt_module.c Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120155734.259742-2-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.