[PATCH 10/10] no cpuhp notifications
Tvrtko Ursulin
tursulin at ursulin.net
Tue Oct 17 17:05:47 UTC 2017
From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
drivers/gpu/drm/i915/i915_pmu.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 5d2c83a41b53..b5e2b0193bef 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -734,6 +734,7 @@ static const struct attribute_group *i915_pmu_attr_groups[] = {
NULL
};
+#if 0
static int i915_pmu_cpu_online(unsigned int cpu, struct hlist_node *node)
{
unsigned int target;
@@ -762,6 +763,7 @@ static int i915_pmu_cpu_offline(unsigned int cpu, struct hlist_node *node)
return 0;
}
+#endif
static void __disable_busy_stats(struct work_struct *work)
{
@@ -782,15 +784,15 @@ void i915_pmu_register(struct drm_i915_private *i915)
return;
}
- ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
+ ret = 0;/*cpuhp_setup_state_multi(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
"perf/x86/intel/i915:online",
i915_pmu_cpu_online,
- i915_pmu_cpu_offline);
+ i915_pmu_cpu_offline);*/
if (ret)
goto err_hp_state;
- ret = cpuhp_state_add_instance(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
- &i915->pmu.node);
+ ret = 0;/*cpuhp_state_add_instance(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
+ &i915->pmu.node);*/
if (ret)
goto err_hp_instance;
@@ -837,9 +839,9 @@ void i915_pmu_unregister(struct drm_i915_private *i915)
if (!i915->pmu.base.event_init)
return;
- WARN_ON(cpuhp_state_remove_instance(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
- &i915->pmu.node));
- cpuhp_remove_multi_state(CPUHP_AP_PERF_X86_UNCORE_ONLINE);
+// WARN_ON(cpuhp_state_remove_instance(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
+// &i915->pmu.node));
+// cpuhp_remove_multi_state(CPUHP_AP_PERF_X86_UNCORE_ONLINE);
i915->pmu.enable = 0;
--
2.9.5
More information about the Intel-gfx-trybot
mailing list