Skip to content

Commit

Permalink
drm: Fix locking cargo-cult in encoder/plane init/cleanup
Browse files Browse the repository at this point in the history
Encoders&planes can't be hotplugged, we dont need locking for this
since it's all single-threaded driver setup/teardown code. CRTCs
already don't grab locks.

While at it I noticed that plane's are missing the
drm_modeset_lock_fini() call, so add it.

Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161129094538.9650-1-daniel.vetter@ffwll.ch
  • Loading branch information
danvet committed Nov 29, 2016
1 parent b07c425 commit 661a375
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
9 changes: 1 addition & 8 deletions drivers/gpu/drm/drm_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,9 @@ int drm_encoder_init(struct drm_device *dev,
{
int ret;

drm_modeset_lock_all(dev);

ret = drm_mode_object_get(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER);
if (ret)
goto out_unlock;
return ret;

encoder->dev = dev;
encoder->encoder_type = encoder_type;
Expand Down Expand Up @@ -142,9 +140,6 @@ int drm_encoder_init(struct drm_device *dev,
if (ret)
drm_mode_object_unregister(dev, &encoder->base);

out_unlock:
drm_modeset_unlock_all(dev);

return ret;
}
EXPORT_SYMBOL(drm_encoder_init);
Expand All @@ -164,12 +159,10 @@ void drm_encoder_cleanup(struct drm_encoder *encoder)
* the indices on the drm_encoder after us in the encoder_list.
*/

drm_modeset_lock_all(dev);
drm_mode_object_unregister(dev, &encoder->base);
kfree(encoder->name);
list_del(&encoder->head);
dev->mode_config.num_encoder--;
drm_modeset_unlock_all(dev);

memset(encoder, 0, sizeof(*encoder));
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,8 @@ void drm_plane_cleanup(struct drm_plane *plane)
{
struct drm_device *dev = plane->dev;

drm_modeset_lock_all(dev);
drm_modeset_lock_fini(&plane->mutex);

kfree(plane->format_types);
drm_mode_object_unregister(dev, &plane->base);

Expand All @@ -236,7 +237,6 @@ void drm_plane_cleanup(struct drm_plane *plane)
dev->mode_config.num_total_plane--;
if (plane->type == DRM_PLANE_TYPE_OVERLAY)
dev->mode_config.num_overlay_plane--;
drm_modeset_unlock_all(dev);

WARN_ON(plane->state && !plane->funcs->atomic_destroy_state);
if (plane->state && plane->funcs->atomic_destroy_state)
Expand Down

0 comments on commit 661a375

Please sign in to comment.