Re: [PATCH i-g-t 2/2] lib/igt_kms: Drop the ioctl fallback for CRTC id to pipe mapping

["Ville Syrjälä" <ville.syrjala@linux.intel.com>]

On Thu, Nov 20, 2025 at 12:23:14PM +0200, Jani Nikula wrote:
> The kernel support for i915_pipe debugfs has been around for 2½ years in
> both i915 and xe. Drop the ioctl fallback for simplicity.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  lib/igt_kms.c | 42 ++++++++----------------------------------
>  1 file changed, 8 insertions(+), 34 deletions(-)
> 
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 0ff56653a4a7..714b851e8037 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -1193,24 +1193,15 @@ void kmstest_dump_mode(drmModeModeInfo *mode)
>  }
>  
>  /*
> - * With non-contiguous pipes display, crtc mapping is not always same
> - * as pipe mapping, In i915 pipe is enum id of i915's crtc object.
> - * hence allocating upper bound igt_pipe array to support non-contiguos
> - * pipe display and reading pipe enum for a crtc using GET_PIPE_FROM_CRTC_ID
> - * ioctl for a pipe to do pipe ordering with respect to crtc list.
> + * The hardware pipe may be different from the CRTC index. Figure out the CRTC
> + * index to pipe mapping from the debugfs.
>   */
> -static int __intel_get_pipe_from_crtc_id(int fd, int crtc_id, int crtc_idx)
> +static int __intel_get_pipe_from_crtc_index(int fd, int crtc_idx)
>  {
>  	char buf[2];
>  	int debugfs_fd, res = 0;
> +	char pipe;
>  
> -	/*
> -	 * No GET_PIPE_FROM_CRTC_ID ioctl support for XE. Instead read
> -	 * from the debugfs "i915_pipe".
> -	 *
> -	 * This debugfs is applicable for both i915 & XE. For i915, still
> -	 * we can fallback to ioctl method to support older kernels.
> -	 */
>  	debugfs_fd = igt_debugfs_pipe_dir(fd, crtc_idx, O_RDONLY);
>  
>  	if (debugfs_fd >= 0) {
> @@ -1218,26 +1209,11 @@ static int __intel_get_pipe_from_crtc_id(int fd, int crtc_id, int crtc_idx)
>  		close(debugfs_fd);
>  	}
>  
> -	if (res <= 0) {
> -		/* Fallback to older ioctl method. */
> -		if (is_i915_device(fd)) {
> -			struct drm_i915_get_pipe_from_crtc_id get_pipe;
> -
> -			get_pipe.pipe = 0;
> -			get_pipe.crtc_id =  crtc_id;
> +	igt_assert_f(res > 0, "Failed to read the debugfs i915_pipe.\n");
>  
> -			do_ioctl(fd, DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
> -				 &get_pipe);
> +	igt_assert_eq(sscanf(buf, "%c", &pipe), 1);
>  
> -			return get_pipe.pipe;
> -		} else
> -			igt_assert_f(false, "XE: Failed to read the debugfs i915_pipe.\n");
> -	} else {
> -		char pipe;
> -
> -		igt_assert_eq(sscanf(buf, "%c", &pipe), 1);
> -		return kmstest_pipe_to_index(pipe);
> -	}
> +	return kmstest_pipe_to_index(pipe);
>  }
>  
>  /**
> @@ -2985,9 +2961,7 @@ void igt_display_require(igt_display_t *display, int drm_fd)
>  
>  	for (i = 0; i < resources->count_crtcs; i++) {
>  		igt_pipe_t *pipe;
> -		int pipe_enum = (is_intel_dev)?
> -			__intel_get_pipe_from_crtc_id(drm_fd,
> -						      resources->crtcs[i], i) : i;
> +		int pipe_enum = is_intel_dev ? __intel_get_pipe_from_crtc_index(drm_fd, i) : i;
>  
>  		pipe = &display->pipes[pipe_enum];
>  		pipe->pipe = pipe_enum;

It looked to me like this thing also get directly fed into bunch of
places that expect a crtc index. So I suspect you need to change
this to be the index as well.

-- 
Ville Syrjälä
Intel