mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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>
This commit is contained in:
parent
c4e2d043ff
commit
ee165b1a6e
5 changed files with 6 additions and 13 deletions
|
@ -280,8 +280,6 @@ static int intel_crt_dpms(struct drm_connector *connector, int mode)
|
|||
intel_crtc_update_dpms(crtc);
|
||||
}
|
||||
|
||||
intel_modeset_check_state(connector->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -999,7 +999,6 @@ int intel_connector_init(struct intel_connector *);
|
|||
struct intel_connector *intel_connector_alloc(void);
|
||||
int intel_connector_dpms(struct drm_connector *, int mode);
|
||||
bool intel_connector_get_hw_state(struct intel_connector *connector);
|
||||
void intel_modeset_check_state(struct drm_device *dev);
|
||||
bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
|
||||
struct intel_digital_port *port);
|
||||
void intel_connector_attach_encoder(struct intel_connector *connector,
|
||||
|
|
|
@ -237,8 +237,6 @@ static int intel_dvo_dpms(struct drm_connector *connector, int mode)
|
|||
intel_crtc_update_dpms(crtc);
|
||||
}
|
||||
|
||||
intel_modeset_check_state(connector->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1550,8 +1550,6 @@ static int intel_sdvo_dpms(struct drm_connector *connector, int mode)
|
|||
intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output);
|
||||
}
|
||||
|
||||
intel_modeset_check_state(connector->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue