Commit 81af63a4 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Don't pass clip to drm_atomic_helper_check_plane_state() 



Move the plane clip rectangle handling into
drm_atomic_helper_check_plane_state(). Drivers no longer
have to worry about such mundane details.

v2: Convert armada, rcar, and sun4i as well
v3: Resolve simple_kms_helper conflict

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Suggested-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: Archit Taneja <architt@codeaurora.org> #msm
Link: https://patchwork.freedesktop.org/patch/msgid/20180123170857.13818-5-ville.syrjala@linux.intel.com


Acked-by: Liviu Dudau <liviu.dudau@arm.com> #hdlcd,malidp
Acked-by: Philipp Zabel <p.zabel@pengutronix.de> #imx,mtk
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com> #vmwgfx
Acked-by: Neil Armstrong <narmstrong@baylibre.com> #meson
Acked-by: Shawn Guo <shawnguo@kernel.org> #zte
parent bf817d0c

drivers/gpu/drm/arm/hdlcd_crtc.c

+1 −6
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = { 
static int hdlcd_plane_atomic_check(struct drm_plane *plane,

				    struct drm_plane_state *state)

{

	struct drm_rect clip = { 0 };

	struct drm_crtc_state *crtc_state;

	u32 src_h = state->src_h >> 16;
@@ -249,11 +248,7 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane, 
		return -EINVAL;

	}



	if (crtc_state->enable)

		drm_mode_get_hv_timing(&crtc_state->mode,

				       &clip.x2, &clip.y2);



	return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,

	return drm_atomic_helper_check_plane_state(state, crtc_state,

						   DRM_PLANE_HELPER_NO_SCALING,

						   DRM_PLANE_HELPER_NO_SCALING,

						   false, true);

drivers/gpu/drm/arm/malidp_planes.c

+1 −6
Original line number Diff line number Diff line
@@ -141,18 +141,13 @@ static int malidp_se_check_scaling(struct malidp_plane *mp, 
	struct drm_crtc_state *crtc_state =

		drm_atomic_get_existing_crtc_state(state->state, state->crtc);

	struct malidp_crtc_state *mc;

	struct drm_rect clip = { 0 };

	u32 src_w, src_h;

	int ret;



	if (!crtc_state)

		return -EINVAL;



	if (crtc_state->enable)

		drm_mode_get_hv_timing(&crtc_state->mode,

				       &clip.x2, &clip.y2);



	ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,

	ret = drm_atomic_helper_check_plane_state(state, crtc_state,

						  0, INT_MAX, true, true);

	if (ret)

		return ret;

drivers/gpu/drm/armada/armada_crtc.c

+2 −6
Original line number Diff line number Diff line
@@ -1203,15 +1203,11 @@ static int armada_drm_primary_update(struct drm_plane *plane, 
	struct drm_crtc_state crtc_state = {

		.crtc = crtc,

		.enable = crtc->enabled,

		.mode = crtc->mode,

	};

	struct drm_rect clip = {};

	int ret;



	if (crtc->enabled)

		drm_mode_get_hv_timing(&crtc->mode,

				       &clip.x2, &clip.y2);



	ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, &clip, 0,

	ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, 0,

						  INT_MAX, true, false);

	if (ret)

		return ret;

drivers/gpu/drm/armada/armada_overlay.c

+2 −6
Original line number Diff line number Diff line
@@ -208,19 +208,15 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, 
	struct drm_crtc_state crtc_state = {

		.crtc = crtc,

		.enable = crtc->enabled,

		.mode = crtc->mode,

	};

	struct drm_rect clip = {};

	int ret;



	trace_armada_ovl_plane_update(plane, crtc, fb,

				 crtc_x, crtc_y, crtc_w, crtc_h,

				 src_x, src_y, src_w, src_h);



	if (crtc->enabled)

		drm_mode_get_hv_timing(&crtc->mode,

				       &clip.x2, &clip.y2);



	ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, &clip, 0,

	ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, 0,

						  INT_MAX, true, false);

	if (ret)

		return ret;

drivers/gpu/drm/drm_atomic_helper.c

+7 −5
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ EXPORT_SYMBOL(drm_atomic_helper_check_modeset); 
 * drm_atomic_helper_check_plane_state() - Check plane state for validity

 * @plane_state: plane state to check

 * @crtc_state: crtc state to check

 * @clip: integer clipping coordinates

 * @min_scale: minimum @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
@@ -719,7 +718,6 @@ EXPORT_SYMBOL(drm_atomic_helper_check_modeset); 
 */

int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,

					const struct drm_crtc_state *crtc_state,

					const struct drm_rect *clip,

					int min_scale,

					int max_scale,

					bool can_position,
@@ -729,6 +727,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
	struct drm_rect *src = &plane_state->src;

	struct drm_rect *dst = &plane_state->dst;

	unsigned int rotation = plane_state->rotation;

	struct drm_rect clip = {};

	int hscale, vscale;



	WARN_ON(plane_state->crtc && plane_state->crtc != crtc_state->crtc);
@@ -764,7 +763,10 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
		return -ERANGE;

	}



	plane_state->visible = drm_rect_clip_scaled(src, dst, clip, hscale, vscale);

	if (crtc_state->enable)

		drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);



	plane_state->visible = drm_rect_clip_scaled(src, dst, &clip, hscale, vscale);



	drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, rotation);
@@ -778,10 +780,10 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
		 */

		return 0;



	if (!can_position && !drm_rect_equals(dst, clip)) {

	if (!can_position && !drm_rect_equals(dst, &clip)) {

		DRM_DEBUG_KMS("Plane must cover entire CRTC\n");

		drm_rect_debug_print("dst: ", dst, false);

		drm_rect_debug_print("clip: ", clip, false);

		drm_rect_debug_print("clip: ", &clip, false);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE