Commit 9922ab5a authored by Rob Clark's avatar Rob Clark
Browse files

drm: Add plane type property (v2) 



Add a plane type property to allow userspace to distinguish plane types.

v2: Driver-specific churn eliminated now that drm_plane_init() and
    drm_universal_plane_init() were separated out in a previous patch.

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
parent dc415ff9

drivers/gpu/drm/drm_crtc.c

+27 −0
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ static const struct drm_prop_enum_list drm_dpms_enum_list[] = 


DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)



static const struct drm_prop_enum_list drm_plane_type_enum_list[] =

{

	{ DRM_PLANE_TYPE_OVERLAY, "Overlay" },

	{ DRM_PLANE_TYPE_PRIMARY, "Primary" },

	{ DRM_PLANE_TYPE_CURSOR, "Cursor" },

};



/*

 * Optional properties

 */
@@ -1050,6 +1057,10 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, 
	if (plane->type == DRM_PLANE_TYPE_OVERLAY)

		dev->mode_config.num_overlay_plane++;



	drm_object_attach_property(&plane->base,

				   dev->mode_config.plane_type_property,

				   plane->type);



 out:

	drm_modeset_unlock_all(dev);
@@ -1161,6 +1172,21 @@ static int drm_mode_create_standard_connector_properties(struct drm_device *dev) 
	return 0;

}



static int drm_mode_create_standard_plane_properties(struct drm_device *dev)

{

	struct drm_property *type;



	/*

	 * Standard properties (apply to all planes)

	 */

	type = drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE,

					"type", drm_plane_type_enum_list,

					ARRAY_SIZE(drm_plane_type_enum_list));

	dev->mode_config.plane_type_property = type;



	return 0;

}



/**

 * drm_mode_create_dvi_i_properties - create DVI-I specific connector properties

 * @dev: DRM device
@@ -4564,6 +4590,7 @@ void drm_mode_config_init(struct drm_device *dev) 


	drm_modeset_lock_all(dev);

	drm_mode_create_standard_connector_properties(dev);

	drm_mode_create_standard_plane_properties(dev);

	drm_modeset_unlock_all(dev);



	/* Just to be sure */

include/drm/drm_crtc.h

+1 −0
Original line number Diff line number Diff line
@@ -771,6 +771,7 @@ struct drm_mode_config { 
	struct list_head property_blob_list;

	struct drm_property *edid_property;

	struct drm_property *dpms_property;

	struct drm_property *plane_type_property;



	/* DVI-I properties */

	struct drm_property *dvi_i_subconnector_property;

CRA Git | Maintained and supported by SUSTech CRA and CCSE