From 95822d38ab712bc9da8c5492d8eb9f4c238cb377 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Tue, 15 May 2012 18:09:04 -0300 Subject: [PATCH] UPSTREAM: drm: add 'count' to struct drm_object_properties MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This way, we don't need to count every time, so we're a little bit faster and code is a little bit smaller. Change suggested by Ville Syrjälä. Reviewed-by: Rob Clark Tested-by: Rob Clark Signed-off-by: Paulo Zanoni Signed-off-by: Dave Airlie (cherry picked from commit 7f88a9bedfb814a2d4d537db8295c524298256cb) BUG=chrome-os-partner:17074 TEST=Use hardware cursor with kernel v3.8 and v3.4 and no flicker on screen. Change-Id: Ic184b52fb6d587a69943744e38f8f73bad2cb6e1 Signed-off-by: Prathyush K Reviewed-on: https://gerrit.chromium.org/gerrit/40514 Tested-by: Prathyush Kalashwaram Reviewed-by: Stéphane Marchesin Commit-Queue: Stéphane Marchesin --- drivers/gpu/drm/drm_crtc.c | 64 ++++++++++++++++---------------------- include/drm/drm_crtc.h | 1 + 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 63958d5908c8..0f87797425ab 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1474,11 +1474,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, } connector = obj_to_connector(obj); - for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) { - if (connector->properties.ids[i] != 0) { - props_count++; - } - } + props_count = connector->properties.count; for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { if (connector->encoder_ids[i] != 0) { @@ -1531,21 +1527,19 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, copied = 0; prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr); prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr); - for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) { - if (connector->properties.ids[i] != 0) { - if (put_user(connector->properties.ids[i], - prop_ptr + copied)) { - ret = -EFAULT; - goto out; - } + for (i = 0; i < connector->properties.count; i++) { + if (put_user(connector->properties.ids[i], + prop_ptr + copied)) { + ret = -EFAULT; + goto out; + } - if (put_user(connector->properties.values[i], - prop_values + copied)) { - ret = -EFAULT; - goto out; - } - copied++; + if (put_user(connector->properties.values[i], + prop_values + copied)) { + ret = -EFAULT; + goto out; } + copied++; } } out_resp->count_props = props_count; @@ -2856,19 +2850,19 @@ void drm_object_attach_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t init_val) { - int i; + int count = obj->properties->count; - for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) { - if (obj->properties->ids[i] == 0) { - obj->properties->ids[i] = property->base.id; - obj->properties->values[i] = init_val; - return; - } + if (count == DRM_OBJECT_MAX_PROPERTY) { + WARN(1, "Failed to attach object property (type: 0x%x). Please " + "increase DRM_OBJECT_MAX_PROPERTY by 1 for each time " + "you see this message on the same object type.\n", + obj->type); + return; } - WARN(1, "Failed to attach object property (type: 0x%x). Please " - "increase DRM_OBJECT_MAX_PROPERTY by 1 for each time you see " - "this message on the same object type.\n", obj->type); + obj->properties->ids[count] = property->base.id; + obj->properties->values[count] = init_val; + obj->properties->count++; } EXPORT_SYMBOL(drm_object_attach_property); @@ -2877,7 +2871,7 @@ int drm_object_property_set_value(struct drm_mode_object *obj, { int i; - for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) { + for (i = 0; i < obj->properties->count; i++) { if (obj->properties->ids[i] == property->base.id) { obj->properties->values[i] = val; return 0; @@ -2893,7 +2887,7 @@ int drm_object_property_get_value(struct drm_mode_object *obj, { int i; - for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) { + for (i = 0; i < obj->properties->count; i++) { if (obj->properties->ids[i] == property->base.id) { *val = obj->properties->values[i]; return 0; @@ -3185,11 +3179,7 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data, goto out; } - /* Assume [ prop, 0, prop ] won't happen (if we ever delete properties, - * we need to remove the gap inside the array). */ - for (props_count = 0; props_count < DRM_OBJECT_MAX_PROPERTY && - obj->properties->ids[props_count] != 0; props_count++) - ; + props_count = obj->properties->count; /* This ioctl is called twice, once to determine how much space is * needed, and the 2nd time to fill it. */ @@ -3239,11 +3229,11 @@ int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data, if (!arg_obj->properties) goto out; - for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) + for (i = 0; i < arg_obj->properties->count; i++) if (arg_obj->properties->ids[i] == arg->prop_id) break; - if (i == DRM_OBJECT_MAX_PROPERTY) + if (i == arg_obj->properties->count) goto out; prop_obj = drm_mode_object_find(dev, arg->prop_id, diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index ed65847d06db..e3e2ec75e17b 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -57,6 +57,7 @@ struct drm_mode_object { #define DRM_OBJECT_MAX_PROPERTY 16 struct drm_object_properties { + int count; uint32_t ids[DRM_OBJECT_MAX_PROPERTY]; uint64_t values[DRM_OBJECT_MAX_PROPERTY]; }; -- 2.20.1