mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

drm/atomic: Ensure that drm_connector_index is stable

Browse source 
I've totally forgotten that with DP MST connectors can now be
hotplugged. And failed to adapt Rob's drm_atomic_state code (which
predates connector hotplugging) to the new realities.

The first step is to make sure that the connector indices used to
access the arrays of pointers are stable. The connection mutex gives
us enough guarantees for that, which means we won't unecessarily block
on concurrent modesets or background probing.

So add a locking WARN_ON and shuffle the code slightly to make sure we
always hold the right lock.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter 2014-11-19 18:38:06 +01:00 committed by Dave Airlie
parent 7f907bf284
commit c7eb76f493
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/drm_atomic.c
View file

@ -295,15 +295,15 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,
struct drm_mode_config *config = &connector->dev->mode_config; struct drm_mode_config *config = &connector->dev->mode_config;
struct drm_connector_state *connector_state; struct drm_connector_state *connector_state;
ret = drm_modeset_lock(&config->connection_mutex, state->acquire_ctx);
if (ret)
return ERR_PTR(ret);
index = drm_connector_index(connector); index = drm_connector_index(connector);
if (state->connector_states[index]) if (state->connector_states[index])
return state->connector_states[index]; return state->connector_states[index];
ret = drm_modeset_lock(&config->connection_mutex, state->acquire_ctx);
if (ret)
return ERR_PTR(ret);
connector_state = connector->funcs->atomic_duplicate_state(connector); connector_state = connector->funcs->atomic_duplicate_state(connector);
if (!connector_state) if (!connector_state)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);

5
drivers/gpu/drm/drm_crtc.c
View file

@ -867,6 +867,8 @@ int drm_connector_init(struct drm_device *dev,
drm_connector_get_cmdline_mode(connector); drm_connector_get_cmdline_mode(connector);
/* We should add connectors at the end to avoid upsetting the connector
* index too much. */
list_add_tail(&connector->head, &dev->mode_config.connector_list); list_add_tail(&connector->head, &dev->mode_config.connector_list);
dev->mode_config.num_connector++; dev->mode_config.num_connector++;
@ -930,6 +932,9 @@ unsigned int drm_connector_index(struct drm_connector *connector)
{ {
unsigned int index = 0; unsigned int index = 0;
struct drm_connector *tmp; struct drm_connector *tmp;
struct drm_mode_config *config = &connector->dev->mode_config;
WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
list_for_each_entry(tmp, &connector->dev->mode_config.connector_list, head) { list_for_each_entry(tmp, &connector->dev->mode_config.connector_list, head) {
if (tmp == connector) if (tmp == connector)