drm/i915/gvt: clean up makefile
cover drm/i915/gvt: clean up makefile
This is [1] rebased on gvt-next. (Which means it won't build on CI.)
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/102003/
Jani Nikula (2):
drm/i915/gvt: fix trace TRACE_INCLUDE_PATH drm/i915/gvt: better align the Makefile with i915 Makefile
drivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/i915/gvt/Makefile | 30 +++++++++++++++++++++++------- drivers/gpu/drm/i915/gvt/trace.h | 2 +- 3 files changed, 27 insertions(+), 11 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/2 drm/i915/gvt: fix trace TRACE_INCLUDE_PATH
TRACE_INCLUDE_PATH should be a path relative to define_trace.h, not the file including it. (See the comment in include/trace/define_trace.h.)
--- drivers/gpu/drm/i915/gvt/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/trace.h +1 -1
@@ -377,7 +377,7 @@ TRACE_EVENT(render_mmio,/* This part must be out of protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH .#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/i915/gvt#define TRACE_INCLUDE_FILE trace#include <trace/define_trace.h>
Signature · 1 line
2.30.2
PATCH 2/2 drm/i915/gvt: better align the Makefile with i915 Makefile
In reply to Jani NikulaDrop extra ccflags, drop extra intermediate variables, list object files one per line alphabetically.
--- drivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/i915/gvt/Makefile | 30 +++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/Makefile +3 -3
@@ -321,10 +321,10 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ # virtual gpu code i915-y += i915_vgpu.o -ifeq ($(CONFIG_DRM_I915_GVT),y) -i915-y += intel_gvt.o intel_gvt_mmio_table.o +i915-$(CONFIG_DRM_I915_GVT) += \ + intel_gvt.o \ + intel_gvt_mmio_table.o include $(src)/gvt/Makefile -endif obj-$(CONFIG_DRM_I915) += i915.o obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
drivers/gpu/drm/i915/gvt/Makefile +23 -7
@@ -1,9 +1,25 @@ # 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)) +i915-$(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/gvt.o \ + gvt/handlers.o \ + gvt/interrupt.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
Signature · 1 line
2.30.2
Quoted 13 lines · Jani Nikula
This is [1] rebased on gvt-next. (Which means it won't build on CI.)
BR,
Jani.[1] https://patchwork.freedesktop.org/series/102003/
Cc Zhi Wang <[email protected]>Cc Christoph Hellwig <[email protected]>
Quoted 9 lines
Jani Nikula (2):
drm/i915/gvt: fix traceTRACE_INCLUDE_PATHdrm/i915/gvt: better align theMakefilewith i915Makefiledrivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/i915/gvt/Makefile | 30 +++++++++++++++++++++++------- drivers/gpu/drm/i915/gvt/trace.h | 2 +- 3 files changed, 27 insertions(+), 11 deletions(-)
Thanks so much for the patch.
Re: [Intel-gfx] [PATCH 1/2] drm/i915/gvt: fix trace TRACE_INCLUDE_PATH
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
TRACE_INCLUDE_PATHshould be a path relative todefine_trace.h, not the file including it. (See the comment ininclude/trace/define_trace.h.)
Looks good:
Re: [Intel-gfx] [PATCH 2/2] drm/i915/gvt: better align the Makefile with i915 Makefile
In reply to Jani NikulaLooks good:
Quoted 1 line · Jani Nikula
This is [1] rebased on gvt-next. (Which means it won't build on CI.)
Btw, now that I found that gvt-next branch:
Zhi, your commits still have per-commit changelog like:
v6:
- Remove the reference of intel_gvt_device_info.(Christoph)
- Refine the save_mmio() function. (Christoph)
which don't belong in the commit log. It might be worth to fix that before sending a pull request.
Quoted 5 lines · Christoph Hellwig
Quoted 1 line · Jani Nikula
This is [1] rebased on gvt-next. (Which means it won't build on CI.)
Btw, now that I found that gvt-next branch:
Quoted 8 lines
Zhi, your commits still have per-commit changelog like:
v6:
- Remove the reference of intel_gvt_device_info.(Christoph)
- Refine thesave_mmio()function. (Christoph)which don't belong in the commit log. It might be worth to fix that before sending a pull request.
I'll just note, without any value judgement, that it is customary in the drm land to do so. They are fine here even if they're not accepted in other subsystems. I'm not going to insist one way or the other.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 10 lines · Jani Nikula
Quoted 6 lines
v6:
- Remove the reference of intel_gvt_device_info.(Christoph)
- Refine thesave_mmio()function. (Christoph)which don't belong in the commit log. It might be worth to fix that before sending a pull request.
I'll just note, without any value judgement, that it is customary in the drm land to do so. They are fine here even if they're not accepted in other subsystems. I'm not going to insist one way or the other.
Ok. Seems very odd to me, but I guess I don't spend enough time in drm land to know this particular quirk.
Quoted 8 lines · Christoph Hellwig
Quoted 7 lines · Jani Nikula
Quoted 6 lines
v6:
- Remove the reference of intel_gvt_device_info.(Christoph)
- Refine thesave_mmio()function. (Christoph)which don't belong in the commit log. It might be worth to fix that before sending a pull request.
Quoted 6 lines
Quoted 3 lines
I'll just note, without any value judgement, that it is customary in the drm land to do so. They are fine here even if they're not accepted in other subsystems. I'm not going to insist one way or the other.
Ok. Seems very odd to me, but I guess I don't spend enough time in drm land to know this particular quirk.
FWIW, I've seen netdev has being doing this too sometimes..
IMHO I prefer maintainers put the Link: headers then we can get the changelog/etc from lore.
Jason