leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: add plane properties

Browse Source 
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: Rob Clark <rob@ti.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Rob Clark 2012-05-17 02:23:27 -06:00 committed by Dave Airlie
parent 49e2754578
commit 4d93914ae3
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,6 +608,7 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,
if (ret) if (ret)
goto out; goto out;
plane->base.properties = &plane->properties;
plane->dev = dev; plane->dev = dev;
plane->funcs = funcs; plane->funcs = funcs;
plane->format_types = kmalloc(sizeof(uint32_t) * format_count, 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; 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, int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv) 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: case DRM_MODE_OBJECT_CRTC:
ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value); ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);
break; break;
case DRM_MODE_OBJECT_PLANE:
ret = drm_mode_plane_set_obj_prop(arg_obj, property, arg->value);
break;
} }
out: out:

7
include/drm/drm_crtc.h
View File

@ -601,6 +601,7 @@ struct drm_connector {
* @update_plane: update the plane configuration * @update_plane: update the plane configuration
* @disable_plane: shut down the plane * @disable_plane: shut down the plane
* @destroy: clean up plane resources * @destroy: clean up plane resources
* @set_property: called when a property is changed
*/ */
struct drm_plane_funcs { struct drm_plane_funcs {
int (*update_plane)(struct drm_plane *plane, int (*update_plane)(struct drm_plane *plane,
@ -611,6 +612,9 @@ struct drm_plane_funcs {
uint32_t src_w, uint32_t src_h); uint32_t src_w, uint32_t src_h);
int (*disable_plane)(struct drm_plane *plane); int (*disable_plane)(struct drm_plane *plane);
void (*destroy)(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 * @enabled: enabled flag
* @funcs: helper functions * @funcs: helper functions
* @helper_private: storage for drver layer * @helper_private: storage for drver layer
* @properties: property tracking for this plane
*/ */
struct drm_plane { struct drm_plane {
struct drm_device *dev; struct drm_device *dev;
@ -650,6 +655,8 @@ struct drm_plane {
const struct drm_plane_funcs *funcs; const struct drm_plane_funcs *funcs;
void *helper_private; void *helper_private;
struct drm_object_properties properties;
}; };
/** /**