On Wed, Jan 27, 2016 at 03:44:41PM +0100, Marek Szyprowski wrote:
This patch simplifies initialization of generic rotation property and aligns the code to match recently introduced function for intializing generic zpos property. It also adds missing documentation.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++----- drivers/gpu/drm/drm_crtc.c | 29 ++++++++++++++++++++----- drivers/gpu/drm/i915/intel_display.c | 6 ++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +-- drivers/gpu/drm/omapdrm/omap_drv.c | 3 +-- include/drm/drm_crtc.h | 4 ++-- 6 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index 1ffe9c329c46..4f9606cdf0f2 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -967,12 +967,10 @@ atmel_hlcdc_plane_create_properties(struct drm_device *dev) if (!props->alpha) return ERR_PTR(-ENOMEM);
- dev->mode_config.rotation_property =
drm_mode_create_rotation_property(dev,BIT(DRM_ROTATE_0) |BIT(DRM_ROTATE_90) |BIT(DRM_ROTATE_180) |BIT(DRM_ROTATE_270));
- drm_mode_create_rotation_property(dev, BIT(DRM_ROTATE_0) |
BIT(DRM_ROTATE_90) |BIT(DRM_ROTATE_180) |BIT(DRM_ROTATE_270));diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index d40bab29747e..822ad6928144 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -5875,10 +5875,23 @@ void drm_mode_config_cleanup(struct drm_device *dev) } EXPORT_SYMBOL(drm_mode_config_cleanup);
-struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
unsigned int supported_rotations)+/**
- drm_mode_create_rotation_property - create generic rotation property
- @dev: DRM device
- @supported_rotations: bitmask of supported rotation modes
- This function initializes generic rotation property and enables support
- for it in drm core. Drivers can then attach this property to planes to enable
- support for different rotation modes.
- Returns:
- Zero on success, negative errno on failure.
- */
+int drm_mode_create_rotation_property(struct drm_device *dev,
unsigned int supported_rotations){
- static const struct drm_prop_enum_list props[] = {
- struct drm_property *prop;
- static const struct drm_prop_enum_list values[] = { { DRM_ROTATE_0, "rotate-0" }, { DRM_ROTATE_90, "rotate-90" }, { DRM_ROTATE_180, "rotate-180" },
@@ -5887,9 +5900,13 @@ struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev, { DRM_REFLECT_Y, "reflect-y" }, };
- return drm_property_create_bitmask(dev, 0, "rotation",
props, ARRAY_SIZE(props),supported_rotations);
- prop = drm_property_create_bitmask(dev, 0, "rotation", values,
ARRAY_SIZE(values), supported_rotations);- if (!prop)
return -ENOMEM;- dev->mode_config.rotation_property = prop;
Again, per-plane rotation properties are going to be needed, so this isn't good.