From: Masahiro Yamada <masahiroy@kernel.org>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
intel-gfx@lists.freedesktop.org
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Zhi Wang <zhi.a.wang@intel.com>,
dri-devel@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] drm/i915: remove gvt/Makefile
Date: Fri, 10 Apr 2020 00:06:27 +0900 [thread overview]
Message-ID: <20200409150627.29205-2-masahiroy@kernel.org> (raw)
In-Reply-To: <20200409150627.29205-1-masahiroy@kernel.org>
Including subdirectory Makefile from the driver main Makefile does not
buy us much because this is not real isolation.
Having a single Makefile at the top of the module is clearer, and
it is what this driver almost does.
Move all gvt objects to the i915 main Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
drivers/gpu/drm/i915/Makefile | 28 ++++++++++++++++++++++++----
drivers/gpu/drm/i915/gvt/Makefile | 8 --------
2 files changed, 24 insertions(+), 12 deletions(-)
delete mode 100644 drivers/gpu/drm/i915/gvt/Makefile
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 6cd1f6253814..74e965882a98 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -275,10 +275,30 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \
# virtual gpu code
i915-y += i915_vgpu.o
-ifeq ($(CONFIG_DRM_I915_GVT),y)
-i915-y += intel_gvt.o
-include $(src)/gvt/Makefile
-endif
+i915-$(CONFIG_DRM_I915_GVT) += \
+ intel_gvt.o \
+ gvt/gvt.o \
+ gvt/aperture_gm.o \
+ gvt/handlers.o \
+ gvt/vgpu.o \
+ gvt/trace_points.o \
+ gvt/firmware.o \
+ gvt/interrupt.o \
+ gvt/gtt.o \
+ gvt/cfg_space.o \
+ gvt/opregion.o \
+ gvt/mmio.o \
+ gvt/display.o \
+ gvt/edid.o \
+ gvt/execlist.o \
+ gvt/scheduler.o \
+ gvt/sched_policy.o \
+ gvt/mmio_context.o \
+ gvt/cmd_parser.o \
+ gvt/debugfs.o \
+ gvt/fb_decoder.o \
+ gvt/dmabuf.o \
+ gvt/page_track.o
obj-$(CONFIG_DRM_I915) += i915.o
obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
deleted file mode 100644
index 4d70f4689479..000000000000
--- a/drivers/gpu/drm/i915/gvt/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-GVT_DIR := gvt
-GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \
- interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \
- execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \
- fb_decoder.o dmabuf.o page_track.o
-
-i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
--
2.17.1
next prev parent reply other threads:[~2020-04-09 15:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 15:06 [PATCH 1/2] drm/i915: remove unneeded ccflags-y from gvt/Makefile Masahiro Yamada
2020-04-09 15:06 ` Masahiro Yamada [this message]
2020-04-09 21:58 ` [PATCH 2/2] drm/i915: remove gvt/Makefile Jani Nikula
2020-04-10 5:41 ` Zhenyu Wang
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=20200409150627.29205-2-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome