Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77953bd1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Unify handling of blob and object properties 



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: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829082757.17913-8-daniel.vetter@ffwll.ch
parent 59e71ee7

drivers/gpu/drm/drm_property.c

+5 −18
Original line number Diff line number Diff line
@@ -911,20 +911,8 @@ bool drm_property_change_valid_get(struct drm_property *property, 
		for (i = 0; i < property->num_values; i++)

			valid_mask |= (1ULL << property->values[i]);

		return !(value & ~valid_mask);

	} else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) {

		struct drm_property_blob *blob;



		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)) {

	} else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB) ||

		   drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) {

		/* a zero value for an object property translates to null: */

		if (value == 0)

			return true;
@@ -946,8 +934,7 @@ void drm_property_change_valid_put(struct drm_property *property, 
	if (!ref)

		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);

	} else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB))

		drm_property_unreference_blob(obj_to_blob(ref));

}