Skip to contentSkip to conversation

drm: Replace drm_modeset_lock/unlock_all with DRM_MODESET_LOCK_ALL_* helpers

PATCH In review Michal Orzel 2 participants 3 messages Apr 26, 2020 – Apr 28, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: Replace drm_modeset_lock/unlock_all with DRM_MODESET_LOCK_ALL_* helpers

As suggested by the TODO list for the kernel DRM subsystem, replace the deprecated functions that take/drop modeset locks with new helpers.

---
 drivers/gpu/drm/drm_mode_object.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_mode_object.c +6 -4
index 35c2719..901b078 100644
@@ -402,12 +402,13 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
 {
 	struct drm_mode_obj_get_properties *arg = data;
 	struct drm_mode_object *obj;
+	struct drm_modeset_acquire_ctx ctx;
 	int ret = 0;
 
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 		return -EOPNOTSUPP;
 
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
 	obj = drm_mode_object_find(dev, file_priv, arg->obj_id, arg->obj_type);
 	if (!obj) {
@@ -427,7 +428,7 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
 out_unref:
 	drm_mode_object_put(obj);
 out:
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(ctx, ret);
 	return ret;
 }
 
@@ -449,12 +450,13 @@ static int set_property_legacy(struct drm_mode_object *obj,
 {
 	struct drm_device *dev = prop->dev;
 	struct drm_mode_object *ref;
+	struct drm_modeset_acquire_ctx ctx;
 	int ret = -EINVAL;
 
 	if (!drm_property_change_valid_get(prop, prop_value, &ref))
 		return -EINVAL;
 
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 	switch (obj->type) {
 	case DRM_MODE_OBJECT_CONNECTOR:
 		ret = drm_connector_set_obj_prop(obj, prop, prop_value);
@@ -468,7 +470,7 @@ static int set_property_legacy(struct drm_mode_object *obj,
 		break;
 	}
 	drm_property_change_valid_put(prop, ref);
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(ctx, ret);
 
 	return ret;
 }
Signature · 1 line
2.7.4
#1 lore raw
Quoted 4 lines · Michal Orzel

As suggested by the TODO list for the kernel DRM subsystem, replace the deprecated functions that take/drop modeset locks with new helpers.

Hm can you pls resubmit with intel-gfx mailing list cc'ed? There's a CI bot there for checking stuff. Patch looks good, thanks a lot for doing this.

Thanks, Daniel

Quoted 59 lines
---
 drivers/gpu/drm/drm_mode_object.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_mode_object.c +6 -4
index 35c2719..901b078 100644
@@ -402,12 +402,13 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
 {
 	struct drm_mode_obj_get_properties *arg = data;
 	struct drm_mode_object *obj;
+	struct drm_modeset_acquire_ctx ctx;
 	int ret = 0;
 
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 		return -EOPNOTSUPP;
 
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
 	obj = drm_mode_object_find(dev, file_priv, arg->obj_id, arg->obj_type);
 	if (!obj) {
@@ -427,7 +428,7 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
 out_unref:
 	drm_mode_object_put(obj);
 out:
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(ctx, ret);
 	return ret;
 }
 
@@ -449,12 +450,13 @@ static int set_property_legacy(struct drm_mode_object *obj,
 {
 	struct drm_device *dev = prop->dev;
 	struct drm_mode_object *ref;
+	struct drm_modeset_acquire_ctx ctx;
 	int ret = -EINVAL;
 
 	if (!drm_property_change_valid_get(prop, prop_value, &ref))
 		return -EINVAL;
 
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 	switch (obj->type) {
 	case DRM_MODE_OBJECT_CONNECTOR:
 		ret = drm_connector_set_obj_prop(obj, prop, prop_value);
@@ -468,7 +470,7 @@ static int set_property_legacy(struct drm_mode_object *obj,
 		break;
 	}
 	drm_property_change_valid_put(prop, ref);
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(ctx, ret);
 
 	return ret;
 }
Signature · 1 line
2.7.4
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Patch resubmitted with intel-gfx mailing list added.

Thanks, Michal

wt., 28 kwi 2020 o 17:15 Daniel Vetter <[email protected]> napisał(a):

Quoted 77 lines · Michal Orzel
Quoted 4 lines

As suggested by the TODO list for the kernel DRM subsystem, replace the deprecated functions that take/drop modeset locks with new helpers.

Hm can you pls resubmit with intel-gfx mailing list cc'ed? There's a CI bot there for checking stuff. Patch looks good, thanks a lot for doing this.

Thanks, Daniel

Review

Quoted 5 lines
---
 drivers/gpu/drm/drm_mode_object.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/drm_mode_object.c

drivers/gpu/drm/drm_mode_object.c int drm_mode_obj_get_properties_ioctl(struct

Quoted 4 lines

index 35c2719..901b078 100644

drivers/gpu/drm/drm_mode_object.c +0 -0
@@ -402,12 +402,13 @@ int drm_mode_obj_get_properties_ioctl(struct

drm_device *dev, void *data,

drivers/gpu/drm/drm_mode_object.c int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,

Quoted 13 lines
drivers/gpu/drm/drm_mode_object.c +2 -1
 {
      struct drm_mode_obj_get_properties *arg = data;
      struct drm_mode_object *obj;
+     struct drm_modeset_acquire_ctx ctx;
      int ret = 0;
 
      if (!drm_core_check_feature(dev, DRIVER_MODESET))
              return -EOPNOTSUPP;
 
-     drm_modeset_lock_all(dev);
+     DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
      obj = drm_mode_object_find(dev, file_priv, arg->obj_id,

arg->obj_type);

drivers/gpu/drm/drm_mode_object.c int drm_mode_obj_get_properties_ioctl(struct

Quoted 2 lines
drivers/gpu/drm/drm_mode_object.c +0 -0
      if (!obj) {
@@ -427,7 +428,7 @@ int drm_mode_obj_get_properties_ioctl(struct

drm_device *dev, void *data,

drivers/gpu/drm/drm_mode_object.c static int set_property_legacy(struct

Quoted 9 lines
drivers/gpu/drm/drm_mode_object.c +1 -1
 out_unref:
      drm_mode_object_put(obj);
 out:
-     drm_modeset_unlock_all(dev);
+     DRM_MODESET_LOCK_ALL_END(ctx, ret);
      return ret;
 }
 
@@ -449,12 +450,13 @@ static int set_property_legacy(struct

drm_mode_object *obj,

drivers/gpu/drm/drm_mode_object.c static int set_property_legacy(struct

Quoted 15 lines
drivers/gpu/drm/drm_mode_object.c +2 -1
 {
      struct drm_device *dev = prop->dev;
      struct drm_mode_object *ref;
+     struct drm_modeset_acquire_ctx ctx;
      int ret = -EINVAL;
 
      if (!drm_property_change_valid_get(prop, prop_value, &ref))
              return -EINVAL;
 
-     drm_modeset_lock_all(dev);
+     DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
      switch (obj->type) {
      case DRM_MODE_OBJECT_CONNECTOR:
              ret = drm_connector_set_obj_prop(obj, prop, prop_value);
@@ -468,7 +470,7 @@ static int set_property_legacy(struct

drm_mode_object *obj,

Quoted 11 lines
drivers/gpu/drm/drm_mode_object.c +1 -2
              break;
      }
      drm_property_change_valid_put(prop, ref);
-     drm_modeset_unlock_all(dev);
+     DRM_MODESET_LOCK_ALL_END(ctx, ret);
 
      return ret;
 }
--

2.7.4

Quoted 5 lines

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel