renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code

drm: Unify handling of blob and object properties

Browse Source 
They work exactly the same now, after the refcounting unification a bit
ago. The only reason they're distinct is backwards compat with existing
userspace.

Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829082757.17913-8-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2016-08-29 10:27:56 +02:00
parent 59e71ee746
commit 77953bd136
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/drm_property.c
View File

@ -911,20 +911,8 @@ bool drm_property_change_valid_get(struct drm_property *property,
for (i = 0; i < property->num_values; i++) for (i = 0; i < property->num_values; i++)
valid_mask |= (1ULL << property->values[i]); valid_mask |= (1ULL << property->values[i]);
return !(value & ~valid_mask); return !(value & ~valid_mask);
} else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) { } else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB) ||
struct drm_property_blob *blob; drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) {
if (value == 0)
return true;
blob = drm_property_lookup_blob(property->dev, value);
if (blob) {
*ref = &blob->base;
return true;
} else {
return false;
}
} else if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) {
/* a zero value for an object property translates to null: */ /* a zero value for an object property translates to null: */
if (value == 0) if (value == 0)
return true; return true;
@ -941,13 +929,12 @@ bool drm_property_change_valid_get(struct drm_property *property,
} }
void drm_property_change_valid_put(struct drm_property *property, void drm_property_change_valid_put(struct drm_property *property,
struct drm_mode_object *ref) struct drm_mode_object *ref)
{ {
if (!ref) if (!ref)
return; return;
if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) { if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT) ||
drm_property_type_is(property, DRM_MODE_PROP_BLOB))
drm_mode_object_unreference(ref); drm_mode_object_unreference(ref);
} else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB))
drm_property_unreference_blob(obj_to_blob(ref));
} }