From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB211C27C5F for ; Wed, 5 Jun 2024 14:30:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C1DF310E6FC; Wed, 5 Jun 2024 14:30:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="Uc0nXpby"; dkim-atps=neutral Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 761D410E277 for ; Wed, 5 Jun 2024 14:30:20 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6881440011; Wed, 5 Jun 2024 14:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1717597819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TWQD5SgGJVqUriqd7G70bN6eDvprYSQRAFoKH2vAac0=; b=Uc0nXpbykOKLMfkLDT/tT4cLdrvRQxYqsMLwxiKfCQY83JB2RL7ZWOZh3L66+W6FkuwNQS sDAmUyh8WSZwGaKOeN8N7usOsH9kAhL/BdB7bK1PB9eWp7chrKO7lShABc2aYE39OydkbI /YVe0GkYcYh3S9O1Y4IsHHk1AldAkv+FpYVHVfj5AvFocvYtsvxW2eHXOk0JXX5Dg7nNSZ /sm9vAOninN+iyeSzRhNh0JbyXDjDPCaROBxKQa0QkAI9LJBZOZKuThwnInElwFgwNtkDh xFgZX4Dg4RA0Grfu8puzcJyfivcBLU4NGKoCMgCNvs9HV8XE1Dmbs3jtE8SKXg== From: Louis Chauvet Date: Wed, 05 Jun 2024 16:30:15 +0200 Subject: [PATCH i-g-t RFC 03/13] lib/chamelium: Change build options to split chamelium v2 and v3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240605-dev-remove-static-ports-v1-3-665f25b7a4db@bootlin.com> References: <20240605-dev-remove-static-ports-v1-0-665f25b7a4db@bootlin.com> In-Reply-To: <20240605-dev-remove-static-ports-v1-0-665f25b7a4db@bootlin.com> To: igt-dev@lists.freedesktop.org, ihf@google.com, markyacoub@google.com, thomas.petazzoni@bootlin.com, Louis Chauvet X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=8500; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=Onrfmnfj0vvwgmJj154GB5d9uuFiJtd36qTfjTc3AWA=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmYHZ3MMrvPy9Lt5gwJ49vEbva+trS+EqXHfBDF CoQObCNz0qJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZmB2dwAKCRAgrS7GWxAs 4gzRD/sH3jbKnUtulJInff46aIJLOOxK8NG44szYHetDeZ4jTG3l14o0DSLL6y5j6fbbc9AdnNZ C2i1PlcJHaDJSaLPBuFC6ArOrM6vXPTf06gmJxUtp5df6u/RQj6jhAixcYH/KooXSJmsJjFswFJ fWWslNakpZOZ5RqGavFViIJErcgENHYyoICcfcpiS+1NdrMyNxyAbRmrbiTF/pckxelchJ3NBqy fa9V9pzFGxsSkIyfoQmR14goekujuj38VrTLVLponb8QvMO3GCzluq/GNEZiSdrr//SdowrnauV 6OS1oCQZPpZv48r+HijTi7qCOWz5ICOh/ik1WzNJHZjWroUQ7uInKNJJe6uUaef2a7qtr0Wggr9 bTTARVmilJUkWhhPElvTqL37IIsOuym9e4++jnEyh4tUUkoq2KfHVKTRhRrSgWjc+Qq1YudVFY4 hbUfIsxXChjXdEmlWAXRDOUo35q+ZYTuVJSb7ZRdBCzYam+gy/JFb5CFkLBTR3fDuRWgHGyfVty e/ulBWiyhBhOViRn0wvS/b8Dbp+FsRBYGQB9P2l4gQ2v/ECichqCucXA34F7iNKXCIJBE78tl7N tmLzV+vCADIQxm/wa9313KQXSJOQ/j6SI5K9EYZuCEVI2bVoOxOudB3mh1r/NFbmQGDeifAOkqA gSkRyLj3EYmF8KA== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Rename the Chamelium option to "chamelium_v2" to prepare for the introduction of the v3 wrapper. Additionally, rename the "HAVE_CHAMELIUM" define to avoid conflicts when the v3 is introduced. Signed-off-by: Louis Chauvet --- docs/testplan/meson.build | 4 ++-- lib/igt.h | 2 +- lib/igt_kms.c | 3 ++- lib/meson.build | 4 ++-- lib/tests/meson.build | 4 ++-- meson.build | 30 +++++++++++++++--------------- meson_options.txt | 4 ++-- tests/kms_color_helper.h | 2 +- tests/kms_feature_discovery.c | 4 ++-- tests/kms_tiled_display.c | 6 +++--- tests/meson.build | 8 ++++---- 11 files changed, 36 insertions(+), 35 deletions(-) diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build index 5560347f1337..f60c82ad139c 100644 --- a/docs/testplan/meson.build +++ b/docs/testplan/meson.build @@ -21,8 +21,8 @@ if build_tests build_info += 'Will Check if documentation is in sync with testlist' check_testlist = [ '--check-testlist', '--igt-build-path', build_root ] - if not chamelium.found() - warning('WARNING: Will not check if documentation is in sync for KMS as chamelium is disabled') + if not chamelium_v2.found() + warning('WARNING: Will not check if documentation is in sync for KMS as chamelium v2 is disabled') else kms_check_testlist = check_testlist endif diff --git a/lib/igt.h b/lib/igt.h index cf91e92eb2d4..390e59cd9b92 100644 --- a/lib/igt.h +++ b/lib/igt.h @@ -42,7 +42,7 @@ #include "igt_sizes.h" #include "igt_stats.h" #include "igt_dsc.h" -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 #include "igt_alsa.h" #include "igt_audio.h" #include "chamelium/v2/igt_chamelium.h" diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 4a61c3560999..fbb9c545e1b4 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -59,7 +59,7 @@ #include "igt_device.h" #include "igt_sysfs.h" #include "sw_sync.h" -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 #include "chamelium/v2/igt_chamelium.h" #endif @@ -2883,6 +2883,7 @@ void igt_display_require(igt_display_t *display, int drm_fd) goto out; #ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 { struct chamelium *chamelium; diff --git a/lib/meson.build b/lib/meson.build index 74080e339c19..accf9ff41222 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -187,8 +187,8 @@ if alsa.found() lib_sources += 'igt_alsa.c' endif -if chamelium.found() - lib_deps += chamelium +if chamelium_v2.found() + lib_deps += chamelium_v2 lib_sources += [ 'chamelium/v2/igt_chamelium.c', 'chamelium/v2/igt_chamelium_stream.c' diff --git a/lib/tests/meson.build b/lib/tests/meson.build index fa3d81de6cef..f98c948bc827 100644 --- a/lib/tests/meson.build +++ b/lib/tests/meson.build @@ -34,8 +34,8 @@ lib_fail_tests = [ lib_tests_deps = igt_deps -if chamelium.found() - lib_deps += chamelium +if chamelium_v2.found() + lib_deps += chamelium_v2 lib_tests += 'igt_audio' endif diff --git a/meson.build b/meson.build index ab44aadb1fdf..a6c8ddf6a128 100644 --- a/meson.build +++ b/meson.build @@ -86,7 +86,7 @@ foreach cc_arg : cc_args endif endforeach -build_chamelium = get_option('chamelium') +build_chamelium_v2 = get_option('chamelium_v2') build_docs = get_option('docs') build_tests = not get_option('tests').disabled() build_xe = not get_option('xe_driver').disabled() @@ -172,28 +172,28 @@ if not xmlrpc.found() and xmlrpc_cmd.found() endif endif -if build_chamelium.enabled() and not (xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found()) +if build_chamelium_v2.enabled() and not (xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found()) error('Chamelium build forced and required dependency xmlrpc not found') endif -gsl = dependency('gsl', required : build_chamelium) -alsa = dependency('alsa', required : build_chamelium) -libcurl = dependency('libcurl', required : build_chamelium) +gsl = dependency('gsl', required : build_chamelium_v2) +alsa = dependency('alsa', required : build_chamelium_v2) +libcurl = dependency('libcurl', required : build_chamelium_v2) if xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() and gsl.found() and alsa.found() and libcurl.found() - config.set('HAVE_CHAMELIUM', 1) - chamelium = declare_dependency(dependencies : [ - xmlrpc, - xmlrpc_util, - xmlrpc_client, - gsl, - alsa, - ]) + config.set('HAVE_CHAMELIUM_V2', 1) + chamelium_v2 = declare_dependency(dependencies : [ + xmlrpc, + xmlrpc_util, + xmlrpc_client, + gsl, + alsa, + ]) else - chamelium = disabler() + chamelium_v2 = disabler() endif -build_info += 'Build Chamelium test: @0@'.format(chamelium.found()) +build_info += 'Build Chamelium v2 test: @0@'.format(chamelium_v2.found()) pthreads = dependency('threads') math = cc.find_library('m') diff --git a/meson_options.txt b/meson_options.txt index 6a9493ea6ecd..fea91fb129aa 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,9 +8,9 @@ option('overlay_backends', choices : [ 'auto', 'x', 'xv' ], description : 'Overlay backends to enable') -option('chamelium', +option('chamelium_v2', type : 'feature', - description : 'Build Chamelium test') + description : 'Build Chamelium v2 test') option('valgrind', type : 'feature', diff --git a/tests/kms_color_helper.h b/tests/kms_color_helper.h index 23463b944b6f..910de27bf61f 100644 --- a/tests/kms_color_helper.h +++ b/tests/kms_color_helper.h @@ -57,7 +57,7 @@ typedef struct { uint32_t color_depth; uint64_t degamma_lut_size; uint64_t gamma_lut_size; - #ifdef HAVE_CHAMELIUM + #ifdef HAVE_CHAMELIUM_V2 struct chamelium *chamelium; struct chamelium_port **ports; int port_count; diff --git a/tests/kms_feature_discovery.c b/tests/kms_feature_discovery.c index edb0186361a8..76e958c84d51 100644 --- a/tests/kms_feature_discovery.c +++ b/tests/kms_feature_discovery.c @@ -35,7 +35,7 @@ */ #include "igt.h" -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 #include "chamelium/v2/igt_chamelium.h" #endif #include "igt_kms.h" @@ -140,7 +140,7 @@ igt_main { } } -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 igt_describe("Make sure that Chamelium is configured and reachable."); igt_subtest("chamelium") { struct chamelium *chamelium = diff --git a/tests/kms_tiled_display.c b/tests/kms_tiled_display.c index 3ffd6a9a4a2d..c541115c2c74 100644 --- a/tests/kms_tiled_display.c +++ b/tests/kms_tiled_display.c @@ -83,7 +83,7 @@ typedef struct { struct timeval first_ts; int linetime_us; -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 struct chamelium *chamelium; struct chamelium_port **ports; int port_count; @@ -408,7 +408,7 @@ static bool got_all_page_flips(data_t *data) return true; } -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 static void test_with_chamelium(data_t *data) { int i, count = 0; @@ -624,7 +624,7 @@ igt_main test_cleanup(&data); } -#ifdef HAVE_CHAMELIUM +#ifdef HAVE_CHAMELIUM_V2 igt_describe("Make sure the Tiled CRTCs are synchronized and we get " "page flips for all tiled CRTCs in one vblank (executes on chamelium)."); igt_subtest_f("basic-test-pattern-with-chamelium") { diff --git a/tests/meson.build b/tests/meson.build index 6063a02962a2..0b0a913bd878 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -326,7 +326,7 @@ msm_progs = [ 'msm_submitoverhead', ] -chamelium_progs = [ +chamelium_v2_progs = [ 'kms_chamelium_audio', 'kms_chamelium_color', 'kms_chamelium_edid', @@ -437,8 +437,8 @@ foreach prog : msm_progs test_list += prog endforeach -if chamelium.found() - foreach prog : chamelium_progs +if chamelium_v2.found() + foreach prog : chamelium_v2_progs testexe = executable(prog, [join_paths('chamelium', 'v2', prog + '.c')] + extra_sources.get(prog, []), dependencies : test_deps + extra_dependencies.get(prog, []), @@ -456,7 +456,7 @@ if chamelium.found() output : name + '.testlist') endif endforeach - test_deps += chamelium + test_deps += chamelium_v2 endif subdir('amdgpu') -- 2.43.2