[i-g-t V5 2/8] lib/igt_kms: Update force joiner debugfs check

[B, Jeevan]

LGTM. 

Reviewed-by: Jeevan B <jeevan.b at intel.com>

> -----Original Message-----
> From: igt-dev <igt-dev-bounces at lists.freedesktop.org> On Behalf Of
> Bhanuprakash Modem
> Sent: Monday, April 29, 2024 2:39 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Modem, Bhanuprakash <bhanuprakash.modem at intel.com>; Joshi, Kunal1
> <kunal1.joshi at intel.com>
> Subject: [i-g-t V5 2/8] lib/igt_kms: Update force joiner debugfs check
> 
> As we are using only connector name in the API, no need to pass the igt_output
> struct, this patch will update the helper accordingly.
> 
> Cc: Kunal Joshi <kunal1.joshi at intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> ---
>  lib/igt_kms.c                | 14 +++++++++-----
>  lib/igt_kms.h                |  2 +-
>  tests/intel/kms_big_joiner.c |  2 +-
>  3 files changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 6a41b535b..743650321 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -6306,15 +6306,17 @@ bool bigjoiner_mode_found(int drm_fd,
> drmModeConnector *connector,  }
> 
>  /**
> + * igt_has_force_joiner_debugfs
> + * @drmfd: A drm file descriptor
> + * @conn_name: Name of the connector
> + *
>   * Checks if the force big joiner debugfs is available
>   * for a specific connector.
>   *
> - * @drmfd: file descriptor of the DRM device.
> - * @output: output to check.
>   * Returns:
>   *  true if the debugfs is available, false otherwise.
>   */
> -bool igt_has_force_joiner_debugfs(int drmfd, igt_output_t *output)
> +bool igt_has_force_joiner_debugfs(int drmfd, char *conn_name)
>  {
>  	char buf[512];
>  	int debugfs_fd, ret;
> @@ -6327,12 +6329,14 @@ bool igt_has_force_joiner_debugfs(int drmfd,
> igt_output_t *output)
>  	if (intel_display_ver(intel_get_drm_devid(drmfd)) < 13)
>  		return false;
> 
> -	igt_assert_f(output->name, "Connector name cannot be NULL\n");
> -	debugfs_fd = igt_debugfs_connector_dir(drmfd, output->name,
> O_RDONLY);
> +	igt_assert_f(conn_name, "Connector name cannot be NULL\n");
> +	debugfs_fd = igt_debugfs_connector_dir(drmfd, conn_name, O_RDONLY);
>  	if (debugfs_fd < 0)
>  		return false;
> +
>  	ret = igt_debugfs_simple_read(debugfs_fd,
> "i915_bigjoiner_force_enable", buf, sizeof(buf));
>  	close(debugfs_fd);
> +
>  	return ret >= 0;
>  }
> 
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 01604dac9..979cf1300 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -1215,7 +1215,7 @@ int igt_get_max_dotclock(int fd);  bool
> igt_bigjoiner_possible(drmModeModeInfo *mode, int max_dotclock);  bool
> bigjoiner_mode_found(int drm_fd, drmModeConnector *connector,
>  			  int max_dotclock, drmModeModeInfo *mode); -bool
> igt_has_force_joiner_debugfs(int drmfd, igt_output_t *output);
> +bool igt_has_force_joiner_debugfs(int drmfd, char *conn_name);
>  bool igt_check_bigjoiner_support(igt_display_t *display);  bool
> igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode);
> bool intel_pipe_output_combo_valid(igt_display_t *display); diff --git
> a/tests/intel/kms_big_joiner.c b/tests/intel/kms_big_joiner.c index
> 4979cac06..7c370bc60 100644
> --- a/tests/intel/kms_big_joiner.c
> +++ b/tests/intel/kms_big_joiner.c
> @@ -323,7 +323,7 @@ igt_main
> 
> 	data.big_joiner_output[data.big_joiner_output_count++] = output;
>  				igt_output_override_mode(output, &mode);
>  			} else {
> -				if (igt_has_force_joiner_debugfs(data.drm_fd,
> output)) {
> +				if (igt_has_force_joiner_debugfs(data.drm_fd,
> output->name)) {
>  					force_joiner_supported = true;
> 
> 	data.non_big_joiner_output[data.non_big_joiner_output_count++] =
> output;
>  				}
> --
> 2.43.2