[PATCH i-g-t 10/19] lib/kms: Pass igt_crtc_t* to igt_max_bpc_constraint()

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Pass the igt_crtc_t* instead of the pipe to
igt_max_bpc_constraint(). All callers already have
the crtc around.

 #include "scripts/iterators.cocci"

@@
typedef igt_crtc_t;
identifier DISPLAY, PIPE;
@@
igt_max_bpc_constraint(igt_display_t *DISPLAY,
-	enum pipe PIPE,
+	igt_crtc_t *crtc,
	...)
{
<...
- PIPE
+ crtc->pipe
...>
}

@@
expression DISPLAY, PIPE;
@@
igt_max_bpc_constraint(DISPLAY,
-	PIPE,
+	igt_crtc_for_pipe(DISPLAY, PIPE),
	...)

@@
igt_crtc_t *CRTC;
@@
- igt_crtc_for_pipe(..., CRTC->pipe)
+ CRTC

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_kms.c      | 4 ++--
 lib/igt_kms.h      | 4 ++--
 tests/kms_color.c  | 2 +-
 tests/kms_dither.c | 4 +++-
 tests/kms_hdr.c    | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 2170e775b3a5..8855ba845ed2 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6699,7 +6699,7 @@ bool igt_check_output_bpc_equal(int drmfd, enum pipe pipe,
  *
  * Returns: True if suitable mode found to use requested bpc, else False.
  */
-bool igt_max_bpc_constraint(igt_display_t *display, enum pipe pipe,
+bool igt_max_bpc_constraint(igt_display_t *display, igt_crtc_t *crtc,
 			    igt_output_t *output, int bpc)
 {
 	drmModeConnector *connector = output->config.connector;
@@ -6717,7 +6717,7 @@ bool igt_max_bpc_constraint(igt_display_t *display, enum pipe pipe,
 					    display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY))
 			continue;
 
-		if (!igt_check_output_bpc_equal(display->drm_fd, pipe,
+		if (!igt_check_output_bpc_equal(display->drm_fd, crtc->pipe,
 						output->name, bpc))
 			continue;
 
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 2d1f14330617..9dc933d537ef 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -1262,8 +1262,8 @@ int sort_drm_modes_by_res_asc(const void *a, const void *b);
 void igt_sort_connector_modes(drmModeConnector *connector,
 		int (*comparator)(const void *, const void*));
 
-bool igt_max_bpc_constraint(igt_display_t *display, enum pipe pipe,
-		igt_output_t *output, int bpc);
+bool igt_max_bpc_constraint(igt_display_t *display, igt_crtc_t *crtc,
+			    igt_output_t *output, int bpc);
 int igt_get_max_dotclock(int fd);
 int igt_get_max_cdclk(int fd);
 int igt_get_current_cdclk(int fd);
diff --git a/tests/kms_color.c b/tests/kms_color.c
index 0008a15a05b4..a26225c1e99a 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -897,7 +897,7 @@ run_deep_color_tests_for_pipe(data_t *data, igt_crtc_t *crtc)
 				    crtc);
 
 		if (is_intel_device(data->drm_fd) &&
-		    !igt_max_bpc_constraint(&data->display, crtc->pipe, output, 10)) {
+		    !igt_max_bpc_constraint(&data->display, crtc, output, 10)) {
 			igt_info("Output %s: Doesn't support 10-bpc.\n",
 				 igt_output_name(output));
 			continue;
diff --git a/tests/kms_dither.c b/tests/kms_dither.c
index 347580e60f4e..fc6f794f5ea1 100644
--- a/tests/kms_dither.c
+++ b/tests/kms_dither.c
@@ -140,7 +140,9 @@ static void test_dithering(data_t *data, igt_crtc_t *crtc,
 	if (ret)
 		goto cleanup;
 
-	constraint = igt_max_bpc_constraint(display, crtc->pipe, output,
+	constraint = igt_max_bpc_constraint(display,
+					    crtc,
+					    output,
 					    output_bpc);
 	if (!constraint)
 		goto cleanup;
diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
index f677c6629430..d9d8a17adaf8 100644
--- a/tests/kms_hdr.c
+++ b/tests/kms_hdr.c
@@ -338,7 +338,7 @@ static void test_bpc_switch(data_t *data, uint32_t flags)
 				     crtc);
 
 			if (is_intel_device(data->fd) &&
-			    !igt_max_bpc_constraint(display, crtc->pipe, output, 10)) {
+			    !igt_max_bpc_constraint(display, crtc, output, 10)) {
 				igt_info("%s: No suitable mode found to use 10 bpc.\n",
 					 igt_output_name(output));
 
@@ -762,7 +762,7 @@ static void test_hdr(data_t *data, uint32_t flags)
 			}
 
 			if (is_intel_device(data->fd) &&
-			    !igt_max_bpc_constraint(display, crtc->pipe, output, 10)) {
+			    !igt_max_bpc_constraint(display, crtc, output, 10)) {
 				igt_info("%s: No suitable mode found to use 10 bpc.\n",
 					 igt_output_name(output));
 
-- 
2.52.0