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

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

drm: Deal with rotation in drm_plane_helper_check_update() 

drm_plane_helper_check_update() needs to account for the plane rotation
for correct clipping/scaling calculations. Do so.

There was an earlier attempt [1] to add this into
intel_check_primary_plane() but I requested that it'd be put into the
helper instead. An updated patch never materialized AFAICS, so I went
ahead and cooked one up myself.

v2: Deal with new drm_plane_helper_check_update() callers

[1] https://patchwork.freedesktop.org/patch/65177/


Cc: Nabendu Maiti <nabendu.bikash.maiti@intel.com>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466172790-10025-1-git-send-email-ville.syrjala@linux.intel.com
parent e28cd4d0

drivers/gpu/drm/armada/armada_overlay.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, 
	int ret;

	int ret;





	ret = drm_plane_helper_check_update(plane, crtc, fb, &src, &dest, &clip,

	ret = drm_plane_helper_check_update(plane, crtc, fb, &src, &dest, &clip,

					    BIT(DRM_ROTATE_0),

					    0, INT_MAX, true, false, &visible);

					    0, INT_MAX, true, false, &visible);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/gpu/drm/drm_plane_helper.c

+18 −10
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ static int get_connectors_for_crtc(struct drm_crtc *crtc, 
 * @src: source coordinates in 16.16 fixed point

 * @src: source coordinates in 16.16 fixed point

 * @dest: integer destination coordinates

 * @dest: integer destination coordinates

 * @clip: integer clipping coordinates

 * @clip: integer clipping coordinates

 * @rotation: plane rotation

 * @min_scale: minimum @src:@dest scaling factor in 16.16 fixed point

 * @min_scale: minimum @src:@dest scaling factor in 16.16 fixed point

 * @max_scale: maximum @src:@dest scaling factor in 16.16 fixed point

 * @max_scale: maximum @src:@dest scaling factor in 16.16 fixed point

 * @can_position: is it legal to position the plane such that it

 * @can_position: is it legal to position the plane such that it
@@ -139,6 +140,7 @@ int drm_plane_helper_check_update(struct drm_plane *plane, 
				  struct drm_rect *src,

				  struct drm_rect *src,

				  struct drm_rect *dest,

				  struct drm_rect *dest,

				  const struct drm_rect *clip,

				  const struct drm_rect *clip,

				  unsigned int rotation,

				  int min_scale,

				  int min_scale,

				  int max_scale,

				  int max_scale,

				  bool can_position,

				  bool can_position,
@@ -163,6 +165,8 @@ int drm_plane_helper_check_update(struct drm_plane *plane, 
		return -EINVAL;

		return -EINVAL;

	}

	}





	drm_rect_rotate(src, fb->width << 16, fb->height << 16, rotation);



	/* Check scaling */

	/* Check scaling */

	hscale = drm_rect_calc_hscale(src, dest, min_scale, max_scale);

	hscale = drm_rect_calc_hscale(src, dest, min_scale, max_scale);

	vscale = drm_rect_calc_vscale(src, dest, min_scale, max_scale);

	vscale = drm_rect_calc_vscale(src, dest, min_scale, max_scale);
@@ -174,6 +178,9 @@ int drm_plane_helper_check_update(struct drm_plane *plane, 
	}

	}





	*visible = drm_rect_clip_scaled(src, dest, clip, hscale, vscale);

	*visible = drm_rect_clip_scaled(src, dest, clip, hscale, vscale);



	drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, rotation);



	if (!*visible)

	if (!*visible)

		/*

		/*

		 * Plane isn't visible; some drivers can handle this

		 * Plane isn't visible; some drivers can handle this
@@ -267,6 +274,7 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, 




	ret = drm_plane_helper_check_update(plane, crtc, fb,

	ret = drm_plane_helper_check_update(plane, crtc, fb,

					    &src, &dest, &clip,

					    &src, &dest, &clip,

					    BIT(DRM_ROTATE_0),

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    false, false, &visible);

					    false, false, &visible);

drivers/gpu/drm/drm_simple_kms_helper.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -105,6 +105,7 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, 
	ret = drm_plane_helper_check_update(plane, &pipe->crtc,

	ret = drm_plane_helper_check_update(plane, &pipe->crtc,

					    plane_state->fb,

					    plane_state->fb,

					    &src, &dest, &clip,

					    &src, &dest, &clip,

					    plane_state->rotation,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    false, true, &visible);

					    false, true, &visible);

drivers/gpu/drm/i915/intel_display.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -14102,6 +14102,7 @@ intel_check_primary_plane(struct drm_plane *plane, 




	return drm_plane_helper_check_update(plane, crtc, fb, &state->src,

	return drm_plane_helper_check_update(plane, crtc, fb, &state->src,

					     &state->dst, &state->clip,

					     &state->dst, &state->clip,

					     state->base.rotation,

					     min_scale, max_scale,

					     min_scale, max_scale,

					     can_position, true,

					     can_position, true,

					     &state->visible);

					     &state->visible);
@@ -14293,6 +14294,7 @@ intel_check_cursor_plane(struct drm_plane *plane, 




	ret = drm_plane_helper_check_update(plane, crtc, fb, &state->src,

	ret = drm_plane_helper_check_update(plane, crtc, fb, &state->src,

					    &state->dst, &state->clip,

					    &state->dst, &state->clip,

					    state->base.rotation,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    true, true, &state->visible);

					    true, true, &state->visible);

drivers/gpu/drm/mediatek/mtk_drm_plane.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -170,6 +170,7 @@ static int mtk_plane_atomic_check(struct drm_plane *plane, 




	return drm_plane_helper_check_update(plane, state->crtc, fb,

	return drm_plane_helper_check_update(plane, state->crtc, fb,

					     &src, &dest, &clip,

					     &src, &dest, &clip,

					     state->rotation,

					     DRM_PLANE_HELPER_NO_SCALING,

					     DRM_PLANE_HELPER_NO_SCALING,

					     DRM_PLANE_HELPER_NO_SCALING,

					     DRM_PLANE_HELPER_NO_SCALING,

					     true, true, &visible);

					     true, true, &visible);