Commit 6205372b authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Clean dpll calling convention

Stop passing both the crtc and its state to the DPLL functions.
The state alone is enough.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210715093530.31711-6-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 24951b58
...@@ -3577,11 +3577,11 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state, ...@@ -3577,11 +3577,11 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,
intel_encoders_pre_pll_enable(state, crtc); intel_encoders_pre_pll_enable(state, crtc);
if (IS_CHERRYVIEW(dev_priv)) { if (IS_CHERRYVIEW(dev_priv)) {
chv_prepare_pll(crtc, new_crtc_state); chv_prepare_pll(new_crtc_state);
chv_enable_pll(crtc, new_crtc_state); chv_enable_pll(new_crtc_state);
} else { } else {
vlv_prepare_pll(crtc, new_crtc_state); vlv_prepare_pll(new_crtc_state);
vlv_enable_pll(crtc, new_crtc_state); vlv_enable_pll(new_crtc_state);
} }
intel_encoders_pre_enable(state, crtc); intel_encoders_pre_enable(state, crtc);
...@@ -3640,7 +3640,7 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state, ...@@ -3640,7 +3640,7 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state,
intel_encoders_pre_enable(state, crtc); intel_encoders_pre_enable(state, crtc);
i9xx_enable_pll(crtc, new_crtc_state); i9xx_enable_pll(new_crtc_state);
i9xx_pfit_enable(new_crtc_state); i9xx_pfit_enable(new_crtc_state);
...@@ -6906,7 +6906,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, ...@@ -6906,7 +6906,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,
dev_priv->display.crtc_compute_clock && dev_priv->display.crtc_compute_clock &&
!crtc_state->bigjoiner_slave && !crtc_state->bigjoiner_slave &&
!drm_WARN_ON(&dev_priv->drm, crtc_state->shared_dpll)) { !drm_WARN_ON(&dev_priv->drm, crtc_state->shared_dpll)) {
ret = dev_priv->display.crtc_compute_clock(crtc, crtc_state); ret = dev_priv->display.crtc_compute_clock(crtc_state);
if (ret) if (ret)
return ret; return ret;
} }
......
This diff is collapsed.
...@@ -19,27 +19,20 @@ int vlv_calc_dpll_params(int refclk, struct dpll *clock); ...@@ -19,27 +19,20 @@ int vlv_calc_dpll_params(int refclk, struct dpll *clock);
int pnv_calc_dpll_params(int refclk, struct dpll *clock); int pnv_calc_dpll_params(int refclk, struct dpll *clock);
int i9xx_calc_dpll_params(int refclk, struct dpll *clock); int i9xx_calc_dpll_params(int refclk, struct dpll *clock);
u32 i9xx_dpll_compute_fp(const struct dpll *dpll); u32 i9xx_dpll_compute_fp(const struct dpll *dpll);
void vlv_compute_dpll(struct intel_crtc *crtc, void vlv_compute_dpll(struct intel_crtc_state *crtc_state);
struct intel_crtc_state *pipe_config); void chv_compute_dpll(struct intel_crtc_state *crtc_state);
void chv_compute_dpll(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config);
int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe, int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,
const struct dpll *dpll); const struct dpll *dpll);
void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe); void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe);
void i9xx_enable_pll(struct intel_crtc *crtc, void i9xx_enable_pll(const struct intel_crtc_state *crtc_state);
const struct intel_crtc_state *crtc_state); void vlv_enable_pll(const struct intel_crtc_state *crtc_state);
void vlv_enable_pll(struct intel_crtc *crtc, void chv_enable_pll(const struct intel_crtc_state *crtc_state);
const struct intel_crtc_state *pipe_config);
void chv_enable_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe); void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe);
void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe); void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe);
void i9xx_disable_pll(const struct intel_crtc_state *crtc_state); void i9xx_disable_pll(const struct intel_crtc_state *crtc_state);
void vlv_prepare_pll(struct intel_crtc *crtc, void vlv_prepare_pll(const struct intel_crtc_state *crtc_state);
const struct intel_crtc_state *pipe_config); void chv_prepare_pll(const struct intel_crtc_state *crtc_state);
void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config);
bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state,
struct dpll *best_clock); struct dpll *best_clock);
int chv_calc_dpll_params(int refclk, struct dpll *pll_clock); int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
......
...@@ -352,8 +352,7 @@ struct drm_i915_display_funcs { ...@@ -352,8 +352,7 @@ struct drm_i915_display_funcs {
struct intel_crtc_state *); struct intel_crtc_state *);
void (*get_initial_plane_config)(struct intel_crtc *, void (*get_initial_plane_config)(struct intel_crtc *,
struct intel_initial_plane_config *); struct intel_initial_plane_config *);
int (*crtc_compute_clock)(struct intel_crtc *crtc, int (*crtc_compute_clock)(struct intel_crtc_state *crtc_state);
struct intel_crtc_state *crtc_state);
void (*crtc_enable)(struct intel_atomic_state *state, void (*crtc_enable)(struct intel_atomic_state *state,
struct intel_crtc *crtc); struct intel_crtc *crtc);
void (*crtc_disable)(struct intel_atomic_state *state, void (*crtc_disable)(struct intel_atomic_state *state,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment