[i-g-t,5/5] lib/kms: Enable outputs by default in igt_require_display

Submitted by Daniel Vetter on Nov. 22, 2018, 9:37 a.m.

Details

Message ID 20181122093700.31211-5-daniel.vetter@ffwll.ch
State Accepted
Series "Series without cover letter"
Commit 4579ac1d445cf39f6de474071b20db790db575bd
Headers show

Commit Message

Daniel Vetter Nov. 22, 2018, 9:37 a.m.
More testing, automatically when using the high-level kms helpers!

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 lib/igt_kms.c                | 6 +++++-
 tests/kms_invalid_dotclock.c | 1 -
 tests/kms_pipe_crc_basic.c   | 2 --
 3 files changed, 5 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 73cea75d19f0..be5a5bbbf92d 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2035,7 +2035,11 @@  void igt_display_require(igt_display_t *display, int drm_fd)
 out:
 	LOG_UNINDENT(display);
 
-	igt_require(display->n_pipes && display->n_outputs);
+	if (display->n_pipes && display->n_outputs)
+		igt_enable_connectors(drm_fd);
+	else
+		igt_skip("No KMS driver or no outputs, pipes: %d, outputs: %d\n",
+			 display->n_pipes, display->n_outputs);
 }
 
 /**
diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c
index 8c4c3122bec1..275007df942d 100644
--- a/tests/kms_invalid_dotclock.c
+++ b/tests/kms_invalid_dotclock.c
@@ -131,7 +131,6 @@  igt_simple_main
 	data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 	igt_require_intel(data.drm_fd);
 
-	igt_enable_connectors(data.drm_fd);
 	kmstest_set_vt_graphics_mode();
 
 	igt_display_require(&data.display, data.drm_fd);
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 5bc0952fca3d..60802848d3ee 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -181,8 +181,6 @@  igt_main
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 
-		igt_enable_connectors(data.drm_fd);
-
 		kmstest_set_vt_graphics_mode();
 
 		igt_require_pipe_crc(data.drm_fd);

Comments

Daniel Vetter Nov. 29, 2018, 5:18 p.m.
On Thu, Nov 22, 2018 at 10:37:00AM +0100, Daniel Vetter wrote:
> More testing, automatically when using the high-level kms helpers!
> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Ping.

Maarten: I didn't really get your comment on irc that it would be nice to
do this natively in igt_display ...
-Daniel

> ---
>  lib/igt_kms.c                | 6 +++++-
>  tests/kms_invalid_dotclock.c | 1 -
>  tests/kms_pipe_crc_basic.c   | 2 --
>  3 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 73cea75d19f0..be5a5bbbf92d 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -2035,7 +2035,11 @@ void igt_display_require(igt_display_t *display, int drm_fd)
>  out:
>  	LOG_UNINDENT(display);
>  
> -	igt_require(display->n_pipes && display->n_outputs);
> +	if (display->n_pipes && display->n_outputs)
> +		igt_enable_connectors(drm_fd);
> +	else
> +		igt_skip("No KMS driver or no outputs, pipes: %d, outputs: %d\n",
> +			 display->n_pipes, display->n_outputs);
>  }
>  
>  /**
> diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c
> index 8c4c3122bec1..275007df942d 100644
> --- a/tests/kms_invalid_dotclock.c
> +++ b/tests/kms_invalid_dotclock.c
> @@ -131,7 +131,6 @@ igt_simple_main
>  	data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
>  	igt_require_intel(data.drm_fd);
>  
> -	igt_enable_connectors(data.drm_fd);
>  	kmstest_set_vt_graphics_mode();
>  
>  	igt_display_require(&data.display, data.drm_fd);
> diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
> index 5bc0952fca3d..60802848d3ee 100644
> --- a/tests/kms_pipe_crc_basic.c
> +++ b/tests/kms_pipe_crc_basic.c
> @@ -181,8 +181,6 @@ igt_main
>  	igt_fixture {
>  		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>  
> -		igt_enable_connectors(data.drm_fd);
> -
>  		kmstest_set_vt_graphics_mode();
>  
>  		igt_require_pipe_crc(data.drm_fd);
> -- 
> 2.19.1
>