Commit 949619f3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Extract drm_mode_object.[hc] 



Just for the struct drm_mode_object base class. The header file was
already partially extracted to help untangle the include loops.

v2:
- Also move the generic get/set property ioctls. At first this seemed
  like a bad idea since it requires making drm_mode_crtc_set_obj_prop
  non-static. But eventually that will get split away too (like
  the connector version already is) for both crtc and planes. Hence I
  reconsidered.

- drm_mode_object.[hc] instead of drm_modeset.[hc], which requires
  renaming the drm_modeset.h header I already started building up.
  This is more consistent (matches the name of the main structure),
  and I want to be able to use drm_modeset.[hc] for the basic modeset
  init/cleanup functionality like drm_mode_config_init.

Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829082757.17913-3-daniel.vetter@ffwll.ch
parent e03e6de0

Documentation/gpu/drm-kms.rst

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ be setup by initializing the following fields. 
-  struct drm_mode_config_funcs \*funcs;

   Mode setting functions.



Modeset Base Object Abstraction

===============================



.. kernel-doc:: include/drm/drm_mode_object.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_mode_object.c

   :export:



KMS Data Structures

===================

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_modeset_lock.o drm_atomic.o drm_bridge.o \

		drm_framebuffer.o drm_connector.o drm_blend.o \

		drm_encoder.o

		drm_encoder.o drm_mode_object.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drivers/gpu/drm/drm_crtc.c

+3 −410
Original line number Diff line number Diff line
@@ -57,162 +57,6 @@ static const struct drm_prop_enum_list drm_plane_type_enum_list[] = { 
/*

 * Optional properties

 */

/*

 * Internal function to assign a slot in the object idr and optionally

 * register the object into the idr.

 */

int drm_mode_object_get_reg(struct drm_device *dev,

			    struct drm_mode_object *obj,

			    uint32_t obj_type,

			    bool register_obj,

			    void (*obj_free_cb)(struct kref *kref))

{

	int ret;



	mutex_lock(&dev->mode_config.idr_mutex);

	ret = idr_alloc(&dev->mode_config.crtc_idr, register_obj ? obj : NULL, 1, 0, GFP_KERNEL);

	if (ret >= 0) {

		/*

		 * Set up the object linking under the protection of the idr

		 * lock so that other users can't see inconsistent state.

		 */

		obj->id = ret;

		obj->type = obj_type;

		if (obj_free_cb) {

			obj->free_cb = obj_free_cb;

			kref_init(&obj->refcount);

		}

	}

	mutex_unlock(&dev->mode_config.idr_mutex);



	return ret < 0 ? ret : 0;

}



/**

 * drm_mode_object_get - allocate a new modeset identifier

 * @dev: DRM device

 * @obj: object pointer, used to generate unique ID

 * @obj_type: object type

 *

 * Create a unique identifier based on @ptr in @dev's identifier space.  Used

 * for tracking modes, CRTCs and connectors. Note that despite the _get postfix

 * modeset identifiers are _not_ reference counted. Hence don't use this for

 * reference counted modeset objects like framebuffers.

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_mode_object_get(struct drm_device *dev,

			struct drm_mode_object *obj, uint32_t obj_type)

{

	return drm_mode_object_get_reg(dev, obj, obj_type, true, NULL);

}



void drm_mode_object_register(struct drm_device *dev,

			      struct drm_mode_object *obj)

{

	mutex_lock(&dev->mode_config.idr_mutex);

	idr_replace(&dev->mode_config.crtc_idr, obj, obj->id);

	mutex_unlock(&dev->mode_config.idr_mutex);

}



/**

 * drm_mode_object_unregister - free a modeset identifer

 * @dev: DRM device

 * @object: object to free

 *

 * Free @id from @dev's unique identifier pool.

 * This function can be called multiple times, and guards against

 * multiple removals.

 * These modeset identifiers are _not_ reference counted. Hence don't use this

 * for reference counted modeset objects like framebuffers.

 */

void drm_mode_object_unregister(struct drm_device *dev,

			 struct drm_mode_object *object)

{

	mutex_lock(&dev->mode_config.idr_mutex);

	if (object->id) {

		idr_remove(&dev->mode_config.crtc_idr, object->id);

		object->id = 0;

	}

	mutex_unlock(&dev->mode_config.idr_mutex);

}



struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev,

					       uint32_t id, uint32_t type)

{

	struct drm_mode_object *obj = NULL;



	mutex_lock(&dev->mode_config.idr_mutex);

	obj = idr_find(&dev->mode_config.crtc_idr, id);

	if (obj && type != DRM_MODE_OBJECT_ANY && obj->type != type)

		obj = NULL;

	if (obj && obj->id != id)

		obj = NULL;



	if (obj && obj->free_cb) {

		if (!kref_get_unless_zero(&obj->refcount))

			obj = NULL;

	}

	mutex_unlock(&dev->mode_config.idr_mutex);



	return obj;

}



/**

 * drm_mode_object_find - look up a drm object with static lifetime

 * @dev: drm device

 * @id: id of the mode object

 * @type: type of the mode object

 *

 * This function is used to look up a modeset object. It will acquire a

 * reference for reference counted objects. This reference must be dropped again

 * by callind drm_mode_object_unreference().

 */

struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,

		uint32_t id, uint32_t type)

{

	struct drm_mode_object *obj = NULL;



	obj = __drm_mode_object_find(dev, id, type);

	return obj;

}

EXPORT_SYMBOL(drm_mode_object_find);



/**

 * drm_mode_object_unreference - decr the object refcnt

 * @obj: mode_object

 *

 * This functions decrements the object's refcount if it is a refcounted modeset

 * object. It is a no-op on any other object. This is used to drop references

 * acquired with drm_mode_object_reference().

 */

void drm_mode_object_unreference(struct drm_mode_object *obj)

{

	if (obj->free_cb) {

		DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, atomic_read(&obj->refcount.refcount));

		kref_put(&obj->refcount, obj->free_cb);

	}

}

EXPORT_SYMBOL(drm_mode_object_unreference);



/**

 * drm_mode_object_reference - incr the object refcnt

 * @obj: mode_object

 *

 * This functions increments the object's refcount if it is a refcounted modeset

 * object. It is a no-op on any other object. References should be dropped again

 * by calling drm_mode_object_unreference().

 */

void drm_mode_object_reference(struct drm_mode_object *obj)

{

	if (obj->free_cb) {

		DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, atomic_read(&obj->refcount.refcount));

		kref_get(&obj->refcount);

	}

}

EXPORT_SYMBOL(drm_mode_object_reference);



/**

 * drm_crtc_force_disable - Forcibly turn off a CRTC

 * @crtc: CRTC to turn off
@@ -1010,45 +854,6 @@ int drm_mode_getcrtc(struct drm_device *dev, 
	return 0;

}



/* helper for getconnector and getproperties ioctls */

int drm_mode_object_get_properties(struct drm_mode_object *obj, bool atomic,

				   uint32_t __user *prop_ptr,

				   uint64_t __user *prop_values,

				   uint32_t *arg_count_props)

{

	int props_count;

	int i, ret, copied;



	props_count = obj->properties->count;

	if (!atomic)

		props_count -= obj->properties->atomic_count;



	if ((*arg_count_props >= props_count) && props_count) {

		for (i = 0, copied = 0; copied < props_count; i++) {

			struct drm_property *prop = obj->properties->properties[i];

			uint64_t val;



			if ((prop->flags & DRM_MODE_PROP_ATOMIC) && !atomic)

				continue;



			ret = drm_object_property_get_value(obj, prop, &val);

			if (ret)

				return ret;



			if (put_user(prop->base.id, prop_ptr + copied))

				return -EFAULT;



			if (put_user(val, prop_values + copied))

				return -EFAULT;



			copied++;

		}

	}

	*arg_count_props = props_count;



	return 0;

}



/**

 * drm_mode_getplane_res - enumerate all plane resources

 * @dev: DRM device
@@ -2290,105 +2095,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property) 
}

EXPORT_SYMBOL(drm_property_destroy);



/**

 * drm_object_attach_property - attach a property to a modeset object

 * @obj: drm modeset object

 * @property: property to attach

 * @init_val: initial value of the property

 *

 * This attaches the given property to the modeset object with the given initial

 * value. Currently this function cannot fail since the properties are stored in

 * a statically sized array.

 */

void drm_object_attach_property(struct drm_mode_object *obj,

				struct drm_property *property,

				uint64_t init_val)

{

	int count = obj->properties->count;



	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;

	}



	obj->properties->properties[count] = property;

	obj->properties->values[count] = init_val;

	obj->properties->count++;

	if (property->flags & DRM_MODE_PROP_ATOMIC)

		obj->properties->atomic_count++;

}

EXPORT_SYMBOL(drm_object_attach_property);



/**

 * drm_object_property_set_value - set the value of a property

 * @obj: drm mode object to set property value for

 * @property: property to set

 * @val: value the property should be set to

 *

 * This functions sets a given property on a given object. This function only

 * changes the software state of the property, it does not call into the

 * driver's ->set_property callback.

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_object_property_set_value(struct drm_mode_object *obj,

				  struct drm_property *property, uint64_t val)

{

	int i;



	for (i = 0; i < obj->properties->count; i++) {

		if (obj->properties->properties[i] == property) {

			obj->properties->values[i] = val;

			return 0;

		}

	}



	return -EINVAL;

}

EXPORT_SYMBOL(drm_object_property_set_value);



/**

 * drm_object_property_get_value - retrieve the value of a property

 * @obj: drm mode object to get property value from

 * @property: property to retrieve

 * @val: storage for the property value

 *

 * This function retrieves the softare state of the given property for the given

 * property. Since there is no driver callback to retrieve the current property

 * value this might be out of sync with the hardware, depending upon the driver

 * and property.

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_object_property_get_value(struct drm_mode_object *obj,

				  struct drm_property *property, uint64_t *val)

{

	int i;



	/* read-only properties bypass atomic mechanism and still store

	 * their value in obj->properties->values[].. mostly to avoid

	 * having to deal w/ EDID and similar props in atomic paths:

	 */

	if (drm_core_check_feature(property->dev, DRIVER_ATOMIC) &&

			!(property->flags & DRM_MODE_PROP_IMMUTABLE))

		return drm_atomic_get_property(obj, property, val);



	for (i = 0; i < obj->properties->count; i++) {

		if (obj->properties->properties[i] == property) {

			*val = obj->properties->values[i];

			return 0;

		}

	}



	return -EINVAL;

}

EXPORT_SYMBOL(drm_object_property_get_value);



/**

 * drm_mode_getproperty_ioctl - get the property metadata

 * @dev: DRM device
@@ -2934,7 +2640,7 @@ void drm_property_change_valid_put(struct drm_property *property, 
		drm_property_unreference_blob(obj_to_blob(ref));

}



static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,

int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,

			       struct drm_property *property,

			       uint64_t value)

{
@@ -2978,119 +2684,6 @@ int drm_mode_plane_set_obj_prop(struct drm_plane *plane, 
}

EXPORT_SYMBOL(drm_mode_plane_set_obj_prop);



/**

 * drm_mode_obj_get_properties_ioctl - get the current value of a object's property

 * @dev: DRM device

 * @data: ioctl data

 * @file_priv: DRM file info

 *

 * This function retrieves the current value for an object's property. Compared

 * to the connector specific ioctl this one is extended to also work on crtc and

 * plane objects.

 *

 * Called by the user via ioctl.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

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;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	drm_modeset_lock_all(dev);



	obj = drm_mode_object_find(dev, arg->obj_id, arg->obj_type);

	if (!obj) {

		ret = -ENOENT;

		goto out;

	}

	if (!obj->properties) {

		ret = -EINVAL;

		goto out_unref;

	}



	ret = drm_mode_object_get_properties(obj, file_priv->atomic,

			(uint32_t __user *)(unsigned long)(arg->props_ptr),

			(uint64_t __user *)(unsigned long)(arg->prop_values_ptr),

			&arg->count_props);



out_unref:

	drm_mode_object_unreference(obj);

out:

	drm_modeset_unlock_all(dev);

	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 i, ret = -EINVAL;

	struct drm_mode_object *ref;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	drm_modeset_lock_all(dev);



	arg_obj = drm_mode_object_find(dev, arg->obj_id, arg->obj_type);

	if (!arg_obj) {

		ret = -ENOENT;

		goto out;

	}

	if (!arg_obj->properties)

		goto out_unref;



	for (i = 0; i < arg_obj->properties->count; i++)

		if (arg_obj->properties->properties[i]->base.id == arg->prop_id)

			break;



	if (i == arg_obj->properties->count)

		goto out_unref;



	prop_obj = drm_mode_object_find(dev, arg->prop_id,

					DRM_MODE_OBJECT_PROPERTY);

	if (!prop_obj) {

		ret = -ENOENT;

		goto out_unref;

	}

	property = obj_to_property(prop_obj);



	if (!drm_property_change_valid_get(property, arg->value, &ref))

		goto out_unref;



	switch (arg_obj->type) {

	case DRM_MODE_OBJECT_CONNECTOR:

		ret = drm_mode_connector_set_obj_prop(arg_obj, property,

						      arg->value);

		break;

	case DRM_MODE_OBJECT_CRTC:

		ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);

		break;

	case DRM_MODE_OBJECT_PLANE:

		ret = drm_mode_plane_set_obj_prop(obj_to_plane(arg_obj),

						  property, arg->value);

		break;

	}



	drm_property_change_valid_put(property, ref);



out_unref:

	drm_mode_object_unreference(arg_obj);

out:

	drm_modeset_unlock_all(dev);

	return ret;

}



/**

 * drm_mode_crtc_set_gamma_size - set the gamma table size

 * @crtc: CRTC to set the gamma table size for

drivers/gpu/drm/drm_crtc_internal.h

+29 −23
Original line number Diff line number Diff line
@@ -33,29 +33,14 @@ 




/* drm_crtc.c */

int drm_mode_object_get_reg(struct drm_device *dev,

			    struct drm_mode_object *obj,

			    uint32_t obj_type,

			    bool register_obj,

			    void (*obj_free_cb)(struct kref *kref));

void drm_mode_object_register(struct drm_device *dev,

			      struct drm_mode_object *obj);

int drm_mode_object_get(struct drm_device *dev,

			struct drm_mode_object *obj, uint32_t obj_type);

struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev,

					       uint32_t id, uint32_t type);

void drm_mode_object_unregister(struct drm_device *dev,

				struct drm_mode_object *object);

int drm_mode_object_get_properties(struct drm_mode_object *obj, bool atomic,

				   uint32_t __user *prop_ptr,

				   uint64_t __user *prop_values,

				   uint32_t *arg_count_props);

int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,

			       struct drm_property *property,

			       uint64_t value);

bool drm_property_change_valid_get(struct drm_property *property,

				   uint64_t value,

				   struct drm_mode_object **ref);

void drm_property_change_valid_put(struct drm_property *property,

				   struct drm_mode_object *ref);



int drm_plane_check_pixel_format(const struct drm_plane *plane,

				 u32 format);

int drm_crtc_check_viewport(const struct drm_crtc *crtc,
@@ -76,11 +61,6 @@ int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, 
				void *data, struct drm_file *file_priv);



/* IOCTLs */

int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,

				      struct drm_file *file_priv);

int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,

				    struct drm_file *file_priv);



int drm_mode_getresources(struct drm_device *dev,

			  void *data, struct drm_file *file_priv);

int drm_mode_getplane_res(struct drm_device *dev, void *data,
@@ -113,6 +93,32 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, 
int drm_mode_page_flip_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);



/* drm_mode_object.c */

int drm_mode_object_get_reg(struct drm_device *dev,

			    struct drm_mode_object *obj,

			    uint32_t obj_type,

			    bool register_obj,

			    void (*obj_free_cb)(struct kref *kref));

void drm_mode_object_register(struct drm_device *dev,

			      struct drm_mode_object *obj);

int drm_mode_object_get(struct drm_device *dev,

			struct drm_mode_object *obj, uint32_t obj_type);

struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev,

					       uint32_t id, uint32_t type);

void drm_mode_object_unregister(struct drm_device *dev,

				struct drm_mode_object *object);

int drm_mode_object_get_properties(struct drm_mode_object *obj, bool atomic,

				   uint32_t __user *prop_ptr,

				   uint64_t __user *prop_values,

				   uint32_t *arg_count_props);



/* IOCTL */



int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,

				      struct drm_file *file_priv);

int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,

				    struct drm_file *file_priv);



/* drm_encoder.c */

int drm_encoder_register_all(struct drm_device *dev);

void drm_encoder_unregister_all(struct drm_device *dev);

drivers/gpu/drm/drm_mode_object.c

0 → 100644
+435 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE