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 C061CC61DA4 for ; Mon, 6 Mar 2023 17:47:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 487E210E40F; Mon, 6 Mar 2023 17:47:25 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C4C8F10E421 for ; Mon, 6 Mar 2023 17:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678124843; x=1709660843; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=mOxMC4VmE6in/gBEMKgDOY0U4cMhlYieC7TzMiZw/Zg=; b=AIULy7zOvdrwTyLoAq9c7h8z/E5QwA2UMVTdE5L0MRuoSuLmbnH1MEIs H44k3goqM7mGRVTqZXPOvsryZP6dNPQTGTLeTZvNLrKDX4w6z4YN+kd9s o1rFV9H90OAEBtssnyaz+3dX3ltBVVrIKwHG5gzVn3ex0twfZIHN+viok b+/J0Ew1gk9fKk9utTMJ9M1N4kZcyXdR5S0Yf44CmD0vMtqTRj34J1MQW LIgocMOeUlwHI85oGPnwk47OEJXU15tE35XFJZ7Y3SNa+ZuH50aFmYgeN fiGcHN3yR5kRFZsRv2BRiHD9nh5t2EJJzD4RbT11V9czqrsuHPqOhSuTZ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="333098358" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="333098358" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 09:47:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="626233845" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="626233845" Received: from ramuchie-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.58.188]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 09:47:21 -0800 From: Jani Nikula To: Rodrigo Vivi In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: Date: Mon, 06 Mar 2023 19:47:19 +0200 Message-ID: <877cvtu5zs.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 4/6] drm/i915: remove unnecessary intel_pm.h includes 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: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 02 Mar 2023, Rodrigo Vivi wrote: > On Wed, Mar 01, 2023 at 03:54:18PM +0200, Jani Nikula wrote: >> As intel_pm.[ch] used to contain much more, intel_pm.h was included in a >> lot of places. Many of them are now unnecessary. Remove. >>=20 >> Signed-off-by: Jani Nikula > > trusting the compiler: > > Reviewed-by: Rodrigo Vivi Thanks, pushed 1-4 to drm-intel-next. The rename in patch 5 leads to conflicts with drm-intel-gt-next changing stuff in intel_pm.c. BR, Jani. > > >> --- >> drivers/gpu/drm/i915/display/i9xx_wm.c | 1 - >> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 1 - >> drivers/gpu/drm/i915/display/intel_modeset_setup.c | 1 - >> drivers/gpu/drm/i915/display/skl_watermark.c | 1 - >> drivers/gpu/drm/i915/gt/intel_gt.c | 1 - >> drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 - >> drivers/gpu/drm/i915/gt/selftest_llc.c | 1 - >> drivers/gpu/drm/i915/i915_debugfs.c | 1 - >> drivers/gpu/drm/i915/i915_irq.c | 1 - >> drivers/gpu/drm/i915/i915_pmu.c | 1 - >> drivers/gpu/drm/i915/i915_request.c | 1 - >> drivers/gpu/drm/i915/i915_sysfs.c | 1 - >> drivers/gpu/drm/i915/intel_uncore.c | 1 - >> 13 files changed, 13 deletions(-) >>=20 >> diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i9= 15/display/i9xx_wm.c >> index 3d4687efe4dd..caef72d38798 100644 >> --- a/drivers/gpu/drm/i915/display/i9xx_wm.c >> +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c >> @@ -9,7 +9,6 @@ >> #include "intel_display.h" >> #include "intel_display_trace.h" >> #include "intel_mchbar_regs.h" >> -#include "intel_pm.h" >> #include "intel_wm.h" >> #include "skl_watermark.h" >> #include "vlv_sideband.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/driv= ers/gpu/drm/i915/display/intel_display_debugfs.c >> index 25013f303c82..1e654ddd0815 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> @@ -26,7 +26,6 @@ >> #include "intel_hdmi.h" >> #include "intel_hotplug.h" >> #include "intel_panel.h" >> -#include "intel_pm.h" >> #include "intel_psr.h" >> #include "intel_sprite.h" >> #include "intel_wm.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/driver= s/gpu/drm/i915/display/intel_modeset_setup.c >> index 60f71e6f0491..7ff083ec2d1d 100644 >> --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c >> +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c >> @@ -25,7 +25,6 @@ >> #include "intel_fifo_underrun.h" >> #include "intel_modeset_setup.h" >> #include "intel_pch_display.h" >> -#include "intel_pm.h" >> #include "intel_wm.h" >> #include "skl_watermark.h" >>=20=20 >> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/= drm/i915/display/skl_watermark.c >> index 1300965d328a..f0af997d2a23 100644 >> --- a/drivers/gpu/drm/i915/display/skl_watermark.c >> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c >> @@ -18,7 +18,6 @@ >> #include "intel_display_types.h" >> #include "intel_fb.h" >> #include "intel_pcode.h" >> -#include "intel_pm.h" >> #include "intel_wm.h" >> #include "skl_watermark.h" >>=20=20 >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/g= t/intel_gt.c >> index f7f271708fc7..6ca944d01eb6 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_gt.c >> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c >> @@ -28,7 +28,6 @@ >> #include "intel_migrate.h" >> #include "intel_mocs.h" >> #include "intel_pci_config.h" >> -#include "intel_pm.h" >> #include "intel_rc6.h" >> #include "intel_renderstate.h" >> #include "intel_rps.h" >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i91= 5/gt/intel_gt_pm.c >> index cef3d6f5c34e..85ae7dc079f2 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c >> +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c >> @@ -17,7 +17,6 @@ >> #include "intel_gt_print.h" >> #include "intel_gt_requests.h" >> #include "intel_llc.h" >> -#include "intel_pm.h" >> #include "intel_rc6.h" >> #include "intel_rps.h" >> #include "intel_wakeref.h" >> diff --git a/drivers/gpu/drm/i915/gt/selftest_llc.c b/drivers/gpu/drm/i9= 15/gt/selftest_llc.c >> index cfd736d88939..779fadcec7c4 100644 >> --- a/drivers/gpu/drm/i915/gt/selftest_llc.c >> +++ b/drivers/gpu/drm/i915/gt/selftest_llc.c >> @@ -3,7 +3,6 @@ >> * Copyright =C2=A9 2019 Intel Corporation >> */ >>=20=20 >> -#include "intel_pm.h" /* intel_gpu_freq() */ >> #include "selftest_llc.h" >> #include "intel_rps.h" >>=20=20 >> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/= i915_debugfs.c >> index 45773ce1deac..16011c0286ad 100644 >> --- a/drivers/gpu/drm/i915/i915_debugfs.c >> +++ b/drivers/gpu/drm/i915/i915_debugfs.c >> @@ -52,7 +52,6 @@ >> #include "i915_irq.h" >> #include "i915_scheduler.h" >> #include "intel_mchbar_regs.h" >> -#include "intel_pm.h" >>=20=20 >> static inline struct drm_i915_private *node_to_i915(struct drm_info_nod= e *node) >> { >> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915= _irq.c >> index 417c981e4968..6ce3c934d832 100644 >> --- a/drivers/gpu/drm/i915/i915_irq.c >> +++ b/drivers/gpu/drm/i915/i915_irq.c >> @@ -52,7 +52,6 @@ >> #include "i915_driver.h" >> #include "i915_drv.h" >> #include "i915_irq.h" >> -#include "intel_pm.h" >>=20=20 >> /** >> * DOC: interrupt handling >> diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915= _pmu.c >> index 52531ab28c5f..a76c5ce9513d 100644 >> --- a/drivers/gpu/drm/i915/i915_pmu.c >> +++ b/drivers/gpu/drm/i915/i915_pmu.c >> @@ -17,7 +17,6 @@ >>=20=20 >> #include "i915_drv.h" >> #include "i915_pmu.h" >> -#include "intel_pm.h" >>=20=20 >> /* Frequency for the sampling timer for events which need it. */ >> #define FREQUENCY 200 >> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/= i915_request.c >> index 7503dcb9043b..630a732aaecc 100644 >> --- a/drivers/gpu/drm/i915/i915_request.c >> +++ b/drivers/gpu/drm/i915/i915_request.c >> @@ -48,7 +48,6 @@ >> #include "i915_driver.h" >> #include "i915_drv.h" >> #include "i915_trace.h" >> -#include "intel_pm.h" >>=20=20 >> struct execute_cb { >> struct irq_work work; >> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i9= 15_sysfs.c >> index 595e8b574990..e88bb4f04305 100644 >> --- a/drivers/gpu/drm/i915/i915_sysfs.c >> +++ b/drivers/gpu/drm/i915/i915_sysfs.c >> @@ -37,7 +37,6 @@ >>=20=20 >> #include "i915_drv.h" >> #include "i915_sysfs.h" >> -#include "intel_pm.h" >>=20=20 >> struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) >> { >> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/= intel_uncore.c >> index f018da7ebaac..f4b3b2063018 100644 >> --- a/drivers/gpu/drm/i915/intel_uncore.c >> +++ b/drivers/gpu/drm/i915/intel_uncore.c >> @@ -32,7 +32,6 @@ >> #include "i915_reg.h" >> #include "i915_trace.h" >> #include "i915_vgpu.h" >> -#include "intel_pm.h" >>=20=20 >> #define FORCEWAKE_ACK_TIMEOUT_MS 50 >> #define GT_FIFO_TIMEOUT_MS 10 >> --=20 >> 2.39.1 >>=20 --=20 Jani Nikula, Intel Open Source Graphics Center