Commit d670c78e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch] 



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.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230403122428.3526263-1-jani.nikula@intel.com
parent 69e6dd14

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \

drivers/gpu/drm/i915/display/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_driver.c

+4 −4
Original line number Diff line number Diff line
@@ -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);
@@ -1242,7 +1242,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 */

drivers/gpu/drm/i915/i915_gem.c

+4 −4
Original line number Diff line number Diff line
@@ -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 +1172,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
	 *

	 * FIXME: break up the workarounds and apply them at the right time!

	 */

	intel_init_clock_gating(dev_priv);

	intel_clock_gating_init(dev_priv);



	for_each_gt(gt, dev_priv, i) {

		ret = intel_gt_init(gt);
@@ -1216,7 +1216,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
		/* Minimal basic recovery for KMS */

		ret = i915_ggtt_enable_hw(dev_priv);

		i915_ggtt_resume(to_gt(dev_priv)->ggtt);

		intel_init_clock_gating(dev_priv);

		intel_clock_gating_init(dev_priv);

	}



	i915_gem_drain_freed_objects(dev_priv);

drivers/gpu/drm/i915/intel_pm.c→drivers/gpu/drm/i915/intel_clock_gating.c

+4 −4
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#include "gt/intel_gt_regs.h"



#include "i915_drv.h"

#include "intel_clock_gating.h"

#include "intel_mchbar_regs.h"

#include "intel_pm.h"

#include "vlv_sideband.h"



struct drm_i915_clock_gating_funcs {
@@ -774,7 +774,7 @@ static void i830_init_clock_gating(struct drm_i915_private *dev_priv) 
		   _MASKED_BIT_ENABLE(MEM_DISPLAY_B_TRICKLE_FEED_DISABLE));

}



void intel_init_clock_gating(struct drm_i915_private *dev_priv)

void intel_clock_gating_init(struct drm_i915_private *dev_priv)

{

	dev_priv->clock_gating_funcs->init_clock_gating(dev_priv);

}
@@ -818,7 +818,7 @@ CG_FUNCS(nop); 
#undef CG_FUNCS



/**

 * intel_init_clock_gating_hooks - setup the clock gating hooks

 * intel_clock_gating_hooks_init - setup the clock gating hooks

 * @dev_priv: device private

 *

 * Setup the hooks that configure which clocks of a given platform can be
@@ -826,7 +826,7 @@ CG_FUNCS(nop); 
 * platforms. Note that some GT specific workarounds are applied separately

 * when GPU contexts or batchbuffers start their execution.

 */

void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)

void intel_clock_gating_hooks_init(struct drm_i915_private *dev_priv)

{

	if (IS_METEORLAKE(dev_priv))

		dev_priv->clock_gating_funcs = &nop_clock_gating_funcs;