diff options
author | Maarten Lankhorst | 2015-08-05 12:37:00 +0200 |
---|---|---|
committer | Daniel Vetter | 2015-08-14 17:50:30 +0200 |
commit | ee165b1a6e0269e5badde679f72fe39d3d15a7d4 (patch) | |
tree | 7cb17bb8bf0ff50f1375b384f42e1376a42889c9 /drivers/gpu/drm/i915/intel_display.c | |
parent | drm/i915: Make the force_thru workaround atomic, v2. (diff) | |
download | kernel-qcow2-linux-ee165b1a6e0269e5badde679f72fe39d3d15a7d4.tar.gz kernel-qcow2-linux-ee165b1a6e0269e5badde679f72fe39d3d15a7d4.tar.xz kernel-qcow2-linux-ee165b1a6e0269e5badde679f72fe39d3d15a7d4.zip |
drm/i915: Validate the state after an atomic modeset only, and pass the state.
First step in removing dpms and validating atomic state.
There can still be a mismatch in the connector state because the dpms
callbacks are still used, but this can not happen immediately after a modeset.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0555987df8a2..64f059c5e9ac 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6446,8 +6446,6 @@ int intel_connector_dpms(struct drm_connector *connector, int mode) if (connector->encoder) intel_encoder_dpms(to_intel_encoder(connector->encoder), mode); - intel_modeset_check_state(connector->dev); - return 0; } @@ -12910,8 +12908,9 @@ check_shared_dpll_state(struct drm_device *dev) } } -void -intel_modeset_check_state(struct drm_device *dev) +static void +intel_modeset_check_state(struct drm_device *dev, + struct drm_atomic_state *old_state) { check_wm_state(dev); check_connector_state(dev); @@ -13300,10 +13299,11 @@ static int intel_atomic_commit(struct drm_device *dev, drm_atomic_helper_wait_for_vblanks(dev, state); drm_atomic_helper_cleanup_planes(dev, state); - drm_atomic_state_free(state); if (any_ms) - intel_modeset_check_state(dev); + intel_modeset_check_state(dev, state); + + drm_atomic_state_free(state); return 0; } |