drm/i915: Move OA files to separate folder
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Wed, 26 Jun 2019 12:38:26 +0000 (12:38 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 26 Jun 2019 22:23:59 +0000 (23:23 +0100)
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>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626123826.39760-1-michal.wajdeczko@intel.com
59 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_oa_bdw.c [deleted file]
drivers/gpu/drm/i915/i915_oa_bdw.h [deleted file]
drivers/gpu/drm/i915/i915_oa_bxt.c [deleted file]
drivers/gpu/drm/i915/i915_oa_bxt.h [deleted file]
drivers/gpu/drm/i915/i915_oa_cflgt2.c [deleted file]
drivers/gpu/drm/i915/i915_oa_cflgt2.h [deleted file]
drivers/gpu/drm/i915/i915_oa_cflgt3.c [deleted file]
drivers/gpu/drm/i915/i915_oa_cflgt3.h [deleted file]
drivers/gpu/drm/i915/i915_oa_chv.c [deleted file]
drivers/gpu/drm/i915/i915_oa_chv.h [deleted file]
drivers/gpu/drm/i915/i915_oa_cnl.c [deleted file]
drivers/gpu/drm/i915/i915_oa_cnl.h [deleted file]
drivers/gpu/drm/i915/i915_oa_glk.c [deleted file]
drivers/gpu/drm/i915/i915_oa_glk.h [deleted file]
drivers/gpu/drm/i915/i915_oa_hsw.c [deleted file]
drivers/gpu/drm/i915/i915_oa_hsw.h [deleted file]
drivers/gpu/drm/i915/i915_oa_icl.c [deleted file]
drivers/gpu/drm/i915/i915_oa_icl.h [deleted file]
drivers/gpu/drm/i915/i915_oa_kblgt2.c [deleted file]
drivers/gpu/drm/i915/i915_oa_kblgt2.h [deleted file]
drivers/gpu/drm/i915/i915_oa_kblgt3.c [deleted file]
drivers/gpu/drm/i915/i915_oa_kblgt3.h [deleted file]
drivers/gpu/drm/i915/i915_oa_sklgt2.c [deleted file]
drivers/gpu/drm/i915/i915_oa_sklgt2.h [deleted file]
drivers/gpu/drm/i915/i915_oa_sklgt3.c [deleted file]
drivers/gpu/drm/i915/i915_oa_sklgt3.h [deleted file]
drivers/gpu/drm/i915/i915_oa_sklgt4.c [deleted file]
drivers/gpu/drm/i915/i915_oa_sklgt4.h [deleted file]
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/oa/Makefile [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_bdw.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_bdw.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_bxt.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_bxt.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_chv.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_chv.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_cnl.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_cnl.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_glk.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_glk.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_hsw.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_hsw.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_icl.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_icl.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c [new file with mode: 0644]
drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h [new file with mode: 0644]

index 84ac0fd1b8d07385c9c493b31548167638951033..0fbc3506b5fc75be8f1bfccfb1c5c9686e87233b 100644 (file)
@@ -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_oa_bdw.c b/drivers/gpu/drm/i915/i915_oa_bdw.c
deleted file mode 100644 (file)
index 4acdb94..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_bdw.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x000000a0 },
-       { _MMIO(0x9888), 0x198b0000 },
-       { _MMIO(0x9888), 0x078b0066 },
-       { _MMIO(0x9888), 0x118b0000 },
-       { _MMIO(0x9888), 0x258b0000 },
-       { _MMIO(0x9888), 0x21850008 },
-       { _MMIO(0x9888), 0x0d834000 },
-       { _MMIO(0x9888), 0x07844000 },
-       { _MMIO(0x9888), 0x17804000 },
-       { _MMIO(0x9888), 0x21800000 },
-       { _MMIO(0x9888), 0x4f800000 },
-       { _MMIO(0x9888), 0x41800000 },
-       { _MMIO(0x9888), 0x31800000 },
-       { _MMIO(0x9840), 0x00000080 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "d6de6f55-e526-4f79-a6a6-d7315c09044e",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "d6de6f55-e526-4f79-a6a6-d7315c09044e";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_bdw.h b/drivers/gpu/drm/i915/i915_oa_bdw.h
deleted file mode 100644 (file)
index 0e667f1..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_BDW_H__
-#define __I915_OA_BDW_H__
-
-extern void i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_bxt.c b/drivers/gpu/drm/i915/i915_oa_bxt.c
deleted file mode 100644 (file)
index a44195c..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_bxt.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x19800000 },
-       { _MMIO(0x9888), 0x07800063 },
-       { _MMIO(0x9888), 0x11800000 },
-       { _MMIO(0x9888), 0x23810008 },
-       { _MMIO(0x9888), 0x1d950400 },
-       { _MMIO(0x9888), 0x0f922000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x55900000 },
-       { _MMIO(0x9888), 0x47900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_bxt(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "5ee72f5c-092f-421e-8b70-225f7c3e9612",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "5ee72f5c-092f-421e-8b70-225f7c3e9612";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_bxt.h b/drivers/gpu/drm/i915/i915_oa_bxt.h
deleted file mode 100644 (file)
index 679e92c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_BXT_H__
-#define __I915_OA_BXT_H__
-
-extern void i915_perf_load_test_config_bxt(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt2.c b/drivers/gpu/drm/i915/i915_oa_cflgt2.c
deleted file mode 100644 (file)
index 7f60d51..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_cflgt2.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810013 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "74fb4902-d3d3-4237-9e90-cbdc68d0a446",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "74fb4902-d3d3-4237-9e90-cbdc68d0a446";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt2.h b/drivers/gpu/drm/i915/i915_oa_cflgt2.h
deleted file mode 100644 (file)
index 4d60255..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_CFLGT2_H__
-#define __I915_OA_CFLGT2_H__
-
-extern void i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt3.c b/drivers/gpu/drm/i915/i915_oa_cflgt3.c
deleted file mode 100644 (file)
index a92c38e..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_cflgt3.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810013 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_cflgt3(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "577e8e2c-3fa0-4875-8743-3538d585e3b0",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "577e8e2c-3fa0-4875-8743-3538d585e3b0";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_cflgt3.h b/drivers/gpu/drm/i915/i915_oa_cflgt3.h
deleted file mode 100644 (file)
index 0697f40..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_CFLGT3_H__
-#define __I915_OA_CFLGT3_H__
-
-extern void i915_perf_load_test_config_cflgt3(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_chv.c b/drivers/gpu/drm/i915/i915_oa_chv.c
deleted file mode 100644 (file)
index 71ec889..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_chv.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x000000a0 },
-       { _MMIO(0x9888), 0x59800000 },
-       { _MMIO(0x9888), 0x59800001 },
-       { _MMIO(0x9888), 0x338b0000 },
-       { _MMIO(0x9888), 0x258b0066 },
-       { _MMIO(0x9888), 0x058b0000 },
-       { _MMIO(0x9888), 0x038b0000 },
-       { _MMIO(0x9888), 0x03844000 },
-       { _MMIO(0x9888), 0x47800080 },
-       { _MMIO(0x9888), 0x57800000 },
-       { _MMIO(0x1823a4), 0x00000000 },
-       { _MMIO(0x9888), 0x59800000 },
-       { _MMIO(0x9840), 0x00000080 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_chv(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "4a534b07-cba3-414d-8d60-874830e883aa",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "4a534b07-cba3-414d-8d60-874830e883aa";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_chv.h b/drivers/gpu/drm/i915/i915_oa_chv.h
deleted file mode 100644 (file)
index 0986eae..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_CHV_H__
-#define __I915_OA_CHV_H__
-
-extern void i915_perf_load_test_config_chv(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_cnl.c b/drivers/gpu/drm/i915/i915_oa_cnl.c
deleted file mode 100644 (file)
index 5c23d88..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_cnl.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x0000ffff },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x0000ffff },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x0000ffff },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0xd04), 0x00000200 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x17060000 },
-       { _MMIO(0x9840), 0x00000000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x13034000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x07060066 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x05060000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x0f080040 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x07091000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x0f041000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x1d004000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x35000000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x49000000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x3d000000 },
-       { _MMIO(0x9884), 0x00000007 },
-       { _MMIO(0x9888), 0x31000000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_cnl(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "db41edd4-d8e7-4730-ad11-b9a2d6833503",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "db41edd4-d8e7-4730-ad11-b9a2d6833503";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_cnl.h b/drivers/gpu/drm/i915/i915_oa_cnl.h
deleted file mode 100644 (file)
index e830a40..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_CNL_H__
-#define __I915_OA_CNL_H__
-
-extern void i915_perf_load_test_config_cnl(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_glk.c b/drivers/gpu/drm/i915/i915_oa_glk.c
deleted file mode 100644 (file)
index 4bdda66..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_glk.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x19800000 },
-       { _MMIO(0x9888), 0x07800063 },
-       { _MMIO(0x9888), 0x11800000 },
-       { _MMIO(0x9888), 0x23810008 },
-       { _MMIO(0x9888), 0x1d950400 },
-       { _MMIO(0x9888), 0x0f922000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x55900000 },
-       { _MMIO(0x9888), 0x47900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_glk(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "dd3fd789-e783-4204-8cd0-b671bbccb0cf",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "dd3fd789-e783-4204-8cd0-b671bbccb0cf";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_glk.h b/drivers/gpu/drm/i915/i915_oa_glk.h
deleted file mode 100644 (file)
index 06dedf9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_GLK_H__
-#define __I915_OA_GLK_H__
-
-extern void i915_perf_load_test_config_glk(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.c b/drivers/gpu/drm/i915/i915_oa_hsw.c
deleted file mode 100644 (file)
index cc6526f..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_hsw.h"
-
-static const struct i915_oa_reg b_counter_config_render_basic[] = {
-       { _MMIO(0x2724), 0x00800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2714), 0x00800000 },
-       { _MMIO(0x2710), 0x00000000 },
-};
-
-static const struct i915_oa_reg flex_eu_config_render_basic[] = {
-};
-
-static const struct i915_oa_reg mux_config_render_basic[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x253a4), 0x01600000 },
-       { _MMIO(0x25440), 0x00100000 },
-       { _MMIO(0x25128), 0x00000000 },
-       { _MMIO(0x2691c), 0x00000800 },
-       { _MMIO(0x26aa0), 0x01500000 },
-       { _MMIO(0x26b9c), 0x00006000 },
-       { _MMIO(0x2791c), 0x00000800 },
-       { _MMIO(0x27aa0), 0x01500000 },
-       { _MMIO(0x27b9c), 0x00006000 },
-       { _MMIO(0x2641c), 0x00000400 },
-       { _MMIO(0x25380), 0x00000010 },
-       { _MMIO(0x2538c), 0x00000000 },
-       { _MMIO(0x25384), 0x0800aaaa },
-       { _MMIO(0x25400), 0x00000004 },
-       { _MMIO(0x2540c), 0x06029000 },
-       { _MMIO(0x25410), 0x00000002 },
-       { _MMIO(0x25404), 0x5c30ffff },
-       { _MMIO(0x25100), 0x00000016 },
-       { _MMIO(0x25110), 0x00000400 },
-       { _MMIO(0x25104), 0x00000000 },
-       { _MMIO(0x26804), 0x00001211 },
-       { _MMIO(0x26884), 0x00000100 },
-       { _MMIO(0x26900), 0x00000002 },
-       { _MMIO(0x26908), 0x00700000 },
-       { _MMIO(0x26904), 0x00000000 },
-       { _MMIO(0x26984), 0x00001022 },
-       { _MMIO(0x26a04), 0x00000011 },
-       { _MMIO(0x26a80), 0x00000006 },
-       { _MMIO(0x26a88), 0x00000c02 },
-       { _MMIO(0x26a84), 0x00000000 },
-       { _MMIO(0x26b04), 0x00001000 },
-       { _MMIO(0x26b80), 0x00000002 },
-       { _MMIO(0x26b8c), 0x00000007 },
-       { _MMIO(0x26b84), 0x00000000 },
-       { _MMIO(0x27804), 0x00004844 },
-       { _MMIO(0x27884), 0x00000400 },
-       { _MMIO(0x27900), 0x00000002 },
-       { _MMIO(0x27908), 0x0e000000 },
-       { _MMIO(0x27904), 0x00000000 },
-       { _MMIO(0x27984), 0x00004088 },
-       { _MMIO(0x27a04), 0x00000044 },
-       { _MMIO(0x27a80), 0x00000006 },
-       { _MMIO(0x27a88), 0x00018040 },
-       { _MMIO(0x27a84), 0x00000000 },
-       { _MMIO(0x27b04), 0x00004000 },
-       { _MMIO(0x27b80), 0x00000002 },
-       { _MMIO(0x27b8c), 0x000000e0 },
-       { _MMIO(0x27b84), 0x00000000 },
-       { _MMIO(0x26104), 0x00002222 },
-       { _MMIO(0x26184), 0x0c006666 },
-       { _MMIO(0x26284), 0x04000000 },
-       { _MMIO(0x26304), 0x04000000 },
-       { _MMIO(0x26400), 0x00000002 },
-       { _MMIO(0x26410), 0x000000a0 },
-       { _MMIO(0x26404), 0x00000000 },
-       { _MMIO(0x25420), 0x04108020 },
-       { _MMIO(0x25424), 0x1284a420 },
-       { _MMIO(0x2541c), 0x00000000 },
-       { _MMIO(0x25428), 0x00042049 },
-};
-
-static ssize_t
-show_render_basic_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_hsw(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "403d8832-1a27-4aa6-a64e-f5389ce7b212",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_render_basic;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_render_basic);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_render_basic;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_render_basic);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_render_basic;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_render_basic);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "403d8832-1a27-4aa6-a64e-f5389ce7b212";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_render_basic_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.h b/drivers/gpu/drm/i915/i915_oa_hsw.h
deleted file mode 100644 (file)
index 3d0c870..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_HSW_H__
-#define __I915_OA_HSW_H__
-
-extern void i915_perf_load_test_config_hsw(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_icl.c b/drivers/gpu/drm/i915/i915_oa_icl.c
deleted file mode 100644 (file)
index baa5142..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_icl.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x0000ffff },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x0000ffff },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x0000ffff },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0xd04), 0x00000200 },
-       { _MMIO(0x9840), 0x00000000 },
-       { _MMIO(0x9884), 0x00000000 },
-       { _MMIO(0x9888), 0x10060000 },
-       { _MMIO(0x9888), 0x22060000 },
-       { _MMIO(0x9888), 0x16060000 },
-       { _MMIO(0x9888), 0x24060000 },
-       { _MMIO(0x9888), 0x18060000 },
-       { _MMIO(0x9888), 0x1a060000 },
-       { _MMIO(0x9888), 0x12060000 },
-       { _MMIO(0x9888), 0x14060000 },
-       { _MMIO(0x9888), 0x10060000 },
-       { _MMIO(0x9888), 0x22060000 },
-       { _MMIO(0x9884), 0x00000003 },
-       { _MMIO(0x9888), 0x16130000 },
-       { _MMIO(0x9888), 0x24000001 },
-       { _MMIO(0x9888), 0x0e130056 },
-       { _MMIO(0x9888), 0x10130000 },
-       { _MMIO(0x9888), 0x1a130000 },
-       { _MMIO(0x9888), 0x541f0001 },
-       { _MMIO(0x9888), 0x181f0000 },
-       { _MMIO(0x9888), 0x4c1f0000 },
-       { _MMIO(0x9888), 0x301f0000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_icl(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "a291665e-244b-4b76-9b9a-01de9d3c8068",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "a291665e-244b-4b76-9b9a-01de9d3c8068";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_icl.h b/drivers/gpu/drm/i915/i915_oa_icl.h
deleted file mode 100644 (file)
index 24eaa97..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_ICL_H__
-#define __I915_OA_ICL_H__
-
-extern void i915_perf_load_test_config_icl(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt2.c b/drivers/gpu/drm/i915/i915_oa_kblgt2.c
deleted file mode 100644 (file)
index 168e49a..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_kblgt2.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810013 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_kblgt2(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "baa3c7e4-52b6-4b85-801e-465a94b746dd",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "baa3c7e4-52b6-4b85-801e-465a94b746dd";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt2.h b/drivers/gpu/drm/i915/i915_oa_kblgt2.h
deleted file mode 100644 (file)
index a55398a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_KBLGT2_H__
-#define __I915_OA_KBLGT2_H__
-
-extern void i915_perf_load_test_config_kblgt2(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt3.c b/drivers/gpu/drm/i915/i915_oa_kblgt3.c
deleted file mode 100644 (file)
index 6ffa553..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_kblgt3.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810013 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_kblgt3(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "f1792f32-6db2-4b50-b4b2-557128f1688d",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "f1792f32-6db2-4b50-b4b2-557128f1688d";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_kblgt3.h b/drivers/gpu/drm/i915/i915_oa_kblgt3.h
deleted file mode 100644 (file)
index 3ddd348..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_KBLGT3_H__
-#define __I915_OA_KBLGT3_H__
-
-extern void i915_perf_load_test_config_kblgt3(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt2.c b/drivers/gpu/drm/i915/i915_oa_sklgt2.c
deleted file mode 100644 (file)
index 7ce6ee8..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_sklgt2.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810016 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_sklgt2(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "1651949f-0ac0-4cb1-a06f-dafd74a407d1",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "1651949f-0ac0-4cb1-a06f-dafd74a407d1";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt2.h b/drivers/gpu/drm/i915/i915_oa_sklgt2.h
deleted file mode 100644 (file)
index be62560..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_SKLGT2_H__
-#define __I915_OA_SKLGT2_H__
-
-extern void i915_perf_load_test_config_sklgt2(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt3.c b/drivers/gpu/drm/i915/i915_oa_sklgt3.c
deleted file mode 100644 (file)
index 086ca26..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_sklgt3.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810013 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_sklgt3(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "2b985803-d3c9-4629-8a4f-634bfecba0e8",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "2b985803-d3c9-4629-8a4f-634bfecba0e8";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt3.h b/drivers/gpu/drm/i915/i915_oa_sklgt3.h
deleted file mode 100644 (file)
index 650beb0..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_SKLGT3_H__
-#define __I915_OA_SKLGT3_H__
-
-extern void i915_perf_load_test_config_sklgt3(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt4.c b/drivers/gpu/drm/i915/i915_oa_sklgt4.c
deleted file mode 100644 (file)
index b291a6e..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#include <linux/sysfs.h>
-
-#include "i915_drv.h"
-#include "i915_oa_sklgt4.h"
-
-static const struct i915_oa_reg b_counter_config_test_oa[] = {
-       { _MMIO(0x2740), 0x00000000 },
-       { _MMIO(0x2744), 0x00800000 },
-       { _MMIO(0x2714), 0xf0800000 },
-       { _MMIO(0x2710), 0x00000000 },
-       { _MMIO(0x2724), 0xf0800000 },
-       { _MMIO(0x2720), 0x00000000 },
-       { _MMIO(0x2770), 0x00000004 },
-       { _MMIO(0x2774), 0x00000000 },
-       { _MMIO(0x2778), 0x00000003 },
-       { _MMIO(0x277c), 0x00000000 },
-       { _MMIO(0x2780), 0x00000007 },
-       { _MMIO(0x2784), 0x00000000 },
-       { _MMIO(0x2788), 0x00100002 },
-       { _MMIO(0x278c), 0x0000fff7 },
-       { _MMIO(0x2790), 0x00100002 },
-       { _MMIO(0x2794), 0x0000ffcf },
-       { _MMIO(0x2798), 0x00100082 },
-       { _MMIO(0x279c), 0x0000ffef },
-       { _MMIO(0x27a0), 0x001000c2 },
-       { _MMIO(0x27a4), 0x0000ffe7 },
-       { _MMIO(0x27a8), 0x00100001 },
-       { _MMIO(0x27ac), 0x0000ffe7 },
-};
-
-static const struct i915_oa_reg flex_eu_config_test_oa[] = {
-};
-
-static const struct i915_oa_reg mux_config_test_oa[] = {
-       { _MMIO(0x9840), 0x00000080 },
-       { _MMIO(0x9888), 0x11810000 },
-       { _MMIO(0x9888), 0x07810013 },
-       { _MMIO(0x9888), 0x1f810000 },
-       { _MMIO(0x9888), 0x1d810000 },
-       { _MMIO(0x9888), 0x1b930040 },
-       { _MMIO(0x9888), 0x07e54000 },
-       { _MMIO(0x9888), 0x1f908000 },
-       { _MMIO(0x9888), 0x11900000 },
-       { _MMIO(0x9888), 0x37900000 },
-       { _MMIO(0x9888), 0x53900000 },
-       { _MMIO(0x9888), 0x45900000 },
-       { _MMIO(0x9888), 0x33900000 },
-};
-
-static ssize_t
-show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "1\n");
-}
-
-void
-i915_perf_load_test_config_sklgt4(struct drm_i915_private *dev_priv)
-{
-       strlcpy(dev_priv->perf.oa.test_config.uuid,
-               "882fa433-1f4a-4a67-a962-c741888fe5f5",
-               sizeof(dev_priv->perf.oa.test_config.uuid));
-       dev_priv->perf.oa.test_config.id = 1;
-
-       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
-       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
-
-       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
-       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
-
-       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
-       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
-
-       dev_priv->perf.oa.test_config.sysfs_metric.name = "882fa433-1f4a-4a67-a962-c741888fe5f5";
-       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
-
-       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
-
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
-       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
-       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
-}
diff --git a/drivers/gpu/drm/i915/i915_oa_sklgt4.h b/drivers/gpu/drm/i915/i915_oa_sklgt4.h
deleted file mode 100644 (file)
index 8dcf849..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2018 Intel Corporation
- *
- * Autogenerated file by GPU Top : https://github.com/rib/gputop
- * DO NOT EDIT manually!
- */
-
-#ifndef __I915_OA_SKLGT4_H__
-#define __I915_OA_SKLGT4_H__
-
-extern void i915_perf_load_test_config_sklgt4(struct drm_i915_private *dev_priv);
-
-#endif
index d28a5bf80bd788ee2a705d9058f4c1b30764bfbc..357e63beb373f97f00e8c08296563b3720b750e8 100644 (file)
 #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 (file)
index 0000000..e69de29
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_bdw.c b/drivers/gpu/drm/i915/oa/i915_oa_bdw.c
new file mode 100644 (file)
index 0000000..4acdb94
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_bdw.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x000000a0 },
+       { _MMIO(0x9888), 0x198b0000 },
+       { _MMIO(0x9888), 0x078b0066 },
+       { _MMIO(0x9888), 0x118b0000 },
+       { _MMIO(0x9888), 0x258b0000 },
+       { _MMIO(0x9888), 0x21850008 },
+       { _MMIO(0x9888), 0x0d834000 },
+       { _MMIO(0x9888), 0x07844000 },
+       { _MMIO(0x9888), 0x17804000 },
+       { _MMIO(0x9888), 0x21800000 },
+       { _MMIO(0x9888), 0x4f800000 },
+       { _MMIO(0x9888), 0x41800000 },
+       { _MMIO(0x9888), 0x31800000 },
+       { _MMIO(0x9840), 0x00000080 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "d6de6f55-e526-4f79-a6a6-d7315c09044e",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "d6de6f55-e526-4f79-a6a6-d7315c09044e";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_bdw.h b/drivers/gpu/drm/i915/oa/i915_oa_bdw.h
new file mode 100644 (file)
index 0000000..0e667f1
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_BDW_H__
+#define __I915_OA_BDW_H__
+
+extern void i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_bxt.c b/drivers/gpu/drm/i915/oa/i915_oa_bxt.c
new file mode 100644 (file)
index 0000000..a44195c
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_bxt.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x19800000 },
+       { _MMIO(0x9888), 0x07800063 },
+       { _MMIO(0x9888), 0x11800000 },
+       { _MMIO(0x9888), 0x23810008 },
+       { _MMIO(0x9888), 0x1d950400 },
+       { _MMIO(0x9888), 0x0f922000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x55900000 },
+       { _MMIO(0x9888), 0x47900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_bxt(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "5ee72f5c-092f-421e-8b70-225f7c3e9612",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "5ee72f5c-092f-421e-8b70-225f7c3e9612";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_bxt.h b/drivers/gpu/drm/i915/oa/i915_oa_bxt.h
new file mode 100644 (file)
index 0000000..679e92c
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_BXT_H__
+#define __I915_OA_BXT_H__
+
+extern void i915_perf_load_test_config_bxt(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c b/drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c
new file mode 100644 (file)
index 0000000..7f60d51
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_cflgt2.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810013 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "74fb4902-d3d3-4237-9e90-cbdc68d0a446",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "74fb4902-d3d3-4237-9e90-cbdc68d0a446";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h b/drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h
new file mode 100644 (file)
index 0000000..4d60255
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_CFLGT2_H__
+#define __I915_OA_CFLGT2_H__
+
+extern void i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c b/drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c
new file mode 100644 (file)
index 0000000..a92c38e
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_cflgt3.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810013 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_cflgt3(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "577e8e2c-3fa0-4875-8743-3538d585e3b0",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "577e8e2c-3fa0-4875-8743-3538d585e3b0";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h b/drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h
new file mode 100644 (file)
index 0000000..0697f40
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_CFLGT3_H__
+#define __I915_OA_CFLGT3_H__
+
+extern void i915_perf_load_test_config_cflgt3(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_chv.c b/drivers/gpu/drm/i915/oa/i915_oa_chv.c
new file mode 100644 (file)
index 0000000..71ec889
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_chv.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x000000a0 },
+       { _MMIO(0x9888), 0x59800000 },
+       { _MMIO(0x9888), 0x59800001 },
+       { _MMIO(0x9888), 0x338b0000 },
+       { _MMIO(0x9888), 0x258b0066 },
+       { _MMIO(0x9888), 0x058b0000 },
+       { _MMIO(0x9888), 0x038b0000 },
+       { _MMIO(0x9888), 0x03844000 },
+       { _MMIO(0x9888), 0x47800080 },
+       { _MMIO(0x9888), 0x57800000 },
+       { _MMIO(0x1823a4), 0x00000000 },
+       { _MMIO(0x9888), 0x59800000 },
+       { _MMIO(0x9840), 0x00000080 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_chv(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "4a534b07-cba3-414d-8d60-874830e883aa",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "4a534b07-cba3-414d-8d60-874830e883aa";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_chv.h b/drivers/gpu/drm/i915/oa/i915_oa_chv.h
new file mode 100644 (file)
index 0000000..0986eae
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_CHV_H__
+#define __I915_OA_CHV_H__
+
+extern void i915_perf_load_test_config_chv(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_cnl.c b/drivers/gpu/drm/i915/oa/i915_oa_cnl.c
new file mode 100644 (file)
index 0000000..5c23d88
--- /dev/null
@@ -0,0 +1,102 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_cnl.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x0000ffff },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x0000ffff },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x0000ffff },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0xd04), 0x00000200 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x17060000 },
+       { _MMIO(0x9840), 0x00000000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x13034000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x07060066 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x05060000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x0f080040 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x07091000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x0f041000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x1d004000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x35000000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x49000000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x3d000000 },
+       { _MMIO(0x9884), 0x00000007 },
+       { _MMIO(0x9888), 0x31000000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_cnl(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "db41edd4-d8e7-4730-ad11-b9a2d6833503",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "db41edd4-d8e7-4730-ad11-b9a2d6833503";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_cnl.h b/drivers/gpu/drm/i915/oa/i915_oa_cnl.h
new file mode 100644 (file)
index 0000000..e830a40
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_CNL_H__
+#define __I915_OA_CNL_H__
+
+extern void i915_perf_load_test_config_cnl(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_glk.c b/drivers/gpu/drm/i915/oa/i915_oa_glk.c
new file mode 100644 (file)
index 0000000..4bdda66
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_glk.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x19800000 },
+       { _MMIO(0x9888), 0x07800063 },
+       { _MMIO(0x9888), 0x11800000 },
+       { _MMIO(0x9888), 0x23810008 },
+       { _MMIO(0x9888), 0x1d950400 },
+       { _MMIO(0x9888), 0x0f922000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x55900000 },
+       { _MMIO(0x9888), 0x47900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_glk(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "dd3fd789-e783-4204-8cd0-b671bbccb0cf",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "dd3fd789-e783-4204-8cd0-b671bbccb0cf";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_glk.h b/drivers/gpu/drm/i915/oa/i915_oa_glk.h
new file mode 100644 (file)
index 0000000..06dedf9
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_GLK_H__
+#define __I915_OA_GLK_H__
+
+extern void i915_perf_load_test_config_glk(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_hsw.c b/drivers/gpu/drm/i915/oa/i915_oa_hsw.c
new file mode 100644 (file)
index 0000000..cc6526f
--- /dev/null
@@ -0,0 +1,119 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_hsw.h"
+
+static const struct i915_oa_reg b_counter_config_render_basic[] = {
+       { _MMIO(0x2724), 0x00800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2714), 0x00800000 },
+       { _MMIO(0x2710), 0x00000000 },
+};
+
+static const struct i915_oa_reg flex_eu_config_render_basic[] = {
+};
+
+static const struct i915_oa_reg mux_config_render_basic[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x253a4), 0x01600000 },
+       { _MMIO(0x25440), 0x00100000 },
+       { _MMIO(0x25128), 0x00000000 },
+       { _MMIO(0x2691c), 0x00000800 },
+       { _MMIO(0x26aa0), 0x01500000 },
+       { _MMIO(0x26b9c), 0x00006000 },
+       { _MMIO(0x2791c), 0x00000800 },
+       { _MMIO(0x27aa0), 0x01500000 },
+       { _MMIO(0x27b9c), 0x00006000 },
+       { _MMIO(0x2641c), 0x00000400 },
+       { _MMIO(0x25380), 0x00000010 },
+       { _MMIO(0x2538c), 0x00000000 },
+       { _MMIO(0x25384), 0x0800aaaa },
+       { _MMIO(0x25400), 0x00000004 },
+       { _MMIO(0x2540c), 0x06029000 },
+       { _MMIO(0x25410), 0x00000002 },
+       { _MMIO(0x25404), 0x5c30ffff },
+       { _MMIO(0x25100), 0x00000016 },
+       { _MMIO(0x25110), 0x00000400 },
+       { _MMIO(0x25104), 0x00000000 },
+       { _MMIO(0x26804), 0x00001211 },
+       { _MMIO(0x26884), 0x00000100 },
+       { _MMIO(0x26900), 0x00000002 },
+       { _MMIO(0x26908), 0x00700000 },
+       { _MMIO(0x26904), 0x00000000 },
+       { _MMIO(0x26984), 0x00001022 },
+       { _MMIO(0x26a04), 0x00000011 },
+       { _MMIO(0x26a80), 0x00000006 },
+       { _MMIO(0x26a88), 0x00000c02 },
+       { _MMIO(0x26a84), 0x00000000 },
+       { _MMIO(0x26b04), 0x00001000 },
+       { _MMIO(0x26b80), 0x00000002 },
+       { _MMIO(0x26b8c), 0x00000007 },
+       { _MMIO(0x26b84), 0x00000000 },
+       { _MMIO(0x27804), 0x00004844 },
+       { _MMIO(0x27884), 0x00000400 },
+       { _MMIO(0x27900), 0x00000002 },
+       { _MMIO(0x27908), 0x0e000000 },
+       { _MMIO(0x27904), 0x00000000 },
+       { _MMIO(0x27984), 0x00004088 },
+       { _MMIO(0x27a04), 0x00000044 },
+       { _MMIO(0x27a80), 0x00000006 },
+       { _MMIO(0x27a88), 0x00018040 },
+       { _MMIO(0x27a84), 0x00000000 },
+       { _MMIO(0x27b04), 0x00004000 },
+       { _MMIO(0x27b80), 0x00000002 },
+       { _MMIO(0x27b8c), 0x000000e0 },
+       { _MMIO(0x27b84), 0x00000000 },
+       { _MMIO(0x26104), 0x00002222 },
+       { _MMIO(0x26184), 0x0c006666 },
+       { _MMIO(0x26284), 0x04000000 },
+       { _MMIO(0x26304), 0x04000000 },
+       { _MMIO(0x26400), 0x00000002 },
+       { _MMIO(0x26410), 0x000000a0 },
+       { _MMIO(0x26404), 0x00000000 },
+       { _MMIO(0x25420), 0x04108020 },
+       { _MMIO(0x25424), 0x1284a420 },
+       { _MMIO(0x2541c), 0x00000000 },
+       { _MMIO(0x25428), 0x00042049 },
+};
+
+static ssize_t
+show_render_basic_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_hsw(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "403d8832-1a27-4aa6-a64e-f5389ce7b212",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_render_basic;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_render_basic);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_render_basic;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_render_basic);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_render_basic;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_render_basic);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "403d8832-1a27-4aa6-a64e-f5389ce7b212";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_render_basic_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_hsw.h b/drivers/gpu/drm/i915/oa/i915_oa_hsw.h
new file mode 100644 (file)
index 0000000..3d0c870
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_HSW_H__
+#define __I915_OA_HSW_H__
+
+extern void i915_perf_load_test_config_hsw(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_icl.c b/drivers/gpu/drm/i915/oa/i915_oa_icl.c
new file mode 100644 (file)
index 0000000..baa5142
--- /dev/null
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_icl.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x0000ffff },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x0000ffff },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x0000ffff },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0xd04), 0x00000200 },
+       { _MMIO(0x9840), 0x00000000 },
+       { _MMIO(0x9884), 0x00000000 },
+       { _MMIO(0x9888), 0x10060000 },
+       { _MMIO(0x9888), 0x22060000 },
+       { _MMIO(0x9888), 0x16060000 },
+       { _MMIO(0x9888), 0x24060000 },
+       { _MMIO(0x9888), 0x18060000 },
+       { _MMIO(0x9888), 0x1a060000 },
+       { _MMIO(0x9888), 0x12060000 },
+       { _MMIO(0x9888), 0x14060000 },
+       { _MMIO(0x9888), 0x10060000 },
+       { _MMIO(0x9888), 0x22060000 },
+       { _MMIO(0x9884), 0x00000003 },
+       { _MMIO(0x9888), 0x16130000 },
+       { _MMIO(0x9888), 0x24000001 },
+       { _MMIO(0x9888), 0x0e130056 },
+       { _MMIO(0x9888), 0x10130000 },
+       { _MMIO(0x9888), 0x1a130000 },
+       { _MMIO(0x9888), 0x541f0001 },
+       { _MMIO(0x9888), 0x181f0000 },
+       { _MMIO(0x9888), 0x4c1f0000 },
+       { _MMIO(0x9888), 0x301f0000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_icl(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "a291665e-244b-4b76-9b9a-01de9d3c8068",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "a291665e-244b-4b76-9b9a-01de9d3c8068";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_icl.h b/drivers/gpu/drm/i915/oa/i915_oa_icl.h
new file mode 100644 (file)
index 0000000..24eaa97
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_ICL_H__
+#define __I915_OA_ICL_H__
+
+extern void i915_perf_load_test_config_icl(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c b/drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c
new file mode 100644 (file)
index 0000000..168e49a
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_kblgt2.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810013 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_kblgt2(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "baa3c7e4-52b6-4b85-801e-465a94b746dd",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "baa3c7e4-52b6-4b85-801e-465a94b746dd";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h b/drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h
new file mode 100644 (file)
index 0000000..a55398a
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_KBLGT2_H__
+#define __I915_OA_KBLGT2_H__
+
+extern void i915_perf_load_test_config_kblgt2(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c b/drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c
new file mode 100644 (file)
index 0000000..6ffa553
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_kblgt3.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810013 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_kblgt3(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "f1792f32-6db2-4b50-b4b2-557128f1688d",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "f1792f32-6db2-4b50-b4b2-557128f1688d";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h b/drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h
new file mode 100644 (file)
index 0000000..3ddd348
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_KBLGT3_H__
+#define __I915_OA_KBLGT3_H__
+
+extern void i915_perf_load_test_config_kblgt3(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c b/drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c
new file mode 100644 (file)
index 0000000..7ce6ee8
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_sklgt2.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810016 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_sklgt2(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "1651949f-0ac0-4cb1-a06f-dafd74a407d1",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "1651949f-0ac0-4cb1-a06f-dafd74a407d1";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h b/drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h
new file mode 100644 (file)
index 0000000..be62560
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_SKLGT2_H__
+#define __I915_OA_SKLGT2_H__
+
+extern void i915_perf_load_test_config_sklgt2(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c b/drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c
new file mode 100644 (file)
index 0000000..086ca26
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_sklgt3.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810013 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_sklgt3(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "2b985803-d3c9-4629-8a4f-634bfecba0e8",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "2b985803-d3c9-4629-8a4f-634bfecba0e8";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h b/drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h
new file mode 100644 (file)
index 0000000..650beb0
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_SKLGT3_H__
+#define __I915_OA_SKLGT3_H__
+
+extern void i915_perf_load_test_config_sklgt3(struct drm_i915_private *dev_priv);
+
+#endif
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c b/drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c
new file mode 100644 (file)
index 0000000..b291a6e
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#include <linux/sysfs.h>
+
+#include "i915_drv.h"
+#include "i915_oa_sklgt4.h"
+
+static const struct i915_oa_reg b_counter_config_test_oa[] = {
+       { _MMIO(0x2740), 0x00000000 },
+       { _MMIO(0x2744), 0x00800000 },
+       { _MMIO(0x2714), 0xf0800000 },
+       { _MMIO(0x2710), 0x00000000 },
+       { _MMIO(0x2724), 0xf0800000 },
+       { _MMIO(0x2720), 0x00000000 },
+       { _MMIO(0x2770), 0x00000004 },
+       { _MMIO(0x2774), 0x00000000 },
+       { _MMIO(0x2778), 0x00000003 },
+       { _MMIO(0x277c), 0x00000000 },
+       { _MMIO(0x2780), 0x00000007 },
+       { _MMIO(0x2784), 0x00000000 },
+       { _MMIO(0x2788), 0x00100002 },
+       { _MMIO(0x278c), 0x0000fff7 },
+       { _MMIO(0x2790), 0x00100002 },
+       { _MMIO(0x2794), 0x0000ffcf },
+       { _MMIO(0x2798), 0x00100082 },
+       { _MMIO(0x279c), 0x0000ffef },
+       { _MMIO(0x27a0), 0x001000c2 },
+       { _MMIO(0x27a4), 0x0000ffe7 },
+       { _MMIO(0x27a8), 0x00100001 },
+       { _MMIO(0x27ac), 0x0000ffe7 },
+};
+
+static const struct i915_oa_reg flex_eu_config_test_oa[] = {
+};
+
+static const struct i915_oa_reg mux_config_test_oa[] = {
+       { _MMIO(0x9840), 0x00000080 },
+       { _MMIO(0x9888), 0x11810000 },
+       { _MMIO(0x9888), 0x07810013 },
+       { _MMIO(0x9888), 0x1f810000 },
+       { _MMIO(0x9888), 0x1d810000 },
+       { _MMIO(0x9888), 0x1b930040 },
+       { _MMIO(0x9888), 0x07e54000 },
+       { _MMIO(0x9888), 0x1f908000 },
+       { _MMIO(0x9888), 0x11900000 },
+       { _MMIO(0x9888), 0x37900000 },
+       { _MMIO(0x9888), 0x53900000 },
+       { _MMIO(0x9888), 0x45900000 },
+       { _MMIO(0x9888), 0x33900000 },
+};
+
+static ssize_t
+show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "1\n");
+}
+
+void
+i915_perf_load_test_config_sklgt4(struct drm_i915_private *dev_priv)
+{
+       strlcpy(dev_priv->perf.oa.test_config.uuid,
+               "882fa433-1f4a-4a67-a962-c741888fe5f5",
+               sizeof(dev_priv->perf.oa.test_config.uuid));
+       dev_priv->perf.oa.test_config.id = 1;
+
+       dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa;
+       dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);
+
+       dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_test_oa;
+       dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);
+
+       dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_test_oa;
+       dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);
+
+       dev_priv->perf.oa.test_config.sysfs_metric.name = "882fa433-1f4a-4a67-a962-c741888fe5f5";
+       dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;
+
+       dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;
+
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = "id";
+       dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;
+       dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_test_oa_id;
+}
diff --git a/drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h b/drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h
new file mode 100644 (file)
index 0000000..8dcf849
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ *
+ * Autogenerated file by GPU Top : https://github.com/rib/gputop
+ * DO NOT EDIT manually!
+ */
+
+#ifndef __I915_OA_SKLGT4_H__
+#define __I915_OA_SKLGT4_H__
+
+extern void i915_perf_load_test_config_sklgt4(struct drm_i915_private *dev_priv);
+
+#endif