@@ -1232,17 +1232,6 @@ static void i915_pmu_unregister_cpuhp_state(struct i915_pmu *pmu)
1232
1232
cpuhp_state_remove_instance (cpuhp_slot , & pmu -> cpuhp .node );
1233
1233
}
1234
1234
1235
- static bool is_igp (struct drm_i915_private * i915 )
1236
- {
1237
- struct pci_dev * pdev = to_pci_dev (i915 -> drm .dev );
1238
-
1239
- /* IGP is 0000:00:02.0 */
1240
- return pci_domain_nr (pdev -> bus ) == 0 &&
1241
- pdev -> bus -> number == 0 &&
1242
- PCI_SLOT (pdev -> devfn ) == 2 &&
1243
- PCI_FUNC (pdev -> devfn ) == 0 ;
1244
- }
1245
-
1246
1235
void i915_pmu_register (struct drm_i915_private * i915 )
1247
1236
{
1248
1237
struct i915_pmu * pmu = & i915 -> pmu ;
@@ -1266,7 +1255,7 @@ void i915_pmu_register(struct drm_i915_private *i915)
1266
1255
pmu -> cpuhp .cpu = -1 ;
1267
1256
init_rc6 (pmu );
1268
1257
1269
- if (! is_igp (i915 )) {
1258
+ if (IS_DGFX (i915 )) {
1270
1259
pmu -> name = kasprintf (GFP_KERNEL ,
1271
1260
"i915_%s" ,
1272
1261
dev_name (i915 -> drm .dev ));
@@ -1318,7 +1307,7 @@ void i915_pmu_register(struct drm_i915_private *i915)
1318
1307
pmu -> base .event_init = NULL ;
1319
1308
free_event_attributes (pmu );
1320
1309
err_name :
1321
- if (! is_igp (i915 ))
1310
+ if (IS_DGFX (i915 ))
1322
1311
kfree (pmu -> name );
1323
1312
err :
1324
1313
drm_notice (& i915 -> drm , "Failed to register PMU!\n" );
@@ -1346,7 +1335,7 @@ void i915_pmu_unregister(struct drm_i915_private *i915)
1346
1335
perf_pmu_unregister (& pmu -> base );
1347
1336
pmu -> base .event_init = NULL ;
1348
1337
kfree (pmu -> base .attr_groups );
1349
- if (! is_igp (i915 ))
1338
+ if (IS_DGFX (i915 ))
1350
1339
kfree (pmu -> name );
1351
1340
free_event_attributes (pmu );
1352
1341
}
0 commit comments