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

Commit 9fe58f01 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/atmel-hlcdc: Use per-plane rotation property 



The global mode_config.rotation_property is going away, switch over to
per-plane rotation_property.

v2: Propagate error upwards (Boris)
v3: Drop the BIT()

Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474907460-10717-6-git-send-email-ville.syrjala@linux.intel.com
parent ea0e1ce2

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+20 −17
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static int atmel_hlcdc_plane_atomic_get_property(struct drm_plane *p, 
	return 0;

}



static void atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane,

static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane,

					     const struct atmel_hlcdc_layer_desc *desc,

					     struct atmel_hlcdc_plane_properties *props)

{
@@ -902,10 +902,18 @@ static void atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane, 
				ATMEL_HLCDC_LAYER_GA_MASK);

	}



	if (desc->layout.xstride && desc->layout.pstride)

		drm_object_attach_property(&plane->base.base,

				plane->base.dev->mode_config.rotation_property,

				DRM_ROTATE_0);

	if (desc->layout.xstride && desc->layout.pstride) {

		int ret;



		ret = drm_plane_create_rotation_property(&plane->base,

							 DRM_ROTATE_0,

							 DRM_ROTATE_0 |

							 DRM_ROTATE_90 |

							 DRM_ROTATE_180 |

							 DRM_ROTATE_270);

		if (ret)

			return ret;

	}



	if (desc->layout.csc) {

		/*
@@ -925,6 +933,8 @@ static void atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane, 
			     ATMEL_HLCDC_LAYER_CSC_CFG(&plane->layer, 2),

			     0x40040890);

	}



	return 0;

}



static struct drm_plane_helper_funcs atmel_hlcdc_layer_plane_helper_funcs = {
@@ -1036,7 +1046,9 @@ atmel_hlcdc_plane_create(struct drm_device *dev, 
			     &atmel_hlcdc_layer_plane_helper_funcs);



	/* Set default property values*/

	atmel_hlcdc_plane_init_properties(plane, desc, props);

	ret = atmel_hlcdc_plane_init_properties(plane, desc, props);

	if (ret)

		return ERR_PTR(ret);



	return plane;

}
@@ -1054,15 +1066,6 @@ 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,

							  DRM_ROTATE_0 |

							  DRM_ROTATE_90 |

							  DRM_ROTATE_180 |

							  DRM_ROTATE_270);

	if (!dev->mode_config.rotation_property)

		return ERR_PTR(-ENOMEM);



	return props;

}