[PATCH i-g-t 08/19] tests/kms: Stop using igt_require_pipe()

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

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

The few remaining tests that use igt_require_pipe() don't actually
need it since the callers already have a 'crtc' that they got
from for_each_crtc(), meaning it's always valid.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_kms.c                         | 12 +-----------
 lib/igt_kms.h                         | 13 -------------
 tests/chamelium/kms_chamelium_color.c |  2 --
 tests/kms_color.c                     |  2 --
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 94fa0680653b..b39e262303b5 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2813,17 +2813,7 @@ void igt_display_reset(igt_display_t *display)
 static void igt_fill_plane_format_mod(igt_display_t *display, igt_plane_t *plane);
 static void igt_fill_display_format_mod(igt_display_t *display);
 
-/**
- * igt_require_pipe:
- * @display: pointer to igt_display_t
- * @pipe: pipe which need to check
- *
- * Skip a (sub-)test if the pipe not valid.
- *
- * Should be used everywhere where a test checks pipe and skip
- * test when pipe is not valid.
- */
-void igt_require_pipe(igt_display_t *display, enum pipe pipe)
+static void igt_require_pipe(igt_display_t *display, enum pipe pipe)
 {
 	igt_skip_on_f(pipe >= igt_display_n_crtcs(display) || !igt_crtc_for_pipe(display, pipe)->valid,
 			"Pipe %s does not exist\n",
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index d6ebd40dd7be..86991da20de3 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -1242,19 +1242,6 @@ int igt_connector_sysfs_open(int drm_fd,
 uint32_t igt_reduce_format(uint32_t format);
 
 
-/*
- * igt_require_pipe:
- * @display: pointer to igt_display_t
- * @pipe: pipe which need to check
- *
- * Skip a (sub-)test if the pipe not valid.
- *
- * Should be used everywhere where a test checks pipe and skip
- * test when pipe is not valid.
- */
-void igt_require_pipe(igt_display_t *display,
-		enum pipe pipe);
-
 void igt_dump_connectors_fd(int drmfd);
 void igt_dump_crtcs_fd(int drmfd);
 bool igt_override_all_active_output_modes_to_fit_bw(igt_display_t *display);
diff --git a/tests/chamelium/kms_chamelium_color.c b/tests/chamelium/kms_chamelium_color.c
index 70dbedf82acc..e616ba438ae5 100644
--- a/tests/chamelium/kms_chamelium_color.c
+++ b/tests/chamelium/kms_chamelium_color.c
@@ -431,8 +431,6 @@ static bool test_pipe_limited_range_ctm(data_t *data,
 static void
 prep_pipe(data_t *data, igt_crtc_t *crtc)
 {
-	igt_require_pipe(&data->display, crtc->pipe);
-
 	if (igt_crtc_has_prop(crtc, IGT_CRTC_DEGAMMA_LUT_SIZE)) {
 		data->degamma_lut_size =
 			igt_crtc_get_prop(crtc,
diff --git a/tests/kms_color.c b/tests/kms_color.c
index fdc97d13dad6..0008a15a05b4 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -713,8 +713,6 @@ static void test_pipe_limited_range_ctm(data_t *data,
 static void
 prep_pipe(data_t *data, igt_crtc_t *crtc)
 {
-	igt_require_pipe(&data->display, crtc->pipe);
-
 	if (igt_crtc_has_prop(crtc, IGT_CRTC_DEGAMMA_LUT_SIZE)) {
 		data->degamma_lut_size =
 			igt_crtc_get_prop(crtc,
-- 
2.52.0