Re: [PATCH i-g-t v3 2/3] tests/intel/kms_pipe_stress: fix plane source crop and separate cursor loop

["Sharma, Swati2" <swati2.sharma@intel.com>]

Hi Sowmiya

Patch LGTM

Reviewed-by: Swati Sharma <swati2.sharma@intel.com>

On 06-07-2026 12:20 pm, Sowmiya S wrote:
> Pass 3/4 destination size as initial source crop to
> universal_plane_set_fb() to avoid an immediate
> downscale. Keep source in sync with igt_fb_set_size()
> in the reduction loop so the downscale ratio never
> exceeds the hardware limit (~3x).
>
> Move cursor handling out of the overlay loop into a
> dedicated second for_each_plane_on_crtc loop with a
> DRM_MODE_ATOMIC_TEST_ONLY commit. If the test commit
> rejects the cursor (e.g. unsupported format or modifier),
> disable it gracefully so the final commit with only overlay
> planes can succeed.
>
> v3: Rebase to latest (Swati)
>
> Signed-off-by: Sowmiya S <sowmiya.s@intel.com>
> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> ---
>   tests/intel/kms_pipe_stress.c | 110 +++++++++++++++++++++-------------
>   1 file changed, 68 insertions(+), 42 deletions(-)
>
> diff --git a/tests/intel/kms_pipe_stress.c b/tests/intel/kms_pipe_stress.c
> index 8724a674c..a84433b9d 100644
> --- a/tests/intel/kms_pipe_stress.c
> +++ b/tests/intel/kms_pipe_stress.c
> @@ -425,57 +425,83 @@ static int crtc_stress(struct data *data, igt_output_t *output,
>   	if (!data->num_planes[crtc->pipe] || !new_mode)
>   		return 0;
>   
> -	for_each_plane_on_crtc(crtc,
> -			       plane) {
> +	/* Set up overlay/primary planes up to the configured limit. */
> +	for_each_plane_on_crtc(crtc, plane) {
>   		int plane_width, plane_height;
> -		if (plane->type == DRM_PLANE_TYPE_CURSOR) {
> -			cursor_plane_set_fb(plane,
> -					    &data->cursor_fb[crtc->pipe],
> -					    cursor_width, cursor_height);
> -			plane_width = cursor_width;
> -			plane_height = cursor_height;
> -		} else {
> -			universal_plane_set_fb(plane,
> -					       &data->fb[crtc->pipe * MAX_PLANES + i],
> -					       mode->hdisplay, mode->vdisplay);
>   
> -			plane_width = (mode->hdisplay * 3) / 4;
> -			plane_height = (mode->vdisplay * 3) / 4;
> +		if (plane->type == DRM_PLANE_TYPE_CURSOR)
> +			continue;
>   
> -			ret = try_plane_scaling(data, plane, plane_width, plane_height);
> +		plane_width = (mode->hdisplay * 3) / 4;
> +		plane_height = (mode->vdisplay * 3) / 4;
>   
> -			while (ret) {
> -				if (plane_width <= cursor_width || plane_height <= cursor_height)
> -					break;
> +		/*
> +		 * Set the source crop to match the initial destination
> +		 * size (no upscaling).  Keeping source == destination
> +		 * prevents the downscale ratio from exceeding the
> +		 * hardware limit (~3×) when the destination is halved
> +		 * in the reduction loop below.
> +		 */
> +		universal_plane_set_fb(plane,
> +				       &data->fb[crtc->pipe * MAX_PLANES + i],
> +				       plane_width, plane_height);
>   
> -				plane_width /= 2;
> -				plane_height /= 2;
> +		ret = try_plane_scaling(data, plane, plane_width, plane_height);
>   
> -				ret = try_plane_scaling(data, plane, plane_width, plane_height);
> +		while (ret) {
> +			if (plane_width <= cursor_width || plane_height <= cursor_height)
> +				break;
>   
> -				igt_info("Reduced plane %d size to %dx%d\n",
> -					 plane->index, plane_width, plane_height);
> -			}
> -			if (ret) {
> -				igt_info("Plane %d pipe %d try commit failed, exiting\n", i,
> -					 crtc->pipe);
> -				data->num_planes[crtc->pipe] = i;
> -				igt_info("Max num planes for pipe %d set to %d\n",
> -					 crtc->pipe, i);
> -				/*
> -				 * We have now determined max amount of full sized planes, we will just
> -				 * keep it in mind and be smarter next time. Also lets remove unneeded fbs.
> -				 * Don't destroy cursor_fb as will take care about it at the end.
> -				 */
> +			plane_width /= 2;
> +			plane_height /= 2;
> +
> +			/* Keep source crop in sync with the reduced destination. */
> +			igt_fb_set_size(&data->fb[crtc->pipe * MAX_PLANES + i],
> +					plane, plane_width, plane_height);
> +
> +			ret = try_plane_scaling(data, plane, plane_width, plane_height);
> +
> +			igt_info("Reduced plane %d size to %dx%d\n",
> +				 plane->index, plane_width, plane_height);
> +		}
> +		if (ret) {
> +			igt_info("Plane %d pipe %d try commit failed, exiting\n", i,
> +				 crtc->pipe);
> +			data->num_planes[crtc->pipe] = i;
> +			igt_info("Max num planes for pipe %d set to %d\n",
> +				 crtc->pipe, i);
> +			/*
> +			 * We have now determined max amount of full sized planes, we will just
> +			 * keep it in mind and be smarter next time. Also lets remove unneeded fbs.
> +			 * Don't destroy cursor_fb as will take care about it at the end.
> +			 */
> +			igt_plane_set_fb(plane, NULL);
> +			cleanup_plane_fbs(data, crtc, i, MAX_PLANES);
> +		}
> +
> +		if (++i >= data->num_planes[crtc->pipe])
> +			break;
> +	}
> +
> +	/*
> +	 * Always attempt to enable the cursor plane.  First validate it with
> +	 * a TEST_ONLY commit: some format/modifier combinations (e.g.
> +	 * XRGB8888, 4-tiled) are not accepted by the cursor hardware.
> +	 * If the test commit rejects the cursor, gracefully disable it so
> +	 * the final actual commit with only overlay planes can succeed.
> +	 */
> +	for_each_plane_on_crtc(crtc, plane) {
> +		if (plane->type == DRM_PLANE_TYPE_CURSOR) {
> +			cursor_plane_set_fb(plane,
> +					    &data->cursor_fb[crtc->pipe],
> +					    cursor_width, cursor_height);
> +			if (igt_display_try_commit_atomic(&data->display,
> +							  DRM_MODE_ATOMIC_TEST_ONLY |
> +							  DRM_MODE_ATOMIC_ALLOW_MODESET, NULL)) {
>   				igt_plane_set_fb(plane, NULL);
> -				cleanup_plane_fbs(data,
> -						  crtc,
> -						  i,
> -						  MAX_PLANES);
> +				igt_info("Cursor fb not supported by hw (format/modifier), disabling\n");
>   			}
> -
> -			if (++i >= data->num_planes[crtc->pipe])
> -				break;
> +			break;
>   		}
>   	}
>