On Tue, Nov 02, 2021 at 08:05:34AM +0100, Christoph Hellwig wrote:

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

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

Reviewed-by: Jason Gunthorpe jgg@nvidia.com

-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

nit, nicer to sort makefile lists

Jason