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

Commit bffd9de0 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Dave Airlie
Browse files

drm: add CRTC properties 



The i915 driver needs this for the rotation and overscan compensation
properties. Other drivers might need this too.

Reviewed-by: default avatarRob Clark <rob.clark@linaro.org>
Tested-by: default avatarRob Clark <rob.clark@linaro.org>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7f88a9be

drivers/gpu/drm/drm_crtc.c

+20 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, 
	if (ret)

		goto out;



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



	list_add_tail(&crtc->head, &dev->mode_config.crtc_list);

	dev->mode_config.num_crtc++;
@@ -3141,6 +3143,21 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, 
	return ret;

}



static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,

				      struct drm_property *property,

				      uint64_t value)

{

	int ret = -EINVAL;

	struct drm_crtc *crtc = obj_to_crtc(obj);



	if (crtc->funcs->set_property)

		ret = crtc->funcs->set_property(crtc, 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)

{
@@ -3239,6 +3256,9 @@ int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data, 
		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;

	}



out:

include/drm/drm_crtc.h

+8 −1
Original line number Diff line number Diff line
@@ -306,7 +306,8 @@ struct drm_plane; 
 * @mode_fixup: fixup proposed mode

 * @mode_set: set the desired mode on the CRTC

 * @gamma_set: specify color ramp for CRTC

 * @destroy: deinit and free object.

 * @destroy: deinit and free object

 * @set_property: called when a property is changed

 *

 * The drm_crtc_funcs structure is the central CRTC management structure

 * in the DRM.  Each CRTC controls one or more connectors (note that the name
@@ -350,6 +351,9 @@ struct drm_crtc_funcs { 
	int (*page_flip)(struct drm_crtc *crtc,

			 struct drm_framebuffer *fb,

			 struct drm_pending_vblank_event *event);



	int (*set_property)(struct drm_crtc *crtc,

			    struct drm_property *property, uint64_t val);

};



/**
@@ -369,6 +373,7 @@ struct drm_crtc_funcs { 
 * @framedur_ns: precise line timing

 * @pixeldur_ns: precise pixel timing

 * @helper_private: mid-layer private data

 * @properties: property tracking for this CRTC

 *

 * Each CRTC may have one or more connectors associated with it.  This structure

 * allows the CRTC to be controlled.
@@ -404,6 +409,8 @@ struct drm_crtc { 


	/* if you are using the helper */

	void *helper_private;



	struct drm_object_properties properties;

};