Otherwise the connector might have been unplugged and destroyed while
we didn't look. Yet another fallout from DP MST hotplugging that I
didn't consider.
To make sure we get this right add an appropriate WARN_ON to
drm_atomic_state_clear (obviously only when we actually have a state
to clear up). And reorder all the state_clear and backoff calls to
make it work out properly.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
void drm_atomic_state_clear(struct drm_atomic_state *state)
{
struct drm_device *dev = state->dev;
void drm_atomic_state_clear(struct drm_atomic_state *state)
{
struct drm_device *dev = state->dev;
+ struct drm_mode_config *config = &dev->mode_config;
int i;
DRM_DEBUG_KMS("Clearing atomic state %p\n", state);
int i;
DRM_DEBUG_KMS("Clearing atomic state %p\n", state);
- for (i = 0; i < dev->mode_config.num_connector; i++) {
+ for (i = 0; i < config->num_connector; i++) {
struct drm_connector *connector = state->connectors[i];
if (!connector)
continue;
struct drm_connector *connector = state->connectors[i];
if (!connector)
continue;
+ WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
+
connector->funcs->atomic_destroy_state(connector,
state->connector_states[i]);
}
connector->funcs->atomic_destroy_state(connector,
state->connector_states[i]);
}
- for (i = 0; i < dev->mode_config.num_crtc; i++) {
+ for (i = 0; i < config->num_crtc; i++) {
struct drm_crtc *crtc = state->crtcs[i];
if (!crtc)
struct drm_crtc *crtc = state->crtcs[i];
if (!crtc)
state->crtc_states[i]);
}
state->crtc_states[i]);
}
- for (i = 0; i < dev->mode_config.num_total_plane; i++) {
+ for (i = 0; i < config->num_total_plane; i++) {
struct drm_plane *plane = state->planes[i];
if (!plane)
struct drm_plane *plane = state->planes[i];
if (!plane)
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
/*
* Someone might have exchanged the framebuffer while we dropped locks
/*
* Someone might have exchanged the framebuffer while we dropped locks
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
/*
* Someone might have exchanged the framebuffer while we dropped locks
/*
* Someone might have exchanged the framebuffer while we dropped locks
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
/*
* Someone might have exchanged the framebuffer while we dropped locks
/*
* Someone might have exchanged the framebuffer while we dropped locks
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
- drm_atomic_legacy_backoff(state);
drm_atomic_state_clear(state);
drm_atomic_state_clear(state);
+ drm_atomic_legacy_backoff(state);
/*
* Someone might have exchanged the framebuffer while we dropped locks
/*
* Someone might have exchanged the framebuffer while we dropped locks