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

Commit 4d93914a authored by Rob Clark's avatar Rob Clark Committed by Dave Airlie
Browse files

drm: add plane properties 



The omapdrm driver uses this for setting per-overlay rotation.  It
is likely also useful for setting YUV->RGB colorspace conversion
matrix, etc.

Signed-off-by: default avatarRob Clark <rob@ti.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 49e27545

drivers/gpu/drm/drm_crtc.c

+19 −0
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, 
	if (ret)

		goto out;



	plane->base.properties = &plane->properties;

	plane->dev = dev;

	plane->funcs = funcs;

	plane->format_types = kmalloc(sizeof(uint32_t) * format_count,
@@ -3199,6 +3200,21 @@ static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj, 
	return ret;

}



static int drm_mode_plane_set_obj_prop(struct drm_mode_object *obj,

				      struct drm_property *property,

				      uint64_t value)

{

	int ret = -EINVAL;

	struct drm_plane *plane = obj_to_plane(obj);



	if (plane->funcs->set_property)

		ret = plane->funcs->set_property(plane, property, value);

	if (!ret)

		drm_object_property_set_value(obj, property, value);



	return ret;

}



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

				      struct drm_file *file_priv)

{
@@ -3300,6 +3316,9 @@ int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data, 
	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(arg_obj, property, arg->value);

		break;

	}



out:

include/drm/drm_crtc.h

+7 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ struct drm_connector { 
 * @update_plane: update the plane configuration

 * @disable_plane: shut down the plane

 * @destroy: clean up plane resources

 * @set_property: called when a property is changed

 */

struct drm_plane_funcs {

	int (*update_plane)(struct drm_plane *plane,
@@ -611,6 +612,9 @@ struct drm_plane_funcs { 
			    uint32_t src_w, uint32_t src_h);

	int (*disable_plane)(struct drm_plane *plane);

	void (*destroy)(struct drm_plane *plane);



	int (*set_property)(struct drm_plane *plane,

			    struct drm_property *property, uint64_t val);

};



/**
@@ -628,6 +632,7 @@ struct drm_plane_funcs { 
 * @enabled: enabled flag

 * @funcs: helper functions

 * @helper_private: storage for drver layer

 * @properties: property tracking for this plane

 */

struct drm_plane {

	struct drm_device *dev;
@@ -650,6 +655,8 @@ struct drm_plane { 


	const struct drm_plane_funcs *funcs;

	void *helper_private;



	struct drm_object_properties properties;

};



/**