diff options
author | Ander Conselvan de Oliveira | 2015-06-01 12:50:03 +0200 |
---|---|---|
committer | Jani Nikula | 2015-06-12 12:19:33 +0200 |
commit | 37ade41794e914103b8db417e480afd20dcea971 (patch) | |
tree | 1fb1b5b1c18b73d635e72a1c5b535c104ad7bad7 /drivers/gpu/drm/i915/intel_atomic.c | |
parent | drm/i915: Move cdclk and pll setup to intel_modeset_compute_config(), v2. (diff) | |
download | kernel-qcow2-linux-37ade41794e914103b8db417e480afd20dcea971.tar.gz kernel-qcow2-linux-37ade41794e914103b8db417e480afd20dcea971.tar.xz kernel-qcow2-linux-37ade41794e914103b8db417e480afd20dcea971.zip |
drm/i915: Read hw state into an atomic state struct, v2.
To make this work we load the new hardware state into the
atomic_state, then swap it with the sw state.
This lets us change the force restore path in setup_hw_state()
to use a single call to intel_mode_set() to restore all the
previous state.
As a nice bonus this kills off encoder->new_encoder,
connector->new_enabled and crtc->new_enabled. They were used only
to restore the state after a modeset.
Changes since v1:
- Make sure all possible planes are added with their crtc set,
so they will be turned off on first modeset.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 4df6d2d7a9c8..e47e00e5b130 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -395,7 +395,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev, return 0; } -static void +void intel_atomic_duplicate_dpll_state(struct drm_i915_private *dev_priv, struct intel_shared_dpll_config *shared_dpll) { |