Commit 8e272b3a authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass dev_priv to intel_shared_dpll_init() 



Stop passing around the drm_device and just pass the
dev_priv instead.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220325123205.22140-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 9274229a

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

+1 −1
Original line number Diff line number Diff line
@@ -9665,7 +9665,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) 
	}



	intel_plane_possible_crtcs_init(i915);

	intel_shared_dpll_init(dev);

	intel_shared_dpll_init(i915);

	intel_fdi_pll_freq_update(i915);



	intel_update_czclk(i915);

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

+4 −5
Original line number Diff line number Diff line
@@ -4078,13 +4078,12 @@ static const struct intel_dpll_mgr adlp_pll_mgr = { 


/**

 * intel_shared_dpll_init - Initialize shared DPLLs

 * @dev: drm device

 * @dev_priv: i915 device

 *

 * Initialize shared DPLLs for @dev.

 * Initialize shared DPLLs for @dev_priv.

 */

void intel_shared_dpll_init(struct drm_device *dev)

void intel_shared_dpll_init(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	const struct intel_dpll_mgr *dpll_mgr = NULL;

	const struct dpll_info *dpll_info;

	int i;
@@ -4123,7 +4122,7 @@ void intel_shared_dpll_init(struct drm_device *dev) 
	dpll_info = dpll_mgr->dpll_info;



	for (i = 0; dpll_info[i].name; i++) {

		drm_WARN_ON(dev, i != dpll_info[i].id);

		drm_WARN_ON(&dev_priv->drm, i != dpll_info[i].id);

		dev_priv->dpll.shared_dplls[i].info = &dpll_info[i];

	}

drivers/gpu/drm/i915/display/intel_dpll_mgr.h

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
	__a > __b ? (__a - __b) : (__b - __a); })



enum tc_port;

struct drm_device;

struct drm_i915_private;

struct intel_atomic_state;

struct intel_crtc;
@@ -356,7 +355,7 @@ bool intel_dpll_get_hw_state(struct drm_i915_private *i915, 
void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state);

void intel_disable_shared_dpll(const struct intel_crtc_state *crtc_state);

void intel_shared_dpll_swap_state(struct intel_atomic_state *state);

void intel_shared_dpll_init(struct drm_device *dev);

void intel_shared_dpll_init(struct drm_i915_private *dev_priv);

void intel_dpll_update_ref_clks(struct drm_i915_private *dev_priv);

void intel_dpll_readout_hw_state(struct drm_i915_private *dev_priv);

void intel_dpll_sanitize_state(struct drm_i915_private *dev_priv);