[PATCH i-g-t 0/4] lib/chamelium: Move chameliumv2 support in its own directory

Louis Chauvet louis.chauvet at bootlin.com
Tue Oct 22 14:49:32 UTC 2024


In preparation for the introduction of Chameleon v3, this series move 
the chamelium v2 support in its own folder.

Few rename are done to avoid confusion between chamelium v2 and chamelium 
v3 code.

This series have a small conflict with [1]. If you want to reverse the 
order of the series, let me know, I will resend a new iteration.

[1]: https://lore.kernel.org/all/20240828-b4-cv3-02-monitor-edids-v1-0-29c846bcf251@bootlin.com/

In addition, this series is in conflict with at least:
-https://lore.kernel.org/igt-dev/20241018035914.1740924-1-pranay.samala@intel.com
-https://lore.kernel.org/igt-dev/20241018190627.1367970-1-swati2.sharma@intel.com

Signed-off-by: Louis Chauvet <louis.chauvet at bootlin.com>
---
Louis Chauvet (4):
      tests/chamelium: Extract Chamelium v2 tests into a separate directory
      lib/chamelium/v2: Extract chamelium v2 wrapper into its own directory
      lib/chamelium/v2: Rename chamelium to chamelium_v2
      lib/chamelium/v2: Rename HAVE_CHAMELIUM to HAVE_CHAMELIUM_V2

 .gitlab-ci.yml                                  |  2 +-
 docs/testplan/meson.build                       |  4 ++--
 lib/{ => chamelium/v2}/igt_chamelium.c          |  2 +-
 lib/{ => chamelium/v2}/igt_chamelium.h          |  0
 lib/{ => chamelium/v2}/igt_chamelium_stream.c   |  2 +-
 lib/{ => chamelium/v2}/igt_chamelium_stream.h   |  0
 lib/igt.h                                       |  6 +++---
 lib/igt_kms.c                                   |  6 +++---
 lib/meson.build                                 |  9 ++++++---
 lib/monitor_edids/monitor_edids_helper.h        |  2 +-
 lib/tests/meson.build                           |  4 ++--
 meson.build                                     | 18 +++++++++---------
 meson_options.txt                               |  4 ++--
 tests/chamelium/{ => v2}/kms_chamelium_audio.c  |  0
 tests/chamelium/{ => v2}/kms_chamelium_color.c  |  0
 tests/chamelium/{ => v2}/kms_chamelium_edid.c   |  2 +-
 tests/chamelium/{ => v2}/kms_chamelium_frames.c |  0
 tests/chamelium/{ => v2}/kms_chamelium_helper.c |  0
 tests/chamelium/{ => v2}/kms_chamelium_helper.h |  0
 tests/chamelium/{ => v2}/kms_chamelium_hpd.c    |  0
 tests/kms_color_helper.h                        |  2 +-
 tests/kms_feature_discovery.c                   |  6 +++---
 tests/kms_tiled_display.c                       |  6 +++---
 tests/meson.build                               | 18 +++++++++---------
 24 files changed, 48 insertions(+), 45 deletions(-)
---
base-commit: 9b8c0f6da8898f760bfaa2113455eb84b68a69f4
change-id: 20240829-b4-cv3-03-cv2-split-473c924261e5
prerequisite-message-id: 20241022-b4-cv3-01-igt-kms-v2-0-8f654694b513 at bootlin.com
prerequisite-patch-id: 0562bbe57a0b489e7f46a51717c54ea26296cb8c
prerequisite-patch-id: a16d6fdd238eab5a91630d0934c9186669406fc7
prerequisite-patch-id: c7fcc64d709f283da748a0f9bbe3bd6143d76300
prerequisite-patch-id: 09fc5e2f569fa8287e767ceb353bc0a0f94ae2e1
prerequisite-patch-id: 63cf2f6323333bb8cbd0dbbd883b5c9fe373dea1
prerequisite-message-id: 20241022-b4-cv3-02-monitor-edids-v2-0-7634786c21e6 at bootlin.com
prerequisite-patch-id: 90ffdddeda6dd4cd2ae64e60fb31b0bbfee0250f
prerequisite-patch-id: d62e9d4981a68ac6e71544ab2a3dfec37dfa3299
prerequisite-patch-id: 3d898f58702cc303e18d3afc487e46f68641989b
prerequisite-patch-id: 57f5446073d42a01c29e6ff8a24f6609eedb49a1
prerequisite-patch-id: e6d6ee4ecd0e738a60091b19449c8622bb8bb6ae

Best regards,
-- 
Louis Chauvet <louis.chauvet at bootlin.com>



More information about the igt-dev mailing list