[PATCH i-g-t v3 1/5] lib/chamelium/v3: Introduce the foundation for the Chamelium v3 wrapper

[Vignesh Raman]

Hi Louis,

On 22/10/24 22:01, Louis Chauvet wrote:
> Adds a build option to enable building the Chamelium v3 wrapper.
> 
> Signed-off-by: Louis Chauvet <louis.chauvet at bootlin.com>
> ---
>   lib/chamelium/v3/igt_chamelium.c |  9 +++++++++
>   lib/chamelium/v3/igt_chamelium.h |  8 ++++++++
>   lib/igt_kms.c                    |  8 ++++++++
>   lib/meson.build                  | 12 +++++++++++-
>   lib/tests/meson.build            |  4 ++++
>   meson.build                      | 15 ++++++++++++++-
>   meson_options.txt                |  4 ++++
>   tests/meson.build                | 25 +++++++++++++++++++++++++
>   8 files changed, 83 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/chamelium/v3/igt_chamelium.c b/lib/chamelium/v3/igt_chamelium.c
> new file mode 100644
> index 000000000000..152242998013
> --- /dev/null
> +++ b/lib/chamelium/v3/igt_chamelium.c
> @@ -0,0 +1,9 @@
> +// SPDX-License-Identifier: MIT
> +
> +#include <igt_core.h>
> +#include "igt_chamelium.h"
> +
> +void chamelium_v3_init(void)
> +{
> +	igt_info("Using chamelium v3\n");
> +}
> diff --git a/lib/chamelium/v3/igt_chamelium.h b/lib/chamelium/v3/igt_chamelium.h
> new file mode 100644
> index 000000000000..3195be2bc384
> --- /dev/null
> +++ b/lib/chamelium/v3/igt_chamelium.h
> @@ -0,0 +1,8 @@
> +/* SPDX-License-Identifier: MIT */
> +
> +#ifndef V3_IGT_CHAMELIUM_H
> +#define V3_IGT_CHAMELIUM_H
> +
> +void chamelium_v3_init(void);
> +
> +#endif //V3_IGT_CHAMELIUM_H
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 56003ceaf9dc..4d9df90e771f 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -2908,7 +2908,14 @@ void igt_display_require(igt_display_t *display, int drm_fd)
>   	if (!resources)
>   		goto out;
>   
> +/*
> + * FIXME: Dirty hack to avoid those lines when chamelium v3 is used
> + *
> + * Must be replaced with a configuration file information, so the end user can choose if the
> + * chamelium must be connected or not.
> + */
>   #ifdef HAVE_CHAMELIUM_V2
> +#ifndef HAVE_CHAMELIUM_V3
>   	{
>   		struct chamelium *chamelium;
>   
> @@ -2923,6 +2930,7 @@ void igt_display_require(igt_display_t *display, int drm_fd)
>   			chamelium_deinit_rpc_only(chamelium);
>   		}
>   	}
> +#endif
>   #endif
>   
>   	igt_require_f(resources->count_crtcs <= IGT_MAX_PIPES,
> diff --git a/lib/meson.build b/lib/meson.build
> index 5769f96fbdc1..8bcbd58bc0e6 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -195,7 +195,6 @@ if chamelium_v2.found()
>   		'chamelium/v2/igt_chamelium.c',
>   		'chamelium/v2/igt_chamelium_stream.c'
>   	]
> -	lib_sources += 'monitor_edids/monitor_edids_helper.c'
>   endif
>   
>   if build_xe_eudebug
> @@ -203,6 +202,17 @@ if build_xe_eudebug
>   	lib_sources += 'xe/xe_eudebug.c'
>   endif
>   
> +if chamelium_v3.found()
> +	lib_deps += chamelium_v3
> +	lib_sources += [
> +		'chamelium/v3/igt_chamelium.c',
> +	]
> +endif
> +
> +if chamelium_v2.found() or chamelium_v3.found()
> +	lib_sources += 'monitor_edids/monitor_edids_helper.c'
> +endif
> +
>   if libprocps.found()
>   	lib_deps += libprocps
>   else
> diff --git a/lib/tests/meson.build b/lib/tests/meson.build
> index fa7741b7be61..8a96cd73ee42 100644
> --- a/lib/tests/meson.build
> +++ b/lib/tests/meson.build
> @@ -41,6 +41,10 @@ if chamelium_v2.found()
>   	lib_tests += 'igt_audio'
>   endif
>   
> +if chamelium_v3.found()
> +	lib_deps += chamelium_v3
> +endif
> +
>   foreach lib_test : lib_tests
>   	exec = executable(lib_test, lib_test + '.c', install : false,
>   			dependencies : igt_deps)
> diff --git a/meson.build b/meson.build
> index b4b1026acb4c..d5d7b325eacd 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -87,6 +87,7 @@ foreach cc_arg : cc_args
>   endforeach
>   
>   build_chamelium_v2 = get_option('chamelium_v2')
> +build_chamelium_v3 = get_option('chamelium_v3')
>   build_docs = get_option('docs')
>   build_tests = not get_option('tests').disabled()
>   build_xe = not get_option('xe_driver').disabled()
> @@ -174,7 +175,7 @@ if not xmlrpc.found() and xmlrpc_cmd.found()
>   	endif
>   endif
>   
> -if build_chamelium_v2.enabled() and not (xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found())
> +if (build_chamelium_v2.enabled() or build_chamelium_v3.enabled()) and not (xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found())
>   	error('Chamelium build forced and required dependency xmlrpc not found')
>   endif
>   
> @@ -197,6 +198,18 @@ endif
>   
>   build_info += 'Build Chamelium v2 test: @0@'.format(chamelium_v2.found())

We need to add this for Chamelium v3 test also?

>   
> +
> +if xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() and libcurl.found()
> +	config.set('HAVE_CHAMELIUM_V3', 1)
> +	chamelium_v3 = declare_dependency(dependencies : [
> +										  xmlrpc,
> +										  xmlrpc_util,
> +										  xmlrpc_client,
> +									  ])
> +else
> +	chamelium_v3 = disabler()
> +endif
> +
>   pthreads = dependency('threads')
>   math = cc.find_library('m')
>   realtime = cc.find_library('rt')
> diff --git a/meson_options.txt b/meson_options.txt
> index 3a6edefba349..ebdb9976da1a 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -12,6 +12,10 @@ option('chamelium_v2',
>          type : 'feature',
>          description : 'Build Chamelium v2 test')
>   
> +option('chamelium_v3',
> +       type : 'feature',
> +       description : 'Build Chamelium v3 tests')
> +
>   option('valgrind',
>          type : 'feature',
>          description : 'Build with support for valgrind annotations')
> diff --git a/tests/meson.build b/tests/meson.build
> index 4eebe1838979..861101c2534e 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -340,6 +340,9 @@ chamelium_v2_progs = [
>   	'kms_chamelium_hpd',
>   ]
>   
> +chamelium_v3_progs = [
> +]
> +
>   test_deps = [ igt_deps ]
>   
>   if libdrm_nouveau.found()
> @@ -457,6 +460,28 @@ if chamelium_v2.found()
>   	test_deps += chamelium_v2
>   endif
>   
> +if chamelium_v3.found()
> +	foreach prog : chamelium_v3_progs
> +		testexe = executable(prog,
> +				 [join_paths('chamelium', 'v3', prog + '.c')],
> +				 dependencies : test_deps,
> +				 install_dir : libexecdir,
> +				 install_rpath : libexecdir_rpathdir,
> +				 install : true)
> +		test_list += prog
> +		test_executables += testexe
> +		name = prog.split('/').get(-1)
> +		if not meson.is_cross_build()
> +			testlist_files += custom_target(name + '.testlist',
> +				    build_by_default : true,
> +				    command : [testexe, '--show-testlist'],
> +				    capture : true,
> +				    output : name + '.testlist')
> +		endif
> +	endforeach
> +	test_deps += chamelium_v3
> +endif
> +
>   subdir('amdgpu')
>   
>   subdir('msm')
> 

Regards,
Vignesh