Commit f2bf133f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: drop redundant plane dst check from dpu_crtc_atomic_check() 



The helper drm_atomic_helper_check_plane_state() already checks whether
the scaled and clipped plane falls into the CRTC visible region (and
clears plane_state->visible if it doesn't). Drop the redundant check
from dpu_crtc_atomic_check().

Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Abhinav Kumar <quic_abhinavk@quicinc.com> # sc7280
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/527343/
Link: https://lore.kernel.org/r/20230316161653.4106395-18-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent bbc2c7bd

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+0 −16
Original line number Diff line number Diff line
@@ -1157,11 +1157,9 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, 


	const struct drm_plane_state *pstate;

	struct drm_plane *plane;

	struct drm_display_mode *mode;



	int rc = 0;



	struct drm_rect crtc_rect = { 0 };

	bool needs_dirtyfb = dpu_crtc_needs_dirtyfb(crtc_state);



	if (!crtc_state->enable || !crtc_state->active) {
@@ -1172,7 +1170,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, 
		return 0;

	}



	mode = &crtc_state->adjusted_mode;

	DRM_DEBUG_ATOMIC("%s: check\n", dpu_crtc->name);



	/* force a full mode set if active state changed */
@@ -1182,13 +1179,9 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, 
	if (cstate->num_mixers)

		_dpu_crtc_setup_lm_bounds(crtc, crtc_state);



	crtc_rect.x2 = mode->hdisplay;

	crtc_rect.y2 = mode->vdisplay;



	/* FIXME: move this to dpu_plane_atomic_check? */

	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) {

		struct dpu_plane_state *dpu_pstate = to_dpu_plane_state(pstate);

		struct drm_rect dst, clip = crtc_rect;



		if (IS_ERR_OR_NULL(pstate)) {

			rc = PTR_ERR(pstate);
@@ -1201,15 +1194,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, 
			continue;



		dpu_pstate->needs_dirtyfb = needs_dirtyfb;



		dst = drm_plane_state_dest(pstate);

		if (!drm_rect_intersect(&clip, &dst)) {

			DPU_ERROR("invalid vertical/horizontal destination\n");

			DPU_ERROR("display: " DRM_RECT_FMT " plane: "

				  DRM_RECT_FMT "\n", DRM_RECT_ARG(&crtc_rect),

				  DRM_RECT_ARG(&dst));

			return -E2BIG;

		}

	}



	atomic_inc(&_dpu_crtc_get_kms(crtc)->bandwidth_ref);