Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Nuke intel_prepare_shared_dpll()

intel_prepare_shared_dpll() is now useless, so get rid of it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210715093530.31711-14-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

-42
-3
drivers/gpu/drm/i915/display/intel_display.c
··· 2921 2921 intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false); 2922 2922 intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false); 2923 2923 2924 - if (new_crtc_state->has_pch_encoder) 2925 - intel_prepare_shared_dpll(new_crtc_state); 2926 - 2927 2924 if (intel_crtc_has_dp_encoder(new_crtc_state)) 2928 2925 intel_dp_set_m_n(new_crtc_state, M1_N1); 2929 2926
-28
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
··· 185 185 } 186 186 187 187 /** 188 - * intel_prepare_shared_dpll - call a dpll's prepare hook 189 - * @crtc_state: CRTC, and its state, which has a shared dpll 190 - * 191 - * This calls the PLL's prepare hook if it has one and if the PLL is not 192 - * already enabled. The prepare hook is platform specific. 193 - */ 194 - void intel_prepare_shared_dpll(const struct intel_crtc_state *crtc_state) 195 - { 196 - struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); 197 - struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); 198 - struct intel_shared_dpll *pll = crtc_state->shared_dpll; 199 - 200 - if (drm_WARN_ON(&dev_priv->drm, pll == NULL)) 201 - return; 202 - 203 - mutex_lock(&dev_priv->dpll.lock); 204 - drm_WARN_ON(&dev_priv->drm, !pll->state.pipe_mask); 205 - if (!pll->active_mask) { 206 - drm_dbg(&dev_priv->drm, "setting up %s\n", pll->info->name); 207 - drm_WARN_ON(&dev_priv->drm, pll->on); 208 - assert_shared_dpll_disabled(dev_priv, pll); 209 - 210 - pll->info->funcs->prepare(dev_priv, pll); 211 - } 212 - mutex_unlock(&dev_priv->dpll.lock); 213 - } 214 - 215 - /** 216 188 * intel_enable_shared_dpll - enable a CRTC's shared DPLL 217 189 * @crtc_state: CRTC, and its state, which has a shared DPLL 218 190 *
-11
drivers/gpu/drm/i915/display/intel_dpll_mgr.h
··· 256 256 */ 257 257 struct intel_shared_dpll_funcs { 258 258 /** 259 - * @prepare: 260 - * 261 - * Optional hook to perform operations prior to enabling the PLL. 262 - * Called from intel_prepare_shared_dpll() function unless the PLL 263 - * is already enabled. 264 - */ 265 - void (*prepare)(struct drm_i915_private *dev_priv, 266 - struct intel_shared_dpll *pll); 267 - 268 - /** 269 259 * @enable: 270 260 * 271 261 * Hook for enabling the pll, called from intel_enable_shared_dpll() ··· 394 404 bool intel_dpll_get_hw_state(struct drm_i915_private *i915, 395 405 struct intel_shared_dpll *pll, 396 406 struct intel_dpll_hw_state *hw_state); 397 - void intel_prepare_shared_dpll(const struct intel_crtc_state *crtc_state); 398 407 void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state); 399 408 void intel_disable_shared_dpll(const struct intel_crtc_state *crtc_state); 400 409 void intel_shared_dpll_swap_state(struct intel_atomic_state *state);