From 5ed7a0cf339463d29163bdb828913d9a3f8c8c9e Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Wed, 26 Jun 2019 12:38:26 +0000 Subject: [PATCH] drm/i915: Move OA files to separate folder OA files look to be auto-generated so we can keep them all in dedicated subdirectory. Signed-off-by: Michal Wajdeczko Cc: Lionel Landwerlin Cc: Chris Wilson Cc: Jani Nikula Acked-by: Chris Wilson Acked-by: Lionel Landwerlin Acked-by: Jani Nikula Reviewed-by: Umesh Nerlige Ramappa Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190626123826.39760-1-michal.wajdeczko@intel.com --- drivers/gpu/drm/i915/Makefile | 36 ++++++++++++++------------ drivers/gpu/drm/i915/i915_perf.c | 28 ++++++++++---------- drivers/gpu/drm/i915/oa/Makefile | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h | 0 31 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 drivers/gpu/drm/i915/oa/Makefile rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h (100%) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 84ac0fd..0fbc350 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -212,6 +212,25 @@ i915-y += \ display/vlv_dsi.o \ display/vlv_dsi_pll.o +# perf code +obj-y += oa/ +i915-y += \ + oa/i915_oa_hsw.o \ + oa/i915_oa_bdw.o \ + oa/i915_oa_chv.o \ + oa/i915_oa_sklgt2.o \ + oa/i915_oa_sklgt3.o \ + oa/i915_oa_sklgt4.o \ + oa/i915_oa_bxt.o \ + oa/i915_oa_kblgt2.o \ + oa/i915_oa_kblgt3.o \ + oa/i915_oa_glk.o \ + oa/i915_oa_cflgt2.o \ + oa/i915_oa_cflgt3.o \ + oa/i915_oa_cnl.o \ + oa/i915_oa_icl.o +i915-y += i915_perf.o + # Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o i915-$(CONFIG_DRM_I915_SELFTEST) += \ @@ -226,23 +245,6 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ # virtual gpu code i915-y += i915_vgpu.o -# perf code -i915-y += i915_perf.o \ - i915_oa_hsw.o \ - i915_oa_bdw.o \ - i915_oa_chv.o \ - i915_oa_sklgt2.o \ - i915_oa_sklgt3.o \ - i915_oa_sklgt4.o \ - i915_oa_bxt.o \ - i915_oa_kblgt2.o \ - i915_oa_kblgt3.o \ - i915_oa_glk.o \ - i915_oa_cflgt2.o \ - i915_oa_cflgt3.o \ - i915_oa_cnl.o \ - i915_oa_icl.o - ifeq ($(CONFIG_DRM_I915_GVT),y) i915-y += intel_gvt.o include $(src)/gvt/Makefile diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index d28a5bf..357e63b 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -200,20 +200,20 @@ #include "gt/intel_lrc_reg.h" #include "i915_drv.h" -#include "i915_oa_hsw.h" -#include "i915_oa_bdw.h" -#include "i915_oa_chv.h" -#include "i915_oa_sklgt2.h" -#include "i915_oa_sklgt3.h" -#include "i915_oa_sklgt4.h" -#include "i915_oa_bxt.h" -#include "i915_oa_kblgt2.h" -#include "i915_oa_kblgt3.h" -#include "i915_oa_glk.h" -#include "i915_oa_cflgt2.h" -#include "i915_oa_cflgt3.h" -#include "i915_oa_cnl.h" -#include "i915_oa_icl.h" +#include "oa/i915_oa_hsw.h" +#include "oa/i915_oa_bdw.h" +#include "oa/i915_oa_chv.h" +#include "oa/i915_oa_sklgt2.h" +#include "oa/i915_oa_sklgt3.h" +#include "oa/i915_oa_sklgt4.h" +#include "oa/i915_oa_bxt.h" +#include "oa/i915_oa_kblgt2.h" +#include "oa/i915_oa_kblgt3.h" +#include "oa/i915_oa_glk.h" +#include "oa/i915_oa_cflgt2.h" +#include "oa/i915_oa_cflgt3.h" +#include "oa/i915_oa_cnl.h" +#include "oa/i915_oa_icl.h" /* HW requires this to be a power of two, between 128k and 16M, though driver * is currently generally designed assuming the largest 16M size is used such diff --git a/drivers/gpu/drm/i915/oa/Makefile b/drivers/gpu/drm/i915/oa/Makefile new file mode 100644 index 0000000..e69de29 diff --git a/drivers/gpu/drm/i915/i915_oa_bdw.c b/drivers/gpu/drm/i915/oa/i915_oa_bdw.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_bdw.c rename to drivers/gpu/drm/i915/oa/i915_oa_bdw.c diff --git a/drivers/gpu/drm/i915/i915_oa_bdw.h b/drivers/gpu/drm/i915/oa/i915_oa_bdw.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_bdw.h rename to drivers/gpu/drm/i915/oa/i915_oa_bdw.h diff --git a/drivers/gpu/drm/i915/i915_oa_bxt.c b/drivers/gpu/drm/i915/oa/i915_oa_bxt.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_bxt.c rename to drivers/gpu/drm/i915/oa/i915_oa_bxt.c diff --git a/drivers/gpu/drm/i915/i915_oa_bxt.h b/drivers/gpu/drm/i915/oa/i915_oa_bxt.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_bxt.h rename to drivers/gpu/drm/i915/oa/i915_oa_bxt.h diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt2.c b/drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_cflgt2.c rename to drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt2.h b/drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_cflgt2.h rename to drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt3.c b/drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_cflgt3.c rename to drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt3.h b/drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_cflgt3.h rename to drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h diff --git a/drivers/gpu/drm/i915/i915_oa_chv.c b/drivers/gpu/drm/i915/oa/i915_oa_chv.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_chv.c rename to drivers/gpu/drm/i915/oa/i915_oa_chv.c diff --git a/drivers/gpu/drm/i915/i915_oa_chv.h b/drivers/gpu/drm/i915/oa/i915_oa_chv.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_chv.h rename to drivers/gpu/drm/i915/oa/i915_oa_chv.h diff --git a/drivers/gpu/drm/i915/i915_oa_cnl.c b/drivers/gpu/drm/i915/oa/i915_oa_cnl.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_cnl.c rename to drivers/gpu/drm/i915/oa/i915_oa_cnl.c diff --git a/drivers/gpu/drm/i915/i915_oa_cnl.h b/drivers/gpu/drm/i915/oa/i915_oa_cnl.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_cnl.h rename to drivers/gpu/drm/i915/oa/i915_oa_cnl.h diff --git a/drivers/gpu/drm/i915/i915_oa_glk.c b/drivers/gpu/drm/i915/oa/i915_oa_glk.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_glk.c rename to drivers/gpu/drm/i915/oa/i915_oa_glk.c diff --git a/drivers/gpu/drm/i915/i915_oa_glk.h b/drivers/gpu/drm/i915/oa/i915_oa_glk.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_glk.h rename to drivers/gpu/drm/i915/oa/i915_oa_glk.h diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.c b/drivers/gpu/drm/i915/oa/i915_oa_hsw.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_hsw.c rename to drivers/gpu/drm/i915/oa/i915_oa_hsw.c diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.h b/drivers/gpu/drm/i915/oa/i915_oa_hsw.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_hsw.h rename to drivers/gpu/drm/i915/oa/i915_oa_hsw.h diff --git a/drivers/gpu/drm/i915/i915_oa_icl.c b/drivers/gpu/drm/i915/oa/i915_oa_icl.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_icl.c rename to drivers/gpu/drm/i915/oa/i915_oa_icl.c diff --git a/drivers/gpu/drm/i915/i915_oa_icl.h b/drivers/gpu/drm/i915/oa/i915_oa_icl.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_icl.h rename to drivers/gpu/drm/i915/oa/i915_oa_icl.h diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt2.c b/drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_kblgt2.c rename to drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt2.h b/drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_kblgt2.h rename to drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt3.c b/drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_kblgt3.c rename to drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt3.h b/drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_kblgt3.h rename to drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt2.c b/drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_sklgt2.c rename to drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt2.h b/drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_sklgt2.h rename to drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt3.c b/drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_sklgt3.c rename to drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt3.h b/drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_sklgt3.h rename to drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt4.c b/drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_sklgt4.c rename to drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt4.h b/drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h similarity index 100% rename from drivers/gpu/drm/i915/i915_oa_sklgt4.h rename to drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h -- 2.7.4