Commit 6c5c1d89 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Ben Widawsky

drm/i915/perf: add KBL support

Add OA support for Kabylake (pretty much identical to Skylake), and
also add the associated OA configurations.
Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
parent 3891589e
...@@ -135,7 +135,9 @@ i915-y += i915_perf.o \ ...@@ -135,7 +135,9 @@ i915-y += i915_perf.o \
i915_oa_sklgt2.o \ i915_oa_sklgt2.o \
i915_oa_sklgt3.o \ i915_oa_sklgt3.o \
i915_oa_sklgt4.o \ i915_oa_sklgt4.o \
i915_oa_bxt.o i915_oa_bxt.o \
i915_oa_kblgt2.o \
i915_oa_kblgt3.o
ifeq ($(CONFIG_DRM_I915_GVT),y) ifeq ($(CONFIG_DRM_I915_GVT),y)
i915-y += intel_gvt.o i915-y += intel_gvt.o
......
This diff is collapsed.
/*
* Autogenerated file by GPU Top : https://github.com/rib/gputop
* DO NOT EDIT manually!
*
*
* Copyright (c) 2015 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
*/
#ifndef __I915_OA_KBLGT2_H__
#define __I915_OA_KBLGT2_H__
extern int i915_oa_n_builtin_metric_sets_kblgt2;
extern int i915_oa_select_metric_set_kblgt2(struct drm_i915_private *dev_priv);
extern int i915_perf_register_sysfs_kblgt2(struct drm_i915_private *dev_priv);
extern void i915_perf_unregister_sysfs_kblgt2(struct drm_i915_private *dev_priv);
#endif
This diff is collapsed.
/*
* Autogenerated file by GPU Top : https://github.com/rib/gputop
* DO NOT EDIT manually!
*
*
* Copyright (c) 2015 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
*/
#ifndef __I915_OA_KBLGT3_H__
#define __I915_OA_KBLGT3_H__
extern int i915_oa_n_builtin_metric_sets_kblgt3;
extern int i915_oa_select_metric_set_kblgt3(struct drm_i915_private *dev_priv);
extern int i915_perf_register_sysfs_kblgt3(struct drm_i915_private *dev_priv);
extern void i915_perf_unregister_sysfs_kblgt3(struct drm_i915_private *dev_priv);
#endif
...@@ -202,6 +202,8 @@ ...@@ -202,6 +202,8 @@
#include "i915_oa_sklgt3.h" #include "i915_oa_sklgt3.h"
#include "i915_oa_sklgt4.h" #include "i915_oa_sklgt4.h"
#include "i915_oa_bxt.h" #include "i915_oa_bxt.h"
#include "i915_oa_kblgt2.h"
#include "i915_oa_kblgt3.h"
/* HW requires this to be a power of two, between 128k and 16M, though driver /* 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 * is currently generally designed assuming the largest 16M size is used such
...@@ -1802,7 +1804,8 @@ static int gen8_enable_metric_set(struct drm_i915_private *dev_priv) ...@@ -1802,7 +1804,8 @@ static int gen8_enable_metric_set(struct drm_i915_private *dev_priv)
* be read back from automatically triggered reports, as part of the * be read back from automatically triggered reports, as part of the
* RPT_ID field. * RPT_ID field.
*/ */
if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv)) { if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv) ||
IS_KABYLAKE(dev_priv)) {
I915_WRITE(GEN8_OA_DEBUG, I915_WRITE(GEN8_OA_DEBUG,
_MASKED_BIT_ENABLE(GEN9_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS | _MASKED_BIT_ENABLE(GEN9_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS |
GEN9_OA_DEBUG_INCLUDE_CLK_RATIO)); GEN9_OA_DEBUG_INCLUDE_CLK_RATIO));
...@@ -2887,6 +2890,15 @@ void i915_perf_register(struct drm_i915_private *dev_priv) ...@@ -2887,6 +2890,15 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
} else if (IS_BROXTON(dev_priv)) { } else if (IS_BROXTON(dev_priv)) {
if (i915_perf_register_sysfs_bxt(dev_priv)) if (i915_perf_register_sysfs_bxt(dev_priv))
goto sysfs_error; goto sysfs_error;
} else if (IS_KABYLAKE(dev_priv)) {
if (IS_KBL_GT2(dev_priv)) {
if (i915_perf_register_sysfs_kblgt2(dev_priv))
goto sysfs_error;
} else if (IS_KBL_GT3(dev_priv)) {
if (i915_perf_register_sysfs_kblgt3(dev_priv))
goto sysfs_error;
} else
goto sysfs_error;
} }
goto exit; goto exit;
...@@ -2928,6 +2940,12 @@ void i915_perf_unregister(struct drm_i915_private *dev_priv) ...@@ -2928,6 +2940,12 @@ void i915_perf_unregister(struct drm_i915_private *dev_priv)
i915_perf_unregister_sysfs_sklgt4(dev_priv); i915_perf_unregister_sysfs_sklgt4(dev_priv);
} else if (IS_BROXTON(dev_priv)) } else if (IS_BROXTON(dev_priv))
i915_perf_unregister_sysfs_bxt(dev_priv); i915_perf_unregister_sysfs_bxt(dev_priv);
else if (IS_KABYLAKE(dev_priv)) {
if (IS_KBL_GT2(dev_priv))
i915_perf_unregister_sysfs_kblgt2(dev_priv);
else if (IS_KBL_GT3(dev_priv))
i915_perf_unregister_sysfs_kblgt3(dev_priv);
}
kobject_put(dev_priv->perf.metrics_kobj); kobject_put(dev_priv->perf.metrics_kobj);
dev_priv->perf.metrics_kobj = NULL; dev_priv->perf.metrics_kobj = NULL;
...@@ -3061,6 +3079,16 @@ void i915_perf_init(struct drm_i915_private *dev_priv) ...@@ -3061,6 +3079,16 @@ void i915_perf_init(struct drm_i915_private *dev_priv)
i915_oa_n_builtin_metric_sets_bxt; i915_oa_n_builtin_metric_sets_bxt;
dev_priv->perf.oa.ops.select_metric_set = dev_priv->perf.oa.ops.select_metric_set =
i915_oa_select_metric_set_bxt; i915_oa_select_metric_set_bxt;
} else if (IS_KBL_GT2(dev_priv)) {
dev_priv->perf.oa.n_builtin_sets =
i915_oa_n_builtin_metric_sets_kblgt2;
dev_priv->perf.oa.ops.select_metric_set =
i915_oa_select_metric_set_kblgt2;
} else if (IS_KBL_GT3(dev_priv)) {
dev_priv->perf.oa.n_builtin_sets =
i915_oa_n_builtin_metric_sets_kblgt3;
dev_priv->perf.oa.ops.select_metric_set =
i915_oa_select_metric_set_kblgt3;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment