Re: [Intel-gfx] [PATCH 5/6] drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]

[Rodrigo Vivi]

On Wed, Mar 01, 2023 at 03:54:19PM +0200, Jani Nikula wrote:
> Observe that intel_pm.[ch] is now purely about clock gating, so rename
> them to intel_clock_gating.[ch]. Rename the functions to
> intel_clock_gating_*() to follow coding conventions.
> 
> Signed-off-by: Jani Nikula 

Reviewed-by: Rodrigo Vivi 


> ---
>  drivers/gpu/drm/i915/Makefile  |  2 +-
>  drivers/gpu/drm/i915/display/intel_display.c   |  4 ++--
>  drivers/gpu/drm/i915/i915_driver.c |  8 
>  drivers/gpu/drm/i915/i915_gem.c|  8 
>  .../i915/{intel_pm.c => intel_clock_gating.c}  |  8 
>  drivers/gpu/drm/i915/intel_clock_gating.h  | 14 ++
>  drivers/gpu/drm/i915/intel_pm.h| 18 --
>  drivers/gpu/drm/i915/vlv_suspend.c |  4 ++--
>  8 files changed, 31 insertions(+), 35 deletions(-)
>  rename drivers/gpu/drm/i915/{intel_pm.c => intel_clock_gating.c} (99%)
>  create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.h
>  delete mode 100644 drivers/gpu/drm/i915/intel_pm.h
> 
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index b2f91a1f8268..b88df8c10781 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -47,10 +47,10 @@ i915-y += i915_driver.o \
> i915_switcheroo.o \
> i915_sysfs.o \
> i915_utils.o \
> +   intel_clock_gating.o \
> intel_device_info.o \
> intel_memory_region.o \
> intel_pcode.o \
> -   intel_pm.o \
> intel_region_ttm.o \
> intel_runtime_pm.o \
> intel_sbi.o \
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
> b/drivers/gpu/drm/i915/display/intel_display.c
> index a1fbdf32bd21..3f1b90a2f57c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -63,6 +63,7 @@
>  #include "intel_audio.h"
>  #include "intel_bw.h"
>  #include "intel_cdclk.h"
> +#include "intel_clock_gating.h"
>  #include "intel_color.h"
>  #include "intel_crt.h"
>  #include "intel_crtc.h"
> @@ -105,7 +106,6 @@
>  #include "intel_pcode.h"
>  #include "intel_pipe_crc.h"
>  #include "intel_plane_initial.h"
> -#include "intel_pm.h"
>  #include "intel_pps.h"
>  #include "intel_psr.h"
>  #include "intel_quirks.h"
> @@ -850,7 +850,7 @@ void intel_display_finish_reset(struct drm_i915_private 
> *i915)
>*/
>   intel_pps_unlock_regs_wa(i915);
>   intel_modeset_init_hw(i915);
> - intel_init_clock_gating(i915);
> + intel_clock_gating_init(i915);
>   intel_hpd_init(i915);
>  
>   ret = __intel_display_resume(i915, state, ctx);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c 
> b/drivers/gpu/drm/i915/i915_driver.c
> index a53fd339e2cc..e4809485e47c 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -79,11 +79,11 @@
>  #include "soc/intel_dram.h"
>  #include "soc/intel_gmch.h"
>  
> -#include "i915_file_private.h"
>  #include "i915_debugfs.h"
>  #include "i915_driver.h"
>  #include "i915_drm_client.h"
>  #include "i915_drv.h"
> +#include "i915_file_private.h"
>  #include "i915_getparam.h"
>  #include "i915_hwmon.h"
>  #include "i915_ioc32.h"
> @@ -97,11 +97,11 @@
>  #include "i915_sysfs.h"
>  #include "i915_utils.h"
>  #include "i915_vgpu.h"
> +#include "intel_clock_gating.h"
>  #include "intel_gvt.h"
>  #include "intel_memory_region.h"
>  #include "intel_pci_config.h"
>  #include "intel_pcode.h"
> -#include "intel_pm.h"
>  #include "intel_region_ttm.h"
>  #include "vlv_suspend.h"
>  
> @@ -252,7 +252,7 @@ static int i915_driver_early_probe(struct 
> drm_i915_private *dev_priv)
>  
>   intel_irq_init(dev_priv);
>   intel_init_display_hooks(dev_priv);
> - intel_init_clock_gating_hooks(dev_priv);
> + intel_clock_gating_hooks_init(dev_priv);
>  
>   intel_detect_preproduction_hw(dev_priv);
>  
> @@ -1238,7 +1238,7 @@ static int i915_drm_resume(struct drm_device *dev)
>   i915_gem_resume(dev_priv);
>  
>   intel_modeset_init_hw(dev_priv);
> - intel_init_clock_gating(dev_priv);
> + intel_clock_gating_init(dev_priv);
>   intel_hpd_init(dev_priv);
>  
>   /* MST sideband requires HPD interrupts enabled */
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 35950fa91406..6b6b0e575ef3 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -58,7 +58,7 @@
>  #include "i915_file_private.h"
>  #include "i915_trace.h"
>  #include "i915_vgpu.h"
> -#include "intel_pm.h"
> +#include "intel_clock_gating.h"
>  
>  static int
>  insert_mappable_node(struct i915_ggtt *ggtt, struct drm_mm_node *node, u32 
> size)
> @@ -1164,7 +1164,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
>   }
>  
>   /*
> -  * Despite its name intel_init_clock_gating applies both display
> +  * Despite 

[Intel-gfx] [PATCH 5/6] drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]

[Jani Nikula]

Observe that intel_pm.[ch] is now purely about clock gating, so rename
them to intel_clock_gating.[ch]. Rename the functions to
intel_clock_gating_*() to follow coding conventions.

Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/i915/Makefile  |  2 +-
 drivers/gpu/drm/i915/display/intel_display.c   |  4 ++--
 drivers/gpu/drm/i915/i915_driver.c |  8 
 drivers/gpu/drm/i915/i915_gem.c|  8 
 .../i915/{intel_pm.c => intel_clock_gating.c}  |  8 
 drivers/gpu/drm/i915/intel_clock_gating.h  | 14 ++
 drivers/gpu/drm/i915/intel_pm.h| 18 --
 drivers/gpu/drm/i915/vlv_suspend.c |  4 ++--
 8 files changed, 31 insertions(+), 35 deletions(-)
 rename drivers/gpu/drm/i915/{intel_pm.c => intel_clock_gating.c} (99%)
 create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.h
 delete mode 100644 drivers/gpu/drm/i915/intel_pm.h

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index b2f91a1f8268..b88df8c10781 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -47,10 +47,10 @@ i915-y += i915_driver.o \
  i915_switcheroo.o \
  i915_sysfs.o \
  i915_utils.o \
+ intel_clock_gating.o \
  intel_device_info.o \
  intel_memory_region.o \
  intel_pcode.o \
- intel_pm.o \
  intel_region_ttm.o \
  intel_runtime_pm.o \
  intel_sbi.o \
diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index a1fbdf32bd21..3f1b90a2f57c 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -63,6 +63,7 @@
 #include "intel_audio.h"
 #include "intel_bw.h"
 #include "intel_cdclk.h"
+#include "intel_clock_gating.h"
 #include "intel_color.h"
 #include "intel_crt.h"
 #include "intel_crtc.h"
@@ -105,7 +106,6 @@
 #include "intel_pcode.h"
 #include "intel_pipe_crc.h"
 #include "intel_plane_initial.h"
-#include "intel_pm.h"
 #include "intel_pps.h"
 #include "intel_psr.h"
 #include "intel_quirks.h"
@@ -850,7 +850,7 @@ void intel_display_finish_reset(struct drm_i915_private 
*i915)
 */
intel_pps_unlock_regs_wa(i915);
intel_modeset_init_hw(i915);
-   intel_init_clock_gating(i915);
+   intel_clock_gating_init(i915);
intel_hpd_init(i915);
 
ret = __intel_display_resume(i915, state, ctx);
diff --git a/drivers/gpu/drm/i915/i915_driver.c 
b/drivers/gpu/drm/i915/i915_driver.c
index a53fd339e2cc..e4809485e47c 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -79,11 +79,11 @@
 #include "soc/intel_dram.h"
 #include "soc/intel_gmch.h"
 
-#include "i915_file_private.h"
 #include "i915_debugfs.h"
 #include "i915_driver.h"
 #include "i915_drm_client.h"
 #include "i915_drv.h"
+#include "i915_file_private.h"
 #include "i915_getparam.h"
 #include "i915_hwmon.h"
 #include "i915_ioc32.h"
@@ -97,11 +97,11 @@
 #include "i915_sysfs.h"
 #include "i915_utils.h"
 #include "i915_vgpu.h"
+#include "intel_clock_gating.h"
 #include "intel_gvt.h"
 #include "intel_memory_region.h"
 #include "intel_pci_config.h"
 #include "intel_pcode.h"
-#include "intel_pm.h"
 #include "intel_region_ttm.h"
 #include "vlv_suspend.h"
 
@@ -252,7 +252,7 @@ static int i915_driver_early_probe(struct drm_i915_private 
*dev_priv)
 
intel_irq_init(dev_priv);
intel_init_display_hooks(dev_priv);
-   intel_init_clock_gating_hooks(dev_priv);
+   intel_clock_gating_hooks_init(dev_priv);
 
intel_detect_preproduction_hw(dev_priv);
 
@@ -1238,7 +1238,7 @@ static int i915_drm_resume(struct drm_device *dev)
i915_gem_resume(dev_priv);
 
intel_modeset_init_hw(dev_priv);
-   intel_init_clock_gating(dev_priv);
+   intel_clock_gating_init(dev_priv);
intel_hpd_init(dev_priv);
 
/* MST sideband requires HPD interrupts enabled */
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 35950fa91406..6b6b0e575ef3 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -58,7 +58,7 @@
 #include "i915_file_private.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
-#include "intel_pm.h"
+#include "intel_clock_gating.h"
 
 static int
 insert_mappable_node(struct i915_ggtt *ggtt, struct drm_mm_node *node, u32 
size)
@@ -1164,7 +1164,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
}
 
/*
-* Despite its name intel_init_clock_gating applies both display
+* Despite its name intel_clock_gating_init applies both display
 * clock gating workarounds; GT mmio workarounds and the occasional
 * GT power context workaround. Worse, sometimes it includes a context
 * register workaround which we need to apply before we record the
@@ -1172,7