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

Commit 995c5a50 authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: dc: Support rotation property 



Currently only the DRM_MODE_REFLECT_Y rotation is supported. The driver
already supports reflection on the Y axis via a custom flag which is not
very useful because it requires custom userspace. Add the standard
rotation property that supports 0 degree rotation and Y axis reflection
for primary and overlay planes to provide a better interface than the
custom flag.

v2: keep custom flag for ABI compatibility (Dmitry)

Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 4bd91a5b

drivers/gpu/drm/tegra/dc.c

+25 −1
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, 
				    struct drm_plane_state *state)

{

	struct tegra_plane_state *plane_state = to_tegra_plane_state(state);

	unsigned int rotation = DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y;

	struct tegra_bo_tiling *tiling = &plane_state->tiling;

	struct tegra_plane *tegra = to_tegra_plane(plane);

	struct tegra_dc *dc = to_tegra_dc(state->crtc);
@@ -633,6 +634,13 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, 
		return -EINVAL;

	}



	rotation = drm_rotation_simplify(state->rotation, rotation);



	if (rotation & DRM_MODE_REFLECT_Y)

		plane_state->bottom_up = true;

	else

		plane_state->bottom_up = false;



	/*

	 * Tegra doesn't support different strides for U and V planes so we

	 * error out if the user tries to display a framebuffer with such a
@@ -693,7 +701,7 @@ static void tegra_plane_atomic_update(struct drm_plane *plane, 
	window.dst.w = drm_rect_width(&plane->state->dst);

	window.dst.h = drm_rect_height(&plane->state->dst);

	window.bits_per_pixel = fb->format->cpp[0] * 8;

	window.bottom_up = tegra_fb_is_bottom_up(fb);

	window.bottom_up = tegra_fb_is_bottom_up(fb) || state->bottom_up;



	/* copy from state */

	window.zpos = plane->state->normalized_zpos;
@@ -776,6 +784,14 @@ static struct drm_plane *tegra_primary_plane_create(struct drm_device *drm, 
	drm_plane_helper_add(&plane->base, &tegra_plane_helper_funcs);

	drm_plane_create_zpos_property(&plane->base, plane->index, 0, 255);



	err = drm_plane_create_rotation_property(&plane->base,

						 DRM_MODE_ROTATE_0,

						 DRM_MODE_ROTATE_0 |

						 DRM_MODE_REFLECT_Y);

	if (err < 0)

		dev_err(dc->dev, "failed to create rotation property: %d\n",

			err);



	return &plane->base;

}
@@ -1053,6 +1069,14 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm, 
	drm_plane_helper_add(&plane->base, &tegra_plane_helper_funcs);

	drm_plane_create_zpos_property(&plane->base, plane->index, 0, 255);



	err = drm_plane_create_rotation_property(&plane->base,

						 DRM_MODE_ROTATE_0,

						 DRM_MODE_ROTATE_0 |

						 DRM_MODE_REFLECT_Y);

	if (err < 0)

		dev_err(dc->dev, "failed to create rotation property: %d\n",

			err);



	return &plane->base;

}

drivers/gpu/drm/tegra/plane.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ tegra_plane_atomic_duplicate_state(struct drm_plane *plane) 
	copy->tiling = state->tiling;

	copy->format = state->format;

	copy->swap = state->swap;

	copy->bottom_up = state->bottom_up;

	copy->opaque = state->opaque;



	for (i = 0; i < 2; i++)

drivers/gpu/drm/tegra/plane.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ struct tegra_plane_state { 
	u32 format;

	u32 swap;



	bool bottom_up;



	/* used for legacy blending support only */

	struct tegra_plane_legacy_blending_state blending[2];

	bool opaque;