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

drm/i915/pm: drop intel_pm_setup() 



All the init in intel_pm_setup() is related to runtime pm. Move them to
intel_runtime_pm_init_early(), and remove intel_pm_setup().

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b01f9bf0afa9abaece5d0f76aecde69e2679f662.1677678803.git.jani.nikula@intel.com
parent 26f8c146

drivers/gpu/drm/i915/i915_driver.c

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) 
	/* This must be called before any calls to HAS_PCH_* */

	intel_detect_pch(dev_priv);



	intel_pm_setup(dev_priv);

	intel_irq_init(dev_priv);

	intel_init_display_hooks(dev_priv);

	intel_init_clock_gating_hooks(dev_priv);

drivers/gpu/drm/i915/intel_pm.c

+0 −6
Original line number Diff line number Diff line
@@ -899,9 +899,3 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv) 
		dev_priv->clock_gating_funcs = &nop_clock_gating_funcs;

	}

}
 


void intel_pm_setup(struct drm_i915_private *dev_priv)

{

	dev_priv->runtime_pm.suspended = false;

	atomic_set(&dev_priv->runtime_pm.wakeref_count, 0);

}

drivers/gpu/drm/i915/intel_pm.h

+0 −1
Original line number Diff line number Diff line
@@ -15,6 +15,5 @@ struct intel_plane_state; 
void intel_init_clock_gating(struct drm_i915_private *dev_priv);

void intel_suspend_hw(struct drm_i915_private *dev_priv);

void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv);

void intel_pm_setup(struct drm_i915_private *dev_priv);



#endif /* __INTEL_PM_H__ */

drivers/gpu/drm/i915/intel_runtime_pm.c

+2 −0
Original line number Diff line number Diff line
@@ -652,6 +652,8 @@ void intel_runtime_pm_init_early(struct intel_runtime_pm *rpm) 


	rpm->kdev = kdev;

	rpm->available = HAS_RUNTIME_PM(i915);

	rpm->suspended = false;

	atomic_set(&rpm->wakeref_count, 0);



	init_intel_runtime_pm_wakeref(rpm);

	INIT_LIST_HEAD(&rpm->lmem_userfault_list);