* [PATCH] drm/i915: Move OA files to separate folder
@ 2019-06-26 12:38 Michal Wajdeczko
2019-06-26 12:46 ` Chris Wilson
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: Michal Wajdeczko @ 2019-06-26 12:38 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
OA files look to be auto-generated so we can keep them all in
dedicated subdirectory.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@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
.../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0
.../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 0
.../gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0
.../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
.../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0
.../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 0
.../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0
.../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 0
.../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0
.../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 0
.../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0
.../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 0
.../gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0
.../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 84ac0fd1b8d0..0fbc3506b5fc 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 d28a5bf80bd7..357e63beb373 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 000000000000..e69de29bb2d1
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.19.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
@ 2019-06-26 12:46 ` Chris Wilson
2019-06-26 13:02 ` Jani Nikula
2019-06-26 12:47 ` Lionel Landwerlin
` (7 subsequent siblings)
8 siblings, 1 reply; 11+ messages in thread
From: Chris Wilson @ 2019-06-26 12:46 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx; +Cc: Jani Nikula
Quoting Michal Wajdeczko (2019-06-26 13:38:26)
> OA files look to be auto-generated so we can keep them all in
> dedicated subdirectory.
The question I couldn't answer was how coupled into the GEM api is the
i915_perf ioctl. Is the GEM context filtering an adjunct or core? The
move makes sense, but I couldn't decide if it should be gem/oa instead.
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/Makefile | 36 ++++++++++---------
> drivers/gpu/drm/i915/i915_perf.c | 28 +++++++--------
> drivers/gpu/drm/i915/oa/Makefile | 0
Ok, so you chose not to hook up the standalone header test (to be
replaced by builtin kbuild magic) -- iirc, Jani said the autogenerated
headers were not standalone. Oh well.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
2019-06-26 12:46 ` Chris Wilson
@ 2019-06-26 12:47 ` Lionel Landwerlin
2019-06-26 12:47 ` Jani Nikula
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Lionel Landwerlin @ 2019-06-26 12:47 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx; +Cc: Jani Nikula
Sure,
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
-Lionel
On 26/06/2019 15:38, Michal Wajdeczko wrote:
> OA files look to be auto-generated so we can keep them all in
> dedicated subdirectory.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@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
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0
> .../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
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0
> .../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 84ac0fd1b8d0..0fbc3506b5fc 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 d28a5bf80bd7..357e63beb373 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 000000000000..e69de29bb2d1
> 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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
2019-06-26 12:46 ` Chris Wilson
2019-06-26 12:47 ` Lionel Landwerlin
@ 2019-06-26 12:47 ` Jani Nikula
2019-06-26 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2019-06-26 12:47 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx
On Wed, 26 Jun 2019, Michal Wajdeczko <michal.wajdeczko@intel.com> wrote:
> OA files look to be auto-generated so we can keep them all in
> dedicated subdirectory.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@intel.com>
I'll let others judge whether "oa" as the subdir name is the right
call. Other than that,
Acked-by: Jani Nikula <jani.nikula@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
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0
> .../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
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0
> .../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 84ac0fd1b8d0..0fbc3506b5fc 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 d28a5bf80bd7..357e63beb373 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 000000000000..e69de29bb2d1
> 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
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915: Move OA files to separate folder
2019-06-26 12:46 ` Chris Wilson
@ 2019-06-26 13:02 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2019-06-26 13:02 UTC (permalink / raw)
To: Chris Wilson, Michal Wajdeczko, intel-gfx
On Wed, 26 Jun 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Michal Wajdeczko (2019-06-26 13:38:26)
>> OA files look to be auto-generated so we can keep them all in
>> dedicated subdirectory.
>
> The question I couldn't answer was how coupled into the GEM api is the
> i915_perf ioctl. Is the GEM context filtering an adjunct or core? The
> move makes sense, but I couldn't decide if it should be gem/oa instead.
>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>
>> ---
>> drivers/gpu/drm/i915/Makefile | 36 ++++++++++---------
>> drivers/gpu/drm/i915/i915_perf.c | 28 +++++++--------
>> drivers/gpu/drm/i915/oa/Makefile | 0
>
> Ok, so you chose not to hook up the standalone header test (to be
> replaced by builtin kbuild magic) -- iirc, Jani said the autogenerated
> headers were not standalone. Oh well.
That's right. We'll need to fix that afterwards.
BR,
Jani.
>
> Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
` (2 preceding siblings ...)
2019-06-26 12:47 ` Jani Nikula
@ 2019-06-26 13:46 ` Patchwork
2019-06-26 13:47 ` ✗ Fi.CI.SPARSE: " Patchwork
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-06-26 13:46 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move OA files to separate folder
URL : https://patchwork.freedesktop.org/series/62779/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
61d6088532ee drm/i915: Move OA files to separate folder
-:111: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#111:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 82 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.SPARSE: warning for drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
` (3 preceding siblings ...)
2019-06-26 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-06-26 13:47 ` Patchwork
2019-06-26 14:32 ` ✓ Fi.CI.BAT: success " Patchwork
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-06-26 13:47 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move OA files to separate folder
URL : https://patchwork.freedesktop.org/series/62779/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: Move OA files to separate folder
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
` (4 preceding siblings ...)
2019-06-26 13:47 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-06-26 14:32 ` Patchwork
2019-06-26 19:09 ` [PATCH] " Umesh Nerlige Ramappa
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-06-26 14:32 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move OA files to separate folder
URL : https://patchwork.freedesktop.org/series/62779/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6359 -> Patchwork_13439
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/
Known issues
------------
Here are the changes found in Patchwork_13439 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@create-close:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/fi-icl-u3/igt@gem_basic@create-close.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/fi-icl-u3/igt@gem_basic@create-close.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][3] -> [DMESG-WARN][4] ([fdo#102614])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
#### Possible fixes ####
* igt@gem_flink_basic@double-flink:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/fi-icl-u3/igt@gem_flink_basic@double-flink.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/fi-icl-u3/igt@gem_flink_basic@double-flink.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][7] ([fdo#109485]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-dsi: [FAIL][9] ([fdo#103167]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
Participating hosts (52 -> 46)
------------------------------
Additional (2): fi-skl-6700k2 fi-pnv-d510
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6359 -> Patchwork_13439
CI_DRM_6359: 0524cdbe0aedcfc0c181fab6c8fbf973bc1329b4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5068: 15ad664534413628f06c0f172aac11598bfdb895 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13439: 61d6088532eea3eb63b26d09a87255792990c1bb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
61d6088532ee drm/i915: Move OA files to separate folder
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
` (5 preceding siblings ...)
2019-06-26 14:32 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-06-26 19:09 ` Umesh Nerlige Ramappa
2019-06-26 22:27 ` Chris Wilson
2019-06-26 23:06 ` ✓ Fi.CI.IGT: success for " Patchwork
8 siblings, 0 replies; 11+ messages in thread
From: Umesh Nerlige Ramappa @ 2019-06-26 19:09 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: Jani Nikula, intel-gfx
On Wed, Jun 26, 2019 at 12:38:26PM +0000, Michal Wajdeczko wrote:
>OA files look to be auto-generated so we can keep them all in
>dedicated subdirectory.
>
>Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>Cc: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Jani Nikula <jani.nikula@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
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0
> .../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
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 0
> .../gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0
> .../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 84ac0fd1b8d0..0fbc3506b5fc 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 d28a5bf80bd7..357e63beb373 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 000000000000..e69de29bb2d1
>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.19.2
>
looks good.
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
` (6 preceding siblings ...)
2019-06-26 19:09 ` [PATCH] " Umesh Nerlige Ramappa
@ 2019-06-26 22:27 ` Chris Wilson
2019-06-26 23:06 ` ✓ Fi.CI.IGT: success for " Patchwork
8 siblings, 0 replies; 11+ messages in thread
From: Chris Wilson @ 2019-06-26 22:27 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx; +Cc: Jani Nikula
Quoting Michal Wajdeczko (2019-06-26 13:38:26)
> OA files look to be auto-generated so we can keep them all in
> dedicated subdirectory.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@intel.com>
We all seem content with the idea, so pushed while it still applies.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Move OA files to separate folder
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
` (7 preceding siblings ...)
2019-06-26 22:27 ` Chris Wilson
@ 2019-06-26 23:06 ` Patchwork
8 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-06-26 23:06 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move OA files to separate folder
URL : https://patchwork.freedesktop.org/series/62779/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6359_full -> Patchwork_13439_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13439_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@basic-hang-rcs0:
- shard-iclb: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb5/igt@gem_busy@basic-hang-rcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb7/igt@gem_busy@basic-hang-rcs0.html
- shard-apl: [PASS][3] -> [INCOMPLETE][4] ([fdo#103927])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-apl7/igt@gem_busy@basic-hang-rcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-apl1/igt@gem_busy@basic-hang-rcs0.html
- shard-hsw: [PASS][5] -> [DMESG-WARN][6] ([fdo#110789] / [fdo#110913 ])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-hsw4/igt@gem_busy@basic-hang-rcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-hsw5/igt@gem_busy@basic-hang-rcs0.html
* igt@gem_partial_pwrite_pread@writes-after-reads-display:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([fdo#110913 ]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-kbl6/igt@gem_partial_pwrite_pread@writes-after-reads-display.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-kbl4/igt@gem_partial_pwrite_pread@writes-after-reads-display.html
- shard-glk: [PASS][9] -> [DMESG-WARN][10] ([fdo#110913 ]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-glk4/igt@gem_partial_pwrite_pread@writes-after-reads-display.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-glk2/igt@gem_partial_pwrite_pread@writes-after-reads-display.html
* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([fdo#110913 ]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-apl7/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-apl2/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
* igt@gem_persistent_relocs@forked-thrash-inactive:
- shard-iclb: [PASS][13] -> [DMESG-WARN][14] ([fdo#110913 ])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb8/igt@gem_persistent_relocs@forked-thrash-inactive.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb4/igt@gem_persistent_relocs@forked-thrash-inactive.html
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
- shard-skl: [PASS][15] -> [DMESG-WARN][16] ([fdo#110913 ])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl9/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
* igt@gem_userptr_blits@sync-unmap:
- shard-snb: [PASS][17] -> [DMESG-WARN][18] ([fdo#110789] / [fdo#110913 ]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-snb4/igt@gem_userptr_blits@sync-unmap.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-snb7/igt@gem_userptr_blits@sync-unmap.html
* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][19] -> [DMESG-WARN][20] ([fdo#108566])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-apl6/igt@gem_workarounds@suspend-resume.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-apl5/igt@gem_workarounds@suspend-resume.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#105363])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl6/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [PASS][23] -> [FAIL][24] ([fdo#103167]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-move:
- shard-hsw: [PASS][25] -> [SKIP][26] ([fdo#109271]) +16 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-hsw2/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-move.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-move.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][27] -> [FAIL][28] ([fdo#108145] / [fdo#110403])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109441]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb8/igt@kms_psr@psr2_primary_mmap_gtt.html
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-skl: [PASS][31] -> [INCOMPLETE][32] ([fdo#104108])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl1/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
#### Possible fixes ####
* igt@gem_eio@wait-wedge-1us:
- shard-kbl: [DMESG-WARN][33] ([fdo#110913 ]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-kbl4/igt@gem_eio@wait-wedge-1us.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-kbl4/igt@gem_eio@wait-wedge-1us.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][35] ([fdo#110854]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb3/igt@gem_exec_balancer@smoke.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb2/igt@gem_exec_balancer@smoke.html
* igt@gem_persistent_relocs@forked-faulting-reloc-thrash-inactive:
- shard-glk: [DMESG-WARN][37] ([fdo#110913 ]) -> [PASS][38] +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-glk9/igt@gem_persistent_relocs@forked-faulting-reloc-thrash-inactive.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-glk5/igt@gem_persistent_relocs@forked-faulting-reloc-thrash-inactive.html
* igt@gem_softpin@overlap:
- shard-snb: [DMESG-WARN][39] ([fdo#110789] / [fdo#110913 ]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-snb1/igt@gem_softpin@overlap.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-snb6/igt@gem_softpin@overlap.html
* igt@gem_tiled_partial_pwrite_pread@writes:
- shard-apl: [DMESG-WARN][41] ([fdo#110913 ]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-apl1/igt@gem_tiled_partial_pwrite_pread@writes.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-apl6/igt@gem_tiled_partial_pwrite_pread@writes.html
* igt@gem_userptr_blits@map-fixed-invalidate-busy:
- shard-skl: [DMESG-WARN][43] ([fdo#110913 ]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl3/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl4/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-kbl: [SKIP][45] ([fdo#109271]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-kbl2/igt@i915_pm_rc6_residency@rc6-accuracy.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-kbl6/igt@i915_pm_rc6_residency@rc6-accuracy.html
* igt@kms_busy@extended-modeset-hang-newfb-render-b:
- shard-hsw: [DMESG-WARN][47] ([fdo#110222] / [fdo#110789] / [fdo#110913 ]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-hsw2/igt@kms_busy@extended-modeset-hang-newfb-render-b.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-hsw1/igt@kms_busy@extended-modeset-hang-newfb-render-b.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [DMESG-WARN][49] ([fdo#108566]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-apl2/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled:
- shard-iclb: [DMESG-WARN][51] ([fdo#110913 ]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb8/igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb4/igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled.html
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][53] ([fdo#109507]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl5/igt@kms_flip@flip-vs-suspend.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl8/igt@kms_flip@flip-vs-suspend.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-glk: [INCOMPLETE][55] ([fdo#103359] / [k.org#198133]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-glk3/igt@kms_flip@flip-vs-suspend-interruptible.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-glk3/igt@kms_flip@flip-vs-suspend-interruptible.html
- shard-snb: [DMESG-WARN][57] ([fdo#102365]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-snb2/igt@kms_flip@flip-vs-suspend-interruptible.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-snb2/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_flip@plain-flip-ts-check-interruptible:
- shard-skl: [FAIL][59] ([fdo#100368]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl9/igt@kms_flip@plain-flip-ts-check-interruptible.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl6/igt@kms_flip@plain-flip-ts-check-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt:
- shard-iclb: [FAIL][61] ([fdo#103167]) -> [PASS][62] +4 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite:
- shard-hsw: [SKIP][63] ([fdo#109271]) -> [PASS][64] +19 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-hsw4/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-cpu:
- shard-skl: [FAIL][65] ([fdo#103167] / [fdo#110379]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl10/igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-cpu.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl9/igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-cpu.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-iclb: [INCOMPLETE][67] ([fdo#107713]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb3/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb8/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_psr@no_drrs:
- shard-iclb: [FAIL][69] ([fdo#108341]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb1/igt@kms_psr@no_drrs.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb6/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][71] ([fdo#109441]) -> [PASS][72] +4 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][73] ([fdo#99912]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-kbl4/igt@kms_setmode@basic.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-kbl1/igt@kms_setmode@basic.html
* igt@perf@blocking:
- shard-skl: [FAIL][75] ([fdo#110728]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6359/shard-skl2/igt@perf@blocking.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/shard-skl8/igt@perf@blocking.html
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
[fdo#110379]: https://bugs.freedesktop.org/show_bug.cgi?id=110379
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#110913 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110913
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6359 -> Patchwork_13439
CI_DRM_6359: 0524cdbe0aedcfc0c181fab6c8fbf973bc1329b4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5068: 15ad664534413628f06c0f172aac11598bfdb895 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13439: 61d6088532eea3eb63b26d09a87255792990c1bb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13439/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-06-26 23:06 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-26 12:38 [PATCH] drm/i915: Move OA files to separate folder Michal Wajdeczko
2019-06-26 12:46 ` Chris Wilson
2019-06-26 13:02 ` Jani Nikula
2019-06-26 12:47 ` Lionel Landwerlin
2019-06-26 12:47 ` Jani Nikula
2019-06-26 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-06-26 13:47 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-06-26 14:32 ` ✓ Fi.CI.BAT: success " Patchwork
2019-06-26 19:09 ` [PATCH] " Umesh Nerlige Ramappa
2019-06-26 22:27 ` Chris Wilson
2019-06-26 23:06 ` ✓ Fi.CI.IGT: success for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.