From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Refactor the code to check whether an object has a specific property
to a new function.
v1: original
v2: rebase on atomic -- Rob Clark
v3: EINVAL->ENOENT
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Signed-off-by: Rob Clark <robdclark@xxxxxxxxx>
---
drivers/gpu/drm/drm_crtc.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 82d4fb4..8c41db6 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -4168,6 +4168,19 @@ static int drm_mode_set_obj_prop(struct drm_device *dev,
return -EINVAL;
}
+static bool object_has_prop(const struct drm_mode_object *obj, u32 prop_id)
+{
+ int i;
+
+ if (!obj->properties)
+ return false;
+
+ for (i = 0; i < obj->properties->count; i++)
+ if (obj->properties->ids[i] == prop_id)
+ return true;
+ return false;
+}
+
/* call with mode_config mutex held */
static int drm_mode_set_obj_prop_id(struct drm_device *dev,
struct drm_atomic_state *state,
@@ -4176,20 +4189,10 @@ static int drm_mode_set_obj_prop_id(struct drm_device *dev,
{
struct drm_mode_object *arg_obj;
struct drm_property *property;
- int i;
arg_obj = drm_mode_object_find(dev, obj_id, obj_type);
- if (!arg_obj)
+ if (!(arg_obj && object_has_prop(arg_obj, prop_id)))
return -ENOENT;
- if (!arg_obj->properties)
- return -EINVAL;
-
- for (i = 0; i < arg_obj->properties->count; i++)
- if (arg_obj->properties->ids[i] == prop_id)
- break;
-
- if (i == arg_obj->properties->count)
- return -EINVAL;
property = drm_property_find(dev, prop_id);
if (!property)
--
1.9.3
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
