diff options
| author | Ander Conselvan de Oliveira | 2016-12-29 16:22:09 +0100 |
|---|---|---|
| committer | Ander Conselvan de Oliveira | 2016-12-30 08:26:10 +0100 |
| commit | 2c42e5351445955b8697213d067fba2bb6187c88 (patch) | |
| tree | 1d14f86ad1820e86d66587585cf48b74095150ae /drivers/gpu/drm/i915/intel_atomic.c | |
| parent | drm/i915: Rename intel_shared_dpll_commit() to _swap_state() (diff) | |
| download | kernel-qcow2-linux-2c42e5351445955b8697213d067fba2bb6187c88.tar.gz kernel-qcow2-linux-2c42e5351445955b8697213d067fba2bb6187c88.tar.xz kernel-qcow2-linux-2c42e5351445955b8697213d067fba2bb6187c88.zip | |
drm/i915: Rename intel_shared_dpll_config to intel_shared_dpll_state
Struct intel_shared_dpll_config is used to hold the state of the DPLL in
the "atomic" sense, so call it state like everything else atomic.
v2: Rebase
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> (v1)
Link: http://patchwork.freedesktop.org/patch/msgid/1483024933-3726-4-git-send-email-ander.conselvan.de.oliveira@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index c5a166752eda..fa6dc432eb50 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -267,7 +267,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev, static void intel_atomic_duplicate_dpll_state(struct drm_i915_private *dev_priv, - struct intel_shared_dpll_config *shared_dpll) + struct intel_shared_dpll_state *shared_dpll) { enum intel_dpll_id i; @@ -275,11 +275,11 @@ intel_atomic_duplicate_dpll_state(struct drm_i915_private *dev_priv, for (i = 0; i < dev_priv->num_shared_dpll; i++) { struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; - shared_dpll[i] = pll->config; + shared_dpll[i] = pll->state; } } -struct intel_shared_dpll_config * +struct intel_shared_dpll_state * intel_atomic_get_shared_dpll_state(struct drm_atomic_state *s) { struct intel_atomic_state *state = to_intel_atomic_state(s); |