[PATCH 11/11] skip pmu registration etc

Tvrtko Ursulin tursulin at ursulin.net
Wed Oct 18 08:22:50 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index b6bdb4049ece..fa4765fd04c8 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -793,7 +793,7 @@ void i915_pmu_register(struct drm_i915_private *i915)
 				       &i915->pmu.node);
 	if (ret)
 		goto err_hp_instance;
-
+return;
 	i915->pmu.base.attr_groups	= i915_pmu_attr_groups;
 	i915->pmu.base.task_ctx_nr	= perf_invalid_context;
 	i915->pmu.base.event_init	= i915_pmu_event_init;
@@ -834,13 +834,13 @@ void i915_pmu_unregister(struct drm_i915_private *i915)
 	struct intel_engine_cs *engine;
 	enum intel_engine_id id;
 
-	if (!i915->pmu.base.event_init)
-		return;
+// 	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);
-
+return;
 	i915->pmu.enable = 0;
 
 	hrtimer_cancel(&i915->pmu.timer);
-- 
2.9.5



More information about the Intel-gfx-trybot mailing list