drm: Per-plane locking
Subsystems (4)
PATCH 1/2 drm: Per-plane locking
Turned out to be much simpler on top of my latest atomic stuff than what I've feared. Some details:
- Drop the modeset_lock_all snakeoil in drm_plane_init. Same justification as for the equivalent change in drm_crtc_init done in
commit d0fa1af40e784aaf7ebb7ba8a17b229bb3fa4c21 Author: Daniel Vetter <[email protected]> Date: Mon Sep 8 09:02:49 2014 +0200 drm: Drop modeset locking from crtc init function
Without these the drm_modeset_lock_init would fall over the exact same way.
- Since the atomic core code wraps the locking switching it to per-plane locks was a one-line change.
- For the legacy ioctls add a plane argument to the locking helper so that we can grab the right plane lock (cursor or primary). Since the universal cursor plane might not be there, or someone really crazy might forgoe the primary plane even accept NULL.
- Add some locking WARN_ON to the atomic helpers for good paranoid measure and to check that it all works out.
Tested on my exynos atomic hackfest with full lockdep checks and ww backoff injection.
v2: I've forgotten about the load-detect code in i915.
v3: Thierry reported that in latest 3.18-rc vmwgfx doesn't compile any more due to
commit 21e88620aa21b48d4f62d29275e3e2944a5ea2b5
Author: Rob Clark <[email protected]> Date: Thu Oct 30 13:39:04 2014 -0400
drm/vmwgfx: fix lock breakage
Rebased and fix this up.
--- drivers/gpu/drm/drm_atomic.c | 2 +- drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ drivers/gpu/drm/drm_crtc.c | 9 ++++---- drivers/gpu/drm/drm_modeset_lock.c | 43 +++++++++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 6 +++++ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++-- include/drm/drm_crtc.h | 2 ++ include/drm/drm_modeset_lock.h | 4 +++- 8 files changed, 55 insertions(+), 19 deletions(-)
drivers/gpu/drm/drm_atomic.c +1 -1
@@ -244,7 +244,7 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,* grab all crtc locks. Once we have per-plane locks we must update this * to only take the plane mutex. */ - ret =drm_modeset_lock_all_crtcs (state->dev, state->acquire_ctx); + ret =drm_modeset_lock (&plane->mutex, state->acquire_ctx);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/drm_atomic_helper.c +4 -0
@@ -995,6 +995,8 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,if (!crtc)continue ; +WARN_ON (!drm_modeset_is_locked (&crtc->mutex)); + funcs = crtc->helper_private;if (!funcs || !funcs->atomic_begin)
@@ -1010,6 +1012,8 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,if (!plane)continue ; +WARN_ON (!drm_modeset_is_locked (&plane->mutex)); + funcs = plane->helper_private;if (!funcs || !funcs->atomic_update)
drivers/gpu/drm/drm_crtc.c +4 -5
@@ -1152,12 +1152,12 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, {int ret; -drm_modeset_lock_all (dev); - ret =drm_mode_object_get (dev, &plane->base,DRM_MODE_OBJECT_PLANE );if (ret) goto out; +drm_modeset_lock_init (&plane->mutex); + plane->base.properties = &plane->properties; plane->dev = dev; plane->funcs = funcs;
@@ -1185,7 +1185,6 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, plane->type); out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2809,7 +2808,7 @@ static int drm_mode_cursor_common(struct drm_device *dev,* If this crtc has a universal cursor plane, call that plane's update * handler rather than using legacy cursor handlers. */ -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->cursor);if (crtc->cursor) { ret =drm_mode_cursor_universal (crtc, req, file_priv); goto out;
@@ -4598,7 +4597,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,if (!crtc)return -ENOENT ; -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->primary);if (crtc->primary->fb ==NULL ) {/* The framebuffer is currently unbound, presumably * due to a hotplug event, that userspace has not
drivers/gpu/drm/drm_modeset_lock.c +33 -10
74 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +6 -0
@@ -8563,6 +8563,9 @@ retry: ret =drm_modeset_lock (&crtc->mutex, ctx);if (ret) goto fail_unlock; + ret =drm_modeset_lock (&crtc->primary->mutex, ctx); +if (ret) + goto fail_unlock; old->dpms_mode = connector->dpms; old->load_detect_temp = false;
@@ -8600,6 +8603,9 @@ retry: ret =drm_modeset_lock (&crtc->mutex, ctx);if (ret) goto fail_unlock; + ret =drm_modeset_lock (&crtc->primary->mutex, ctx); +if (ret) + goto fail_unlock; intel_encoder->new_crtc =to_intel_crtc (crtc);to_intel_connector (connector)->new_encoder = intel_encoder;
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +2 -2
@@ -252,7 +252,7 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, ret =0 ; out:drm_modeset_unlock_all (dev_priv->dev); -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->cursor);return ret; }
@@ -281,7 +281,7 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) du->cursor_y + du->hotspot_y);drm_modeset_unlock_all (dev_priv->dev); -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->cursor);return 0 ; }
include/drm/drm_crtc.h +2 -0
@@ -771,6 +771,8 @@ struct drm_plane {struct drm_device *dev;struct list_head head; +struct drm_modeset_lock mutex; +struct drm_mode_object base;uint32_t possible_crtcs;
include/drm/drm_modeset_lock.h +3 -1
@@ -127,11 +127,13 @@ void drm_modeset_unlock(struct drm_modeset_lock *lock);struct drm_device ;struct drm_crtc ; +struct drm_plane ;void drm_modeset_lock_all (struct drm_device *dev);int __drm_modeset_lock_all (struct drm_device *dev,bool trylock);void drm_modeset_unlock_all (struct drm_device *dev); -void drm_modeset_lock_crtc (struct drm_crtc *crtc); +void drm_modeset_lock_crtc (struct drm_crtc *crtc, +struct drm_plane *plane);void drm_modeset_unlock_crtc (struct drm_crtc *crtc);void drm_warn_on_modeset_not_all_locked (struct drm_device *dev); struct drm_modeset_acquire_ctx *
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm: More specific locking for get* ioctls
Motivated by the per-plane locking I've gone through all the get* ioctls and reduced the locking to the bare minimum required.
v2: Rebase and make it compile ...
--- drivers/gpu/drm/drm_crtc.c | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-)
drivers/gpu/drm/drm_crtc.c +18 -28
@@ -1743,7 +1743,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_fbs = fb_count;mutex_unlock (&file_priv->fbs_lock); -drm_modeset_lock_all (dev); +/* mode_config.mutex protects the connector list against e.g. DP MST +* connector hot-adding. CRTC/Plane lists are invariant. */ +mutex_lock (&dev->mode_config.mutex);if (!drm_is_primary_client (file_priv)) { mode_group =NULL ;
@@ -1863,7 +1865,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_connectors, card_res->count_encoders); out: -drm_modeset_unlock_all (dev); +mutex_unlock (&dev->mode_config.mutex);return ret; }
@@ -1890,14 +1892,11 @@ int drm_mode_getcrtc(struct drm_device *dev,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); - crtc =drm_crtc_find (dev, crtc_resp->crtc_id); -if (!crtc) { - ret = -ENOENT ; - goto out; - } +if (!crtc) +return -ENOENT ; +drm_modeset_lock_crtc (crtc, crtc->primary); crtc_resp->x = crtc->x; crtc_resp->y = crtc->y; crtc_resp->gamma_size = crtc->gamma_size;
@@ -1914,9 +1913,8 @@ int drm_mode_getcrtc(struct drm_device *dev, }else { crtc_resp->mode_valid =0 ; } +drm_modeset_unlock_crtc (crtc); -out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2100,24 +2098,22 @@ int drm_mode_getencoder(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); encoder =drm_encoder_find (dev, enc_resp->encoder_id); -if (!encoder) { - ret = -ENOENT ; - goto out; - } +if (!encoder) +return -ENOENT ; +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );if (encoder->crtc) enc_resp->crtc_id = encoder->crtc->base.id;else enc_resp->crtc_id =0 ; +drm_modeset_unlock (&dev->mode_config.connection_mutex); + enc_resp->encoder_type = encoder->encoder_type; enc_resp->encoder_id = encoder->base.id; enc_resp->possible_crtcs = encoder->possible_crtcs; enc_resp->possible_clones = encoder->possible_clones; -out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2147,7 +2143,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); config = &dev->mode_config;if (file_priv->universal_planes)
@@ -2182,7 +2177,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, plane_resp->count_planes = num_planes; out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2210,13 +2204,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); plane =drm_plane_find (dev, plane_resp->plane_id); -if (!plane) { - ret = -ENOENT ; - goto out; - } +if (!plane) +return -ENOENT ; +drm_modeset_lock (&plane->mutex,NULL );if (plane->crtc) plane_resp->crtc_id = plane->crtc->base.id;else
@@ -2226,6 +2218,7 @@ int drm_mode_getplane(struct drm_device *dev, void *data, plane_resp->fb_id = plane->fb->base.id; else plane_resp->fb_id = 0; +drm_modeset_unlock (&plane->mutex); plane_resp->plane_id = plane->base.id; plane_resp->possible_crtcs = plane->possible_crtcs;
@@ -2241,14 +2234,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (copy_to_user (format_ptr, plane->format_types,sizeof (uint32_t ) * plane->format_count)) { - ret = -EFAULT ; - goto out; +return -EFAULT ; } } plane_resp->count_format_types = plane->format_count; -out: -drm_modeset_unlock_all (dev);return ret; }
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/2] drm: More specific locking for get* ioctls
Quoted 6 lines · Daniel Vetter
Motivated by the per-plane locking I've gone through all the get* ioctls and reduced the locking to the bare minimum required.
v2: Rebase and make it compile ...
Signed-off-by Daniel Vetter <[email protected]>
Just a couple nits.
Quoted 88 lines
--- drivers/gpu/drm/drm_crtc.c | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-)drivers/gpu/drm/drm_crtc.c +13
-17@@ -1743,7 +1743,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_fbs = fb_count;mutex_unlock (&file_priv->fbs_lock); -drm_modeset_lock_all (dev); +/* mode_config.mutex protects the connector list against e.g. DP MST +* connector hot-adding. CRTC/Plane lists are invariant. */ +mutex_lock (&dev->mode_config.mutex);if (!drm_is_primary_client (file_priv)) { mode_group =NULL ;@@ -1863,7 +1865,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_connectors, card_res->count_encoders); out: -drm_modeset_unlock_all (dev); +mutex_unlock (&dev->mode_config.mutex);return ret; }@@ -1890,14 +1892,11 @@ int drm_mode_getcrtc(struct drm_device *dev,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); - crtc =drm_crtc_find (dev, crtc_resp->crtc_id); -if (!crtc) { - ret = -ENOENT ; - goto out; - } +if (!crtc) +return -ENOENT ; +drm_modeset_lock_crtc (crtc, crtc->primary); crtc_resp->x = crtc->x; crtc_resp->y = crtc->y; crtc_resp->gamma_size = crtc->gamma_size;@@ -1914,9 +1913,8 @@ int drm_mode_getcrtc(struct drm_device *dev, }else { crtc_resp->mode_valid =0 ; } +drm_modeset_unlock_crtc (crtc); -out: -drm_modeset_unlock_all (dev);return ret; }@@ -2100,24 +2098,22 @@ int drm_mode_getencoder(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); encoder =drm_encoder_find (dev, enc_resp->encoder_id); -if (!encoder) { - ret = -ENOENT ; - goto out; - } +if (!encoder) +return -ENOENT ; +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );if (encoder->crtc) enc_resp->crtc_id = encoder->crtc->base.id;else enc_resp->crtc_id =0 ; +drm_modeset_unlock (&dev->mode_config.connection_mutex); + enc_resp->encoder_type = encoder->encoder_type; enc_resp->encoder_id = encoder->base.id; enc_resp->possible_crtcs = encoder->possible_crtcs; enc_resp->possible_clones = encoder->possible_clones; -out: -drm_modeset_unlock_all (dev);return ret; }
drivers/gpu/drm/drm_crtc.c int drm_mode_getplane_res(struct drm_device *dev, void *data, · line 2146
Quoted 5 lines
drivers/gpu/drm/drm_crtc.c +0
-1@@ -2147,7 +2143,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); config = &dev->mode_config;
I'd feel better if you added a comment here similar to the one above explaining that the plane_list cannot change and thus accessing it does not require locking config->mutex.
drivers/gpu/drm/drm_crtc.c int drm_mode_getplane_res(struct drm_device *dev, void *data, · line 2179
Quoted 6 lines
drivers/gpu/drm/drm_crtc.c +0
-0if (file_priv->universal_planes)@@ -2182,7 +2177,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, plane_resp->count_planes = num_planes; out:
I think you can just remove this label entirely and return straight from the failure cases.
Quoted 52 lines
drivers/gpu/drm/drm_crtc.c +5
-10-drm_modeset_unlock_all (dev);return ret; }@@ -2210,13 +2204,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); plane =drm_plane_find (dev, plane_resp->plane_id); -if (!plane) { - ret = -ENOENT ; - goto out; - } +if (!plane) +return -ENOENT ; +drm_modeset_lock (&plane->mutex,NULL );if (plane->crtc) plane_resp->crtc_id = plane->crtc->base.id;else @@ -2226,6 +2218,7 @@ int drm_mode_getplane(struct drm_device *dev, void *data, plane_resp->fb_id = plane->fb->base.id; else plane_resp->fb_id = 0; +drm_modeset_unlock (&plane->mutex); plane_resp->plane_id = plane->base.id; plane_resp->possible_crtcs = plane->possible_crtcs;@@ -2241,14 +2234,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (copy_to_user (format_ptr, plane->format_types,sizeof (uint32_t ) * plane->format_count)) { - ret = -EFAULT ; - goto out; +return -EFAULT ; } } plane_resp->count_format_types = plane->format_count; -out: -drm_modeset_unlock_all (dev);return ret; }Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/1 drm: More specific locking for get* ioctls
In reply to Daniel VetterMotivated by the per-plane locking I've gone through all the get* ioctls and reduced the locking to the bare minimum required.
v2: Rebase and make it compile ...
v3: Review from Sean:
- Simplify return handling in getplane_res.
- Add a comment to getplane_res that the plane list is invariant and can be walked locklessly.
--- drivers/gpu/drm/drm_crtc.c | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-)
drivers/gpu/drm/drm_crtc.c +18 -28
@@ -1743,7 +1743,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_fbs = fb_count;mutex_unlock (&file_priv->fbs_lock); -drm_modeset_lock_all (dev); +/* mode_config.mutex protects the connector list against e.g. DP MST +* connector hot-adding. CRTC/Plane lists are invariant. */ +mutex_lock (&dev->mode_config.mutex);if (!drm_is_primary_client (file_priv)) { mode_group =NULL ;
@@ -1863,7 +1865,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_connectors, card_res->count_encoders); out: -drm_modeset_unlock_all (dev); +mutex_unlock (&dev->mode_config.mutex);return ret; }
@@ -1890,14 +1892,11 @@ int drm_mode_getcrtc(struct drm_device *dev,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); - crtc =drm_crtc_find (dev, crtc_resp->crtc_id); -if (!crtc) { - ret = -ENOENT ; - goto out; - } +if (!crtc) +return -ENOENT ; +drm_modeset_lock_crtc (crtc, crtc->primary); crtc_resp->x = crtc->x; crtc_resp->y = crtc->y; crtc_resp->gamma_size = crtc->gamma_size;
@@ -1914,9 +1913,8 @@ int drm_mode_getcrtc(struct drm_device *dev, }else { crtc_resp->mode_valid =0 ; } +drm_modeset_unlock_crtc (crtc); -out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2100,24 +2098,22 @@ int drm_mode_getencoder(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); encoder =drm_encoder_find (dev, enc_resp->encoder_id); -if (!encoder) { - ret = -ENOENT ; - goto out; - } +if (!encoder) +return -ENOENT ; +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );if (encoder->crtc) enc_resp->crtc_id = encoder->crtc->base.id;else enc_resp->crtc_id =0 ; +drm_modeset_unlock (&dev->mode_config.connection_mutex); + enc_resp->encoder_type = encoder->encoder_type; enc_resp->encoder_id = encoder->base.id; enc_resp->possible_crtcs = encoder->possible_crtcs; enc_resp->possible_clones = encoder->possible_clones; -out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2147,7 +2143,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); config = &dev->mode_config;if (file_priv->universal_planes)
@@ -2182,7 +2177,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, plane_resp->count_planes = num_planes; out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2210,13 +2204,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); plane =drm_plane_find (dev, plane_resp->plane_id); -if (!plane) { - ret = -ENOENT ; - goto out; - } +if (!plane) +return -ENOENT ; +drm_modeset_lock (&plane->mutex,NULL );if (plane->crtc) plane_resp->crtc_id = plane->crtc->base.id;else
@@ -2226,6 +2218,7 @@ int drm_mode_getplane(struct drm_device *dev, void *data, plane_resp->fb_id = plane->fb->base.id; else plane_resp->fb_id = 0; +drm_modeset_unlock (&plane->mutex); plane_resp->plane_id = plane->base.id; plane_resp->possible_crtcs = plane->possible_crtcs;
@@ -2241,14 +2234,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (copy_to_user (format_ptr, plane->format_types,sizeof (uint32_t ) * plane->format_count)) { - ret = -EFAULT ; - goto out; +return -EFAULT ; } } plane_resp->count_format_types = plane->format_count; -out: -drm_modeset_unlock_all (dev);return ret; }
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm: More specific locking for get* ioctls
Motivated by the per-plane locking I've gone through all the get* ioctls and reduced the locking to the bare minimum required.
v2: Rebase and make it compile ...
v3: Review from Sean:
- Simplify return handling in getplane_res.
- Add a comment to getplane_res that the plane list is invariant and can be walked locklessly.
v4: Actually git add.
--- drivers/gpu/drm/drm_crtc.c | 58 ++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 35 deletions(-)
drivers/gpu/drm/drm_crtc.c +23 -35
@@ -1743,7 +1743,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_fbs = fb_count;mutex_unlock (&file_priv->fbs_lock); -drm_modeset_lock_all (dev); +/* mode_config.mutex protects the connector list against e.g. DP MST +* connector hot-adding. CRTC/Plane lists are invariant. */ +mutex_lock (&dev->mode_config.mutex);if (!drm_is_primary_client (file_priv)) { mode_group =NULL ;
@@ -1863,7 +1865,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_connectors, card_res->count_encoders); out: -drm_modeset_unlock_all (dev); +mutex_unlock (&dev->mode_config.mutex);return ret; }
@@ -1890,14 +1892,11 @@ int drm_mode_getcrtc(struct drm_device *dev,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); - crtc =drm_crtc_find (dev, crtc_resp->crtc_id); -if (!crtc) { - ret = -ENOENT ; - goto out; - } +if (!crtc) +return -ENOENT ; +drm_modeset_lock_crtc (crtc, crtc->primary); crtc_resp->x = crtc->x; crtc_resp->y = crtc->y; crtc_resp->gamma_size = crtc->gamma_size;
@@ -1914,9 +1913,8 @@ int drm_mode_getcrtc(struct drm_device *dev, }else { crtc_resp->mode_valid =0 ; } +drm_modeset_unlock_crtc (crtc); -out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2100,24 +2098,22 @@ int drm_mode_getencoder(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); encoder =drm_encoder_find (dev, enc_resp->encoder_id); -if (!encoder) { - ret = -ENOENT ; - goto out; - } +if (!encoder) +return -ENOENT ; +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );if (encoder->crtc) enc_resp->crtc_id = encoder->crtc->base.id;else enc_resp->crtc_id =0 ; +drm_modeset_unlock (&dev->mode_config.connection_mutex); + enc_resp->encoder_type = encoder->encoder_type; enc_resp->encoder_id = encoder->base.id; enc_resp->possible_crtcs = encoder->possible_crtcs; enc_resp->possible_clones = encoder->possible_clones; -out: -drm_modeset_unlock_all (dev);return ret; }
@@ -2141,13 +2137,12 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data,struct drm_mode_config *config;struct drm_plane *plane;uint32_t __user *plane_ptr; -int copied =0 , ret =0 ; +int copied =0 ;unsigned num_planes;if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); config = &dev->mode_config;if (file_priv->universal_planes)
@@ -2163,6 +2158,7 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, (plane_resp->count_planes >= num_planes)) { plane_ptr = (uint32_t __user *)(unsigned long )plane_resp->plane_id_ptr; +/* Plane lists are invariant, no locking needed. */ list_for_each_entry (plane, &config->plane_list, head) {/* * Unless userspace set the 'universal planes'
@@ -2172,18 +2168,14 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, !file_priv->universal_planes)continue ; -if (put_user (plane->base.id, plane_ptr + copied)) { - ret = -EFAULT ; - goto out; - } +if (put_user (plane->base.id, plane_ptr + copied)) +return -EFAULT ; copied++; } } plane_resp->count_planes = num_planes; -out: -drm_modeset_unlock_all (dev); -return ret; +return 0 ; }/**
@@ -2210,13 +2202,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; -drm_modeset_lock_all (dev); plane =drm_plane_find (dev, plane_resp->plane_id); -if (!plane) { - ret = -ENOENT ; - goto out; - } +if (!plane) +return -ENOENT ; +drm_modeset_lock (&plane->mutex,NULL );if (plane->crtc) plane_resp->crtc_id = plane->crtc->base.id;else
@@ -2226,6 +2216,7 @@ int drm_mode_getplane(struct drm_device *dev, void *data, plane_resp->fb_id = plane->fb->base.id; else plane_resp->fb_id = 0; +drm_modeset_unlock (&plane->mutex); plane_resp->plane_id = plane->base.id; plane_resp->possible_crtcs = plane->possible_crtcs;
@@ -2241,14 +2232,11 @@ int drm_mode_getplane(struct drm_device *dev, void *data,if (copy_to_user (format_ptr, plane->format_types,sizeof (uint32_t ) * plane->format_count)) { - ret = -EFAULT ; - goto out; +return -EFAULT ; } } plane_resp->count_format_types = plane->format_count; -out: -drm_modeset_unlock_all (dev);return ret; }
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm: More specific locking for get* ioctls
In reply to Daniel Vetter-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=247/348->275/348
PNV: pass/total=326/328->326/328
ILK: pass/total=329/330->330/330
IVB: pass/total=544/546->544/546
SNB: pass/total=557/562->558/562
HSW: pass/total=573/578->573/578
BDW: pass/total=435/435->434/435
-------------------------------------Detailed-------------------------------------test_platform: test_suite, test_case, result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count, machine_id)...
BYT: Intel_gpu_tools, igt_drv_hangman_error-state-basic, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> DMESG_WARN(1, M38)PASS(3, M38)
BYT: Intel_gpu_tools, igt_drv_hangman_error-state-capture-blt, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_drv_hangman_error-state-capture-bsd, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_drv_hangman_error-state-capture-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_drv_hangman_error-state-debugfs-entry, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_drv_hangman_error-state-sysfs-entry, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_bad_reloc_negative-reloc-lut, PASS(10, M31M29M38) -> NSPT(1, M38)PASS(3, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_ban-ctx-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_ban-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-blt, BLACKLIST(1, M31)DMESG_WARN(7, M31M36M29)PASS(11, M31M36M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-bsd, BLACKLIST(1, M31)DMESG_WARN(6, M36M29)PASS(12, M31M29M38M36) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-ctx-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-blt, BLACKLIST(1, M31)DMESG_WARN(7, M31M36M29)PASS(11, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-bsd, BLACKLIST(1, M31)DMESG_WARN(7, M31M36M29)PASS(11, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-reverse-blt, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-reverse-bsd, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-reverse-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_close-pending-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_params, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_params-ctx-render, BLACKLIST(1, M31)PASS(18, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-count-blt, BLACKLIST(1, M31)DMESG_WARN(10, M31M36M29)PASS(8, M29M38M36) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-count-bsd, BLACKLIST(1, M31)DMESG_WARN(10, M31M36M29)PASS(8, M36M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-count-ctx-render, BLACKLIST(1, M31)PASS(16, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-count-render, BLACKLIST(1, M31)PASS(15, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-stats-blt, BLACKLIST(1, M31)DMESG_WARN(6, M36M29)PASS(9, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-stats-bsd, BLACKLIST(1, M31)DMESG_WARN(7, M36M29)PASS(8, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-stats-ctx-render, BLACKLIST(1, M31)PASS(15, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_reset-stats-render, BLACKLIST(1, M31)PASS(15, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_gem_reset_stats_unrelated-ctx-render, BLACKLIST(1, M31)PASS(15, M31M36M29M38) -> PASS(4, M38)
BYT: Intel_gpu_tools, igt_drv_hangman_ring-stop-sysfs-entry, BLACKLIST(1, M31)PASS(15, M31M36M29M38) -> PASS(4, M38)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-interruptible, DMESG_WARN(2, M26)PASS(17, M37M26M6) -> PASS(4, M37)
SNB: Intel_gpu_tools, igt_kms_cursor_crc_cursor-256x256-sliding, DMESG_WARN(1, M35)PASS(12, M35M22) -> PASS(4, M22)
BDW: Intel_gpu_tools, igt_gem_reset_stats_ban-bsd, PASS(16, M42M30M28) -> DMESG_WARN(1, M42)PASS(3, M42)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 38 lines · Daniel Vetter
Turned out to be much simpler on top of my latest atomic stuff than what I've feared. Some details:
- Drop the
modeset_lock_allsnakeoil indrm_plane_init. Same justification as for the equivalent change indrm_crtc_initdone incommit d0fa1af40e784aaf7ebb7ba8a17b229bb3fa4c21 Author: Daniel Vetter <[email protected]> Date: Mon Sep 8 09:02:49 2014 +0200 drm: Drop modeset locking from crtc init functionWithout these the
drm_modeset_lock_initwould fall over the exact same way.- Since the atomic core code wraps the locking switching it to per-plane locks was a one-line change.
- For the legacy ioctls add a plane argument to the locking helper so that we can grab the right plane lock (cursor or primary). Since the universal cursor plane might not be there, or someone really crazy might forgoe the primary plane even accept NULL.
- Add some locking
WARN_ONto the atomic helpers for good paranoid measure and to check that it all works out.Tested on my exynos atomic hackfest with full lockdep checks and ww backoff injection.
v2: I've forgotten about the load-detect code in i915.
v3: Thierry reported that in latest 3.18-rc vmwgfx doesn't compile any more due to
commit
21e88620aa21b48d4f62d29275e3e2944a5ea2b5Author: Rob Clark <[email protected]> Date: Thu Oct 30 13:39:04 2014 -0400
Quoted 6 lines
drm/vmwgfx: fix lock breakage
Rebased and fix this up.
Cc Thierry Reding <[email protected]>Signed-off-by Daniel Vetter <[email protected]>
One minor nit about avoiding the recursive lock handling in drm_modeset_lock. I am fine with the patch either way.
Quoted 123 lines
--- drivers/gpu/drm/drm_atomic.c | 2 +- drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ drivers/gpu/drm/drm_crtc.c | 9 ++++---- drivers/gpu/drm/drm_modeset_lock.c | 43 +++++++++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 6 +++++ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++-- include/drm/drm_crtc.h | 2 ++ include/drm/drm_modeset_lock.h | 4 +++- 8 files changed, 55 insertions(+), 19 deletions(-)drivers/gpu/drm/drm_atomic.c +1
-1@@ -244,7 +244,7 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,* grab all crtc locks. Once we have per-plane locks we must update this * to only take the plane mutex. */ - ret =drm_modeset_lock_all_crtcs (state->dev, state->acquire_ctx); + ret =drm_modeset_lock (&plane->mutex, state->acquire_ctx);if (ret)return ERR_PTR (ret);drivers/gpu/drm/drm_atomic_helper.c +4
-0@@ -995,6 +995,8 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,if (!crtc)continue ; +WARN_ON (!drm_modeset_is_locked (&crtc->mutex)); + funcs = crtc->helper_private;if (!funcs || !funcs->atomic_begin)@@ -1010,6 +1012,8 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,if (!plane)continue ; +WARN_ON (!drm_modeset_is_locked (&plane->mutex)); + funcs = plane->helper_private;if (!funcs || !funcs->atomic_update)drivers/gpu/drm/drm_crtc.c +4
-5@@ -1152,12 +1152,12 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, {int ret; -drm_modeset_lock_all (dev); - ret =drm_mode_object_get (dev, &plane->base,DRM_MODE_OBJECT_PLANE );if (ret) goto out; +drm_modeset_lock_init (&plane->mutex); + plane->base.properties = &plane->properties; plane->dev = dev; plane->funcs = funcs;@@ -1185,7 +1185,6 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, plane->type); out: -drm_modeset_unlock_all (dev);return ret; }@@ -2809,7 +2808,7 @@ static int drm_mode_cursor_common(struct drm_device *dev,* If this crtc has a universal cursor plane, call that plane's update * handler rather than using legacy cursor handlers. */ -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->cursor);if (crtc->cursor) { ret =drm_mode_cursor_universal (crtc, req, file_priv); goto out;@@ -4598,7 +4597,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,if (!crtc)return -ENOENT ; -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->primary);if (crtc->primary->fb ==NULL ) {/* The framebuffer is currently unbound, presumably * due to a hotplug event, that userspace has not drivers/gpu/drm/drm_modeset_lock.c +12
-6@@ -157,14 +157,20 @@ void drm_modeset_unlock_all(struct drm_device *dev)EXPORT_SYMBOL (drm_modeset_unlock_all);/** -* drm_modeset_lock_crtc - lock crtc with hidden acquire ctx -* @crtc: drm crtc +* drm_modeset_lock_crtc - lock crtc with hidden acquire ctx for a plane update +* @crtc: DRM CRTC +* @plane: DRM plane to be updated on @crtc +* +* This function locks the given crtc and plane (which should be either the +* primary or cursor plane) using a hidden acquire context. This is necessary so +* that drivers internally using the atomic interfaces can grab further locks +* with the lock acquire context. * -* This function locks the given crtc using a hidden acquire context. This is -* necessary so that drivers internally using the atomic interfaces can grab -* further locks with the lock acquire context. +* Note that @plane can be NULL, e.g. when the cursor support hasn't yet been +* converted to universal planes yet. */ -void drm_modeset_lock_crtc (struct drm_crtc *crtc) +void drm_modeset_lock_crtc (struct drm_crtc *crtc, +struct drm_plane *plane) {struct drm_modeset_acquire_ctx *ctx;int ret;
drivers/gpu/drm/drm_modeset_lock.c retry: · line 194
Quoted 9 lines
drivers/gpu/drm/drm_modeset_lock.c +6
-0@@ -180,6 +186,18 @@ retry:if (ret) goto fail; +if (plane) { + ret =drm_modeset_lock (&plane->mutex, ctx); +if (ret) + goto fail; + +if (plane->crtc) {
nit: if you check plane->crtc != crtc here, you can save from going through the ww error handling code as well as avoiding the modeset_lock -EALREADY safety net
Quoted 126 lines
drivers/gpu/drm/drm_modeset_lock.c +15
-4+ ret =drm_modeset_lock (&plane->crtc->mutex, ctx); +if (ret) + goto fail; + } + } +WARN_ON (crtc->acquire_ctx);/* now we hold the locks, so now that it is safe, stash the @@ -437,15 +455,14 @@ void drm_modeset_unlock(struct drm_modeset_lock *lock) }EXPORT_SYMBOL (drm_modeset_unlock); -/* Temporary.. until we have sufficiently fine grained locking, there -* are a couple scenarios where it is convenient to grab all crtc locks. -* It is planned to remove this: -*/ +/* In some legacy codepaths it's convenient to just grab all the crtc and plane +* related locks. */ int drm_modeset_lock_all_crtcs (struct drm_device *dev,struct drm_modeset_acquire_ctx *ctx) {struct drm_mode_config *config = &dev->mode_config;struct drm_crtc *crtc; +struct drm_plane *plane;int ret =0 ;list_for_each_entry (crtc, &config->crtc_list, head) {@@ -454,6 +471,12 @@ int drm_modeset_lock_all_crtcs(struct drm_device *dev,return ret; } +list_for_each_entry (plane, &config->plane_list, head) { + ret =drm_modeset_lock (&plane->mutex, ctx); +if (ret) +return ret; + } +return 0 ; }EXPORT_SYMBOL (drm_modeset_lock_all_crtcs);drivers/gpu/drm/i915/intel_display.c +6
-0@@ -8563,6 +8563,9 @@ retry: ret =drm_modeset_lock (&crtc->mutex, ctx);if (ret) goto fail_unlock; + ret =drm_modeset_lock (&crtc->primary->mutex, ctx); +if (ret) + goto fail_unlock; old->dpms_mode = connector->dpms; old->load_detect_temp = false;@@ -8600,6 +8603,9 @@ retry: ret =drm_modeset_lock (&crtc->mutex, ctx);if (ret) goto fail_unlock; + ret =drm_modeset_lock (&crtc->primary->mutex, ctx); +if (ret) + goto fail_unlock; intel_encoder->new_crtc =to_intel_crtc (crtc);to_intel_connector (connector)->new_encoder = intel_encoder;drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +2
-2@@ -252,7 +252,7 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, ret =0 ; out:drm_modeset_unlock_all (dev_priv->dev); -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->cursor);return ret; }@@ -281,7 +281,7 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) du->cursor_y + du->hotspot_y);drm_modeset_unlock_all (dev_priv->dev); -drm_modeset_lock_crtc (crtc); +drm_modeset_lock_crtc (crtc, crtc->cursor);return 0 ; }include/drm/drm_crtc.h +2
-0@@ -771,6 +771,8 @@ struct drm_plane {struct drm_device *dev;struct list_head head; +struct drm_modeset_lock mutex; +struct drm_mode_object base;uint32_t possible_crtcs;include/drm/drm_modeset_lock.h +3
-1@@ -127,11 +127,13 @@ void drm_modeset_unlock(struct drm_modeset_lock *lock);struct drm_device ;struct drm_crtc ; +struct drm_plane ;void drm_modeset_lock_all (struct drm_device *dev);int __drm_modeset_lock_all (struct drm_device *dev,bool trylock);void drm_modeset_unlock_all (struct drm_device *dev); -void drm_modeset_lock_crtc (struct drm_crtc *crtc); +void drm_modeset_lock_crtc (struct drm_crtc *crtc, +struct drm_plane *plane);void drm_modeset_unlock_crtc (struct drm_crtc *crtc);void drm_warn_on_modeset_not_all_locked (struct drm_device *dev); struct drm_modeset_acquire_ctx *Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx