[Intel-gfx] [PATCH i-g-t 2/4 v4] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.

[Chris Wilson]

On Fri, Oct 28, 2016 at 12:31:27PM +0300, Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad at intel.com>
> ---
>  lib/igt_gvt.c     | 42 +++++++++++++++++++++++++++++++++++-------
>  tests/gvt_basic.c |  2 +-
>  2 files changed, 36 insertions(+), 8 deletions(-)
> 
> diff --git a/lib/igt_gvt.c b/lib/igt_gvt.c
> index 8bbf9bd..d868cb3 100644
> --- a/lib/igt_gvt.c
> +++ b/lib/igt_gvt.c
> @@ -24,23 +24,26 @@
>  #include "igt.h"
>  #include "igt_gvt.h"
>  #include "igt_sysfs.h"
> +#include "igt_kmod.h"
>  
> +#include <signal.h>
>  #include <dirent.h>
>  #include <unistd.h>
>  #include <fcntl.h>
> +#include <time.h>
>  
>  static bool is_gvt_enabled(void)
>  {
>  	FILE *file;
> -	int value;
> +	char value;
>  	bool enabled = false;
>  
>  	file = fopen("/sys/module/i915/parameters/enable_gvt", "r");
>  	if (!file)
>  		return false;
>  
> -	if (fscanf(file, "%d", &value) == 1)
> -		enabled = value;
> +	if (fscanf(file, "%c", &value) == 1)
> +		enabled = (value == 'Y' ? true : false);
	enabled = value == 'Y';
else if (fscanf(file, "%d", &value) == 1)
	enabled = value;

Do I see a igt_kmod_parameter_get_boolean() in the future, I think I do!

>  	fclose(file);
>  
>  	errno = 0;
> @@ -50,9 +53,20 @@ static bool is_gvt_enabled(void)
>  static void unload_i915(void)
>  {
>  	kick_fbcon(false);
> -	/* pkill alsact */
>  
> -	igt_ignore_warn(system("/sbin/modprobe -s -r i915"));
> +
> +	if (igt_kmod_is_loaded("i915")) {
> +
> +		if (igt_kmod_is_loaded("snd_hda_intel")) {
> +			igt_assert(!igt_pkill(SIGTERM, "alsactl"));
> +			igt_assert(!igt_kmod_unload("snd_hda_intel", 0));
> +		}
> +
> +		igt_assert(!igt_kmod_unload("i915", 0));
> +		igt_assert(!igt_kmod_unload("drm_kms_helper", 0));
> +		igt_assert(!igt_kmod_unload("drm", 0));

But don't we already have this routine...

For this test, we shouldn't fail if we can't setup the environment as we
need, but skip the test.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre