Re: [Intel-gfx] [PATCH 4/6] drm/i915: remove unnecessary intel_pm.h includes
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. >> >> 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(-) >> >> diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c >> b/drivers/gpu/drm/i915/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/drivers/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/drivers/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" >> >> 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" >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c >> b/drivers/gpu/drm/i915/gt/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/i915/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/i915/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 © 2019 Intel Corporation >> */ >> >> -#include "intel_pm.h" /* intel_gpu_freq() */ >> #include "selftest_llc.h" >> #include "intel_rps.h" >> >> 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
Re: [Intel-gfx] [PATCH 4/6] drm/i915: remove unnecessary intel_pm.h includes
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. > > Signed-off-by: Jani Nikula trusting the compiler: Reviewed-by: Rodrigo Vivi > --- > 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(-) > > diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c > b/drivers/gpu/drm/i915/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/drivers/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/drivers/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" > > 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" > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c > b/drivers/gpu/drm/i915/gt/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/i915/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/i915/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 © 2019 Intel Corporation > */ > > -#include "intel_pm.h" /* intel_gpu_freq() */ > #include "selftest_llc.h" > #include "intel_rps.h" > > 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" > > static inline struct drm_i915_private *node_to_i915(struct drm_info_node > *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