drm/i915: Rename intel_shared_dpll_commit() to _swap_state()

The function intel_shared_dpll_commit() performs the equivalent of
drm_atomic_helper_swap_state() for the shared dpll state, which is not
handled by the helpers. So make it do a full swap of the state and
rename it for consistency.

v2: Fix typo in the commit message. (Durga)
v3: Rebase.
v4: Swap the states instead of just renaming the function. (Daniel)
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Durgadoss R <durgadoss.r@intel.com> (v2)
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> (v3)
Link: http://patchwork.freedesktop.org/patch/msgid/1483024933-3726-3-git-send-email-ander.conselvan.de.oliveira@intel.com
parent a1c414ee
...@@ -14658,7 +14658,7 @@ static int intel_atomic_commit(struct drm_device *dev, ...@@ -14658,7 +14658,7 @@ static int intel_atomic_commit(struct drm_device *dev,
drm_atomic_helper_swap_state(state, true); drm_atomic_helper_swap_state(state, true);
dev_priv->wm.distrust_bios_wm = false; dev_priv->wm.distrust_bios_wm = false;
intel_shared_dpll_commit(state); intel_shared_dpll_swap_state(state);
intel_atomic_track_fbs(state); intel_atomic_track_fbs(state);
if (intel_state->modeset) { if (intel_state->modeset) {
......
...@@ -265,7 +265,7 @@ intel_reference_shared_dpll(struct intel_shared_dpll *pll, ...@@ -265,7 +265,7 @@ intel_reference_shared_dpll(struct intel_shared_dpll *pll,
shared_dpll[pll->id].crtc_mask |= 1 << crtc->pipe; shared_dpll[pll->id].crtc_mask |= 1 << crtc->pipe;
} }
void intel_shared_dpll_commit(struct drm_atomic_state *state) void intel_shared_dpll_swap_state(struct drm_atomic_state *state)
{ {
struct drm_i915_private *dev_priv = to_i915(state->dev); struct drm_i915_private *dev_priv = to_i915(state->dev);
struct intel_shared_dpll_config *shared_dpll; struct intel_shared_dpll_config *shared_dpll;
...@@ -277,8 +277,13 @@ void intel_shared_dpll_commit(struct drm_atomic_state *state) ...@@ -277,8 +277,13 @@ void intel_shared_dpll_commit(struct drm_atomic_state *state)
shared_dpll = to_intel_atomic_state(state)->shared_dpll; shared_dpll = to_intel_atomic_state(state)->shared_dpll;
for (i = 0; i < dev_priv->num_shared_dpll; i++) { for (i = 0; i < dev_priv->num_shared_dpll; i++) {
struct intel_shared_dpll_config tmp;
pll = &dev_priv->shared_dplls[i]; pll = &dev_priv->shared_dplls[i];
tmp = pll->config;
pll->config = shared_dpll[i]; pll->config = shared_dpll[i];
shared_dpll[i] = tmp;
} }
} }
......
...@@ -152,7 +152,7 @@ void intel_release_shared_dpll(struct intel_shared_dpll *dpll, ...@@ -152,7 +152,7 @@ void intel_release_shared_dpll(struct intel_shared_dpll *dpll,
void intel_prepare_shared_dpll(struct intel_crtc *crtc); void intel_prepare_shared_dpll(struct intel_crtc *crtc);
void intel_enable_shared_dpll(struct intel_crtc *crtc); void intel_enable_shared_dpll(struct intel_crtc *crtc);
void intel_disable_shared_dpll(struct intel_crtc *crtc); void intel_disable_shared_dpll(struct intel_crtc *crtc);
void intel_shared_dpll_commit(struct drm_atomic_state *state); void intel_shared_dpll_swap_state(struct drm_atomic_state *state);
void intel_shared_dpll_init(struct drm_device *dev); void intel_shared_dpll_init(struct drm_device *dev);
/* BXT dpll related functions */ /* BXT dpll related functions */
......
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