Quoting Christoph Hellwig (2021-11-02 09:05:34)

Remove the separately included Makefile and just use the relative reference from the main i915 Makefile as for source files in other subdirectories.

The thinking behind the split is to avoid any merge conflicts as the gvt/ subdirectory is handled through separate pull request flow and are note part of drm-tip.

The other subdirectories are part of drm-intel-next/drm-intel-gt-next and are part of drm-tip.

So I would rather still see the Makefile live in gvt/ directory.

Regards, Joonas

Signed-off-by: Christoph Hellwig hch@lst.de

drivers/gpu/drm/i915/Makefile | 29 ++++++++++++++++++++++++----- drivers/gpu/drm/i915/gvt/Makefile | 9 --------- drivers/gpu/drm/i915/gvt/trace.h | 2 +- 3 files changed, 25 insertions(+), 15 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 335ba9f43d8f7..63523032eea26 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -295,11 +295,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 ea8324abc784a..0000000000000 --- a/drivers/gpu/drm/i915/gvt/Makefile +++ /dev/null @@ -1,9 +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
  

-ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ -i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) diff --git a/drivers/gpu/drm/i915/gvt/trace.h b/drivers/gpu/drm/i915/gvt/trace.h index 6d787750d279f..348f57f8301db 100644 --- a/drivers/gpu/drm/i915/gvt/trace.h +++ b/drivers/gpu/drm/i915/gvt/trace.h @@ -379,5 +379,5 @@ TRACE_EVENT(render_mmio, #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE trace +#define TRACE_INCLUDE_FILE gvt/trace

#include <trace/define_trace.h>

2.30.2