From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F3ACC3DA5D for ; Mon, 22 Jul 2024 23:35:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A555210E219; Mon, 22 Jul 2024 23:35:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="UchPDxJA"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 004EA10E1B7; Mon, 22 Jul 2024 23:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721691351; x=1753227351; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=uHBs++XUB5PWKoO0mZ43r19mbkrWMGRIfh+BSU4Ubuc=; b=UchPDxJAU68UZ9kJSFIkONMxPomeil9UXfK/ILcTO3VZGKyoAhOUfTVe +TPqGdI9n0D1UhthY3eV0us/Okvm2NtsQe7VOWDkSNnEP5mFIwlPPP+Sm uEzZmDm0P+gEwn+21kl5ecj8Vio3vFF5ZCp8W6w6F7ehmoG8uvKLu6U8L TxoYfMQtwNrM5fGDWdMWonV1GpHoIf2/Oy1qT2oG5x03JPEWK14ZE9mMN h8pylaLqC8LigKvLxZnB4SWcTcHhiMd2eN79dPq1e/GmB8zgI2393cqa4 zbr1kixA9gYBb0Vyb5zfiBMrLtYi5Vnlj1OnF7ipOn8dEJlPSP5/6MwmE w==; X-CSE-ConnectionGUID: w5AJJoK/SuqZkhG/jQhKiw== X-CSE-MsgGUID: Ecw6siOTSCqBQvcw8HyqYg== X-IronPort-AV: E=McAfee;i="6700,10204,11141"; a="44713378" X-IronPort-AV: E=Sophos;i="6.09,229,1716274800"; d="scan'208";a="44713378" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2024 16:35:51 -0700 X-CSE-ConnectionGUID: Djh7fBLgQL+Ljm5+Kp4vUA== X-CSE-MsgGUID: cF1aP7AUTiyovMn8k1nhrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,229,1716274800"; d="scan'208";a="51929193" Received: from dmprieto-mobl1.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.125.48.92]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2024 16:35:50 -0700 Date: Mon, 22 Jul 2024 16:25:27 -0700 Message-ID: <87a5i9c8m0.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Lucas De Marchi Cc: intel-gfx@lists.freedesktop.org, linux-perf-users@vger.kernel.org, Tvrtko Ursulin , dri-devel@lists.freedesktop.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/7] drm/i915/pmu: Drop is_igp() In-Reply-To: <20240722210648.80892-5-lucas.demarchi@intel.com> References: <20240722210648.80892-1-lucas.demarchi@intel.com> <20240722210648.80892-5-lucas.demarchi@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 22 Jul 2024 14:06:45 -0700, Lucas De Marchi wrote: > > There's no reason to hardcode checking for integrated graphics on a > specific pci slot. That information is already available per platform an > can be checked with IS_DGFX(). Reviewed-by: Ashutosh Dixit > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/i915_pmu.c | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c > index 3a8bd11b87e7..b5d14dd318e4 100644 > --- a/drivers/gpu/drm/i915/i915_pmu.c > +++ b/drivers/gpu/drm/i915/i915_pmu.c > @@ -1235,17 +1235,6 @@ static void i915_pmu_unregister_cpuhp_state(struct i915_pmu *pmu) > cpuhp_state_remove_instance(cpuhp_slot, &pmu->cpuhp.node); > } > > -static bool is_igp(struct drm_i915_private *i915) > -{ > - struct pci_dev *pdev = to_pci_dev(i915->drm.dev); > - > - /* IGP is 0000:00:02.0 */ > - return pci_domain_nr(pdev->bus) == 0 && > - pdev->bus->number == 0 && > - PCI_SLOT(pdev->devfn) == 2 && > - PCI_FUNC(pdev->devfn) == 0; > -} > - > void i915_pmu_register(struct drm_i915_private *i915) > { > struct i915_pmu *pmu = &i915->pmu; > @@ -1269,7 +1258,7 @@ void i915_pmu_register(struct drm_i915_private *i915) > pmu->cpuhp.cpu = -1; > init_rc6(pmu); > > - if (!is_igp(i915)) { > + if (IS_DGFX(i915)) { > pmu->name = kasprintf(GFP_KERNEL, > "i915_%s", > dev_name(i915->drm.dev)); > @@ -1323,7 +1312,7 @@ void i915_pmu_register(struct drm_i915_private *i915) > pmu->base.event_init = NULL; > free_event_attributes(pmu); > err_name: > - if (!is_igp(i915)) > + if (IS_DGFX(i915)) > kfree(pmu->name); > err: > drm_notice(&i915->drm, "Failed to register PMU!\n"); > @@ -1351,7 +1340,7 @@ void i915_pmu_unregister(struct drm_i915_private *i915) > perf_pmu_unregister(&pmu->base); > pmu->base.event_init = NULL; > kfree(pmu->base.attr_groups); > - if (!is_igp(i915)) > + if (IS_DGFX(i915)) > kfree(pmu->name); > free_event_attributes(pmu); > } > -- > 2.43.0 >