redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm: get rid of direct property value access 

For atomic drivers, we won't use the values array but instead shunt
things off to obj->atomic_get_property().  So to simplify things make
all read/write of properties values go through the accessors.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
hifive-unleashed-5.1
Rob Clark 2014-12-16 18:05:31 -05:00 committed by Daniel Vetter
parent b17cd757a3
commit 22b8b13b6f
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/drm_crtc.c
View File

@ -2106,12 +2106,17 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
for (i = 0; i < connector->properties.count; i++) {
struct drm_property *prop = connector->properties.properties[i];
uint64_t val;
ret = drm_object_property_get_value(&connector->base, prop, &val);
if (ret)
goto out;
if (put_user(prop->base.id, prop_ptr + copied)) {
ret = -EFAULT;
goto out;
}
if (put_user(connector->properties.values[i],
prop_values + copied)) {
if (put_user(val, prop_values + copied)) {
ret = -EFAULT;
goto out;
}
@ -4413,12 +4418,18 @@ int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
(arg->prop_values_ptr);
for (i = 0; i < props_count; i++) {
struct drm_property *prop = obj->properties->properties[i];
uint64_t val;
ret = drm_object_property_get_value(obj, prop, &val);
if (ret)
goto out;
if (put_user(prop->base.id, props_ptr + copied)) {
ret = -EFAULT;
goto out;
}
if (put_user(obj->properties->values[i],
prop_values_ptr + copied)) {
if (put_user(val, prop_values_ptr + copied)) {
ret = -EFAULT;
goto out;
}

3
include/drm/drm_crtc.h
View File

@ -70,6 +70,9 @@ struct drm_object_properties {
* dangling property pointers:
*/
struct drm_property *properties[DRM_OBJECT_MAX_PROPERTY];
/* do not read/write values directly, but use drm_object_property_get_value()
* and drm_object_property_set_value():
*/
uint64_t values[DRM_OBJECT_MAX_PROPERTY];
};