On Thu, Mar 29, 2012 at 06:27:22PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zan...@intel.com>
>
> Useless for connector properties (since they already have their own
> ioctls), but useful when we add properties to CRTCs, planes and other
> objects.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
> ---
> drivers/gpu/drm/drm_crtc.c | 180
> ++++++++++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/drm_drv.c | 4 +-
> include/drm/drm.h | 2 +
> include/drm/drm_crtc.h | 13 +++
> include/drm/drm_mode.h | 15 ++++
> 5 files changed, 213 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 8800830..12f93e4 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -2832,6 +2832,56 @@ int drm_connector_property_get_value(struct
> drm_connector *connector,
> }
> EXPORT_SYMBOL(drm_connector_property_get_value);
>
> +void drm_object_attach_property(struct drm_mode_object *obj,
> + struct drm_property *property,
> + uint64_t init_val)
> +{
> + int i;
> +
> + 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;
> + }
> + }
> +
> + WARN(1, "Failed to attach object property\n");
> +}
> +EXPORT_SYMBOL(drm_object_attach_property);
> +
> +int drm_object_property_set_value(struct drm_mode_object *obj,
> + struct drm_property *property, uint64_t val)
> +{
> + int i;
> +
> + for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
> + if (obj->properties->ids[i] == property->base.id) {
> + obj->properties->values[i] = val;
> + return 0;
> + }
> + }
> +
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL(drm_object_property_set_value);
> +
> +int drm_object_property_get_value(struct drm_mode_object *obj,
> + struct drm_property *property, uint64_t *val)
> +{
> + int i;
> +
> + for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
> + if (obj->properties->ids[i] == property->base.id) {
> + *val = obj->properties->values[i];
> + return 0;
> + }
> + }
> +
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL(drm_object_property_get_value);
> +
> int drm_mode_getproperty_ioctl(struct drm_device *dev,
> void *data, struct drm_file *file_priv)
> {
> @@ -3107,6 +3157,136 @@ out:
> return ret;
> }
>
> +static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
> + struct drm_property *property,
> + uint64_t value)
> +{
> + int ret = -EINVAL;
> + struct drm_connector *connector = obj_to_connector(obj);
> +
> + /* Do DPMS ourselves */
> + if (property == connector->dev->mode_config.dpms_property) {
> + if (connector->funcs->dpms)
> + (*connector->funcs->dpms)(connector, (int)value);
> + ret = 0;
> + } else if (connector->funcs->set_property)
> + ret = connector->funcs->set_property(connector, property,
> value);
> +
> + /* store the property value if successful */
> + if (!ret)
> + drm_connector_property_set_value(connector, property, value);
> + return ret;
> +}
> +
> +int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
> + struct drm_file *file_priv)
> +{
> + struct drm_mode_obj_get_properties *arg = data;
> + struct drm_mode_object *obj;
> + int ret = 0;
> + int i;
> + int copied = 0;
> + int props_count = 0;
> + uint32_t __user *props_ptr;
> + uint64_t __user *prop_values_ptr;
> +
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> + mutex_lock(&dev->mode_config.mutex);
> +
> + obj = drm_mode_object_find(dev, arg->obj_id, arg->obj_type);
> + if (!obj) {
> + ret = -EINVAL;
> + goto out;
> + }
> + if (!obj->properties) {
> + ret = -EINVAL;
> + 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++)
> + ;
How about adding obj->properties.count to avoid having to count every
time?
> +
> + /* This ioctl is called twice, once to determine how much space is
> + * needed, and the 2nd time to fill it. */
> + if ((arg->count_props >= props_count) && props_count) {
> + copied = 0;
> + props_ptr = (uint32_t __user *)(unsigned long)(arg->props_ptr);
> + prop_values_ptr = (uint64_t __user *)(unsigned long)
> + (arg->prop_values_ptr);
> + for (i = 0; i < props_count; i++) {
> + if (put_user(obj->properties->ids[i],
> + props_ptr + copied)) {
> + ret = -EFAULT;
> + goto out;
> + }
> + if (put_user(obj->properties->values[i],
> + prop_values_ptr + copied)) {
> + ret = -EFAULT;
> + goto out;
> + }
> + copied++;
> + }
> + }
> + arg->count_props = props_count;
> +out:
> + mutex_unlock(&dev->mode_config.mutex);
> + return ret;
> +}
> +
> +int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
> + struct drm_file *file_priv)
> +{
> + struct drm_mode_obj_set_property *arg = data;
> + struct drm_mode_object *arg_obj;
> + struct drm_mode_object *prop_obj;
> + struct drm_property *property;
> + int ret = -EINVAL;
> + int i;
> +
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> + mutex_lock(&dev->mode_config.mutex);
> +
> + arg_obj = drm_mode_object_find(dev, arg->obj_id, arg->obj_type);
> + if (!arg_obj)
> + goto out;
> + if (!arg_obj->properties)
> + goto out;
> +
> + for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++)
> + if (arg_obj->properties->ids[i] == arg->prop_id)
> + break;
> +
> + if (i == DRM_OBJECT_MAX_PROPERTY)
> + goto out;
> +
> + prop_obj = drm_mode_object_find(dev, arg->prop_id,
> + DRM_MODE_OBJECT_PROPERTY);
> + if (!prop_obj)
> + goto out;
> + property = obj_to_property(prop_obj);
> +
> + if (!drm_property_change_is_valid(property, arg->value))
> + goto out;
> +
> + switch (arg_obj->type) {
> + case DRM_MODE_OBJECT_CONNECTOR:
> + ret = drm_mode_connector_set_obj_prop(arg_obj, property,
> + arg->value);
> + break;
> + }
> +
> +out:
> + mutex_unlock(&dev->mode_config.mutex);
> + return ret;
> +}
> +
> int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> struct drm_encoder *encoder)
> {
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 0b65fbc..18db86e 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -159,7 +159,9 @@ static struct drm_ioctl_desc drm_ioctls[] = {
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED)
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES,
> drm_mode_obj_get_properties_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY,
> drm_mode_obj_set_property_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED)
Just add the trailing comma to the last line as well. Otherwise we keep
on having ugly diffs when new ioctls are added.
> };
>
> #define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
