* [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API
@ 2023-10-19 21:22 Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 1/8] lib/drmtest: Add is_vkms_device() Harry Wentland
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
This series introduces support for
* drm_colorop DRM objects
* COLOR_PIPELINE plane property
Kernel changes:
https://gitlab.freedesktop.org/hwentland/linux/-/merge_requests/5
libdrm changes:
https://gitlab.freedesktop.org/hwentland/drm/-/merge_requests/1
It also adds a new kms_colorop test case that tests the color pipeline
API. The tests are designed to be easily extensible with a "transform"
and "compare" function pointer for each test. The "transform" function
performs the transformations under test via SW routines. The "compare"
function compares the DRM/KMS result (via a writeback connector) with
the result derived via the SW "transform".
Currently there are three tests:
- plane-srgb_eotf: pre-blending sRGB EOTF
- plane-srgb_inv_eotf: pre-blending sRGB Inverse EOTF
- plane-srgb_eotf-srgb_inv_eotf: pre-blending sRGB EOTF,
followed by its inverse
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
Harry Wentland (8):
lib/drmtest: Add is_vkms_device()
include/drm-uapi: Add COLOROP object
lib/igt_kms: Introduce drm_colorop object
lib/igt_kms: Add new COLOR PIPELINE plane property
tests/kms_properties: Add colorop properties test
igt/color: Add SW color transform functionality
lib/igt_fb: Add copy_fb function
tests/kms_colorop: Add kms_colorop tests
include/drm-uapi/drm_mode.h | 1 +
lib/drmtest.c | 5 +
lib/drmtest.h | 1 +
lib/igt_color.c | 312 ++++++++++++++++++++++
lib/igt_color.h | 105 ++++++++
lib/igt_fb.c | 40 ++-
lib/igt_fb.h | 3 +
lib/igt_kms.c | 242 ++++++++++++++++-
lib/igt_kms.h | 101 +++++++
lib/meson.build | 1 +
tests/kms_colorop.c | 507 ++++++++++++++++++++++++++++++++++++
tests/kms_colorop.h | 87 +++++++
tests/kms_properties.c | 67 +++++
tests/meson.build | 1 +
14 files changed, 1468 insertions(+), 5 deletions(-)
create mode 100644 lib/igt_color.c
create mode 100644 lib/igt_color.h
create mode 100644 tests/kms_colorop.c
create mode 100644 tests/kms_colorop.h
--
2.42.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 1/8] lib/drmtest: Add is_vkms_device()
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
@ 2023-10-19 21:22 ` Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 2/8] include/drm-uapi: Add COLOROP object Harry Wentland
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
lib/drmtest.c | 5 +++++
lib/drmtest.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index e1da66c877e9..7ffd238bf499 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -106,6 +106,11 @@ static bool __is_device(int fd, const char *expect)
return strcmp(expect, name) == 0;
}
+bool is_vkms_device(int fd)
+{
+ return __is_device(fd, "vkms");
+}
+
bool is_amdgpu_device(int fd)
{
return __is_device(fd, "amdgpu");
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 97ab6e759edf..eab8bc0b591f 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -116,6 +116,7 @@ void igt_require_nouveau(int fd);
void igt_require_vc4(int fd);
void igt_require_xe(int fd);
+bool is_vkms_device(int fd);
bool is_amdgpu_device(int fd);
bool is_i915_device(int fd);
bool is_mtk_device(int fd);
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 2/8] include/drm-uapi: Add COLOROP object
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 1/8] lib/drmtest: Add is_vkms_device() Harry Wentland
@ 2023-10-19 21:22 ` Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 3/8] lib/igt_kms: Introduce drm_colorop object Harry Wentland
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
include/drm-uapi/drm_mode.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
index e4a2570a6058..e7e56150616b 100644
--- a/include/drm-uapi/drm_mode.h
+++ b/include/drm-uapi/drm_mode.h
@@ -626,6 +626,7 @@ struct drm_mode_connector_set_property {
#define DRM_MODE_OBJECT_FB 0xfbfbfbfb
#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb
#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee
+#define DRM_MODE_OBJECT_COLOROP 0xfafafafa
#define DRM_MODE_OBJECT_ANY 0
struct drm_mode_obj_get_properties {
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 3/8] lib/igt_kms: Introduce drm_colorop object
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 1/8] lib/drmtest: Add is_vkms_device() Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 2/8] include/drm-uapi: Add COLOROP object Harry Wentland
@ 2023-10-19 21:22 ` Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 4/8] lib/igt_kms: Add new COLOR PIPELINE plane property Harry Wentland
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
We've introduced a new drm_colorop object in DRM. These are
used to make up a color pipeline. Introduce the concept of
this new DRM core object to IGT, including:
- discovery of drm_colorop objects during init
- various helper functions for deaing with drm_colorops
- handling drm_colorops in atomic commit
v2:
- Iterate through all next drm_colorop objects
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
lib/igt_kms.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++++-
lib/igt_kms.h | 91 ++++++++++++++++++++++++
2 files changed, 278 insertions(+), 2 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 53f9ff19ff95..cd36e778bae7 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -618,6 +618,13 @@ const char * const igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = {
[IGT_PLANE_SCALING_FILTER] = "SCALING_FILTER",
};
+const char * const igt_colorop_prop_names[IGT_NUM_COLOROP_PROPS] = {
+ [IGT_COLOROP_TYPE] = "TYPE",
+ [IGT_COLOROP_BYPASS] = "BYPASS",
+ [IGT_COLOROP_CURVE_1D_TYPE] = "CURVE_1D_TYPE",
+ [IGT_COLOROP_NEXT] = "NEXT",
+};
+
const char * const igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {
[IGT_CRTC_CTM] = "CTM",
[IGT_CRTC_GAMMA_LUT] = "GAMMA_LUT",
@@ -683,6 +690,21 @@ igt_plane_rotations(igt_display_t *display, igt_plane_t *plane,
return rotations;
}
+igt_colorop_t *igt_find_colorop(igt_display_t *display, uint32_t id)
+{
+ int i;
+
+ /* find corresponding igt_colorop */
+ for (i = 0; i < display->n_colorops; ++i) {
+ igt_colorop_t *colorop = &display->colorops[i];
+
+ if (colorop->drm_colorop->colorop_id == id)
+ return colorop;
+ }
+
+ return NULL;
+}
+
/*
* Retrieve all the properies specified in props_name and store them into
* plane->props.
@@ -723,6 +745,40 @@ igt_fill_plane_props(igt_display_t *display, igt_plane_t *plane,
drmModeFreeObjectProperties(props);
}
+/*
+ * Retrieve all the properies specified in props_name and store them into
+ * colorop->props.
+ */
+static void
+igt_fill_colorop_props(igt_display_t *display, igt_colorop_t *colorop,
+ int num_props, const char * const prop_names[])
+{
+ drmModeObjectPropertiesPtr props;
+ int i, j, fd;
+
+ fd = display->drm_fd;
+
+ props = drmModeObjectGetProperties(fd, colorop->drm_colorop->colorop_id, DRM_MODE_OBJECT_COLOROP);
+ igt_assert(props);
+
+ for (i = 0; i < props->count_props; i++) {
+ drmModePropertyPtr prop =
+ drmModeGetProperty(fd, props->props[i]);
+
+ for (j = 0; j < num_props; j++) {
+ if (strcmp(prop->name, prop_names[j]) != 0)
+ continue;
+
+ colorop->props[j] = props->props[i];
+ break;
+ }
+
+ drmModeFreeProperty(prop);
+ }
+
+ drmModeFreeObjectProperties(props);
+}
+
/*
* Retrieve all the properies specified in props_name and store them into
* config->atomic_props_crtc and config->atomic_props_connector.
@@ -2627,7 +2683,8 @@ void igt_display_require(igt_display_t *display, int drm_fd)
{
drmModeRes *resources;
drmModePlaneRes *plane_resources;
- int i;
+ drmModeColoropRes *colorop_resources;
+ int i, j;
bool is_intel_dev;
memset(display, 0, sizeof(igt_display_t));
@@ -2712,17 +2769,47 @@ void igt_display_require(igt_display_t *display, int drm_fd)
drmModeFreePlaneResources(plane_resources);
+ /* get all colorop resources */
+ colorop_resources = drmModeGetColoropResources(display->drm_fd);
+
+ if (colorop_resources) {
+ display->n_colorops = colorop_resources->count_colorops;
+ display->colorops = calloc(sizeof(igt_colorop_t), display->n_colorops);
+ igt_assert_f(display->colorops, "Failed to allocate memory for %d colorops\n", display->n_colorops);
+
+ for (i = 0; i < colorop_resources->count_colorops; ++i) {
+ igt_colorop_t *colorop = &display->colorops[i];
+ uint32_t id = colorop_resources->colorops[i];
+
+ colorop->drm_colorop = drmModeGetColorop(display->drm_fd, id);
+ igt_assert(colorop->drm_colorop);
+
+ igt_fill_colorop_props(display, colorop, IGT_NUM_COLOROP_PROPS, igt_colorop_prop_names);
+
+ for (j = 0; j < display->n_planes; ++j)
+ if (display->planes[j].drm_plane->plane_id == colorop->drm_colorop->plane_id)
+ colorop->plane = &display->planes[j];
+
+ }
+
+
+
+ drmModeFreeColoropResources(colorop_resources);
+ }
+
+
for_each_pipe(display, i) {
igt_pipe_t *pipe = &display->pipes[i];
igt_plane_t *plane;
int p = 1, crtc_mask = 0;
- int j, type;
+ int type;
uint8_t last_plane = 0, n_planes = 0;
pipe->display = display;
pipe->plane_cursor = -1;
pipe->plane_primary = -1;
pipe->planes = NULL;
+ pipe->colorops = NULL;
pipe->num_primary_planes = 0;
igt_fill_pipe_props(display, pipe, IGT_NUM_CRTC_PROPS, igt_crtc_prop_names);
@@ -3000,6 +3087,15 @@ void igt_display_fini(igt_display_t *display)
{
int i;
+ for (i = 0; i < display->n_colorops; ++i) {
+ igt_colorop_t *colorop = &display->colorops[i];
+
+ if (colorop->drm_colorop) {
+ drmModeFreeColorop(colorop->drm_colorop);
+ colorop->drm_colorop = NULL;
+ }
+ }
+
for (i = 0; i < display->n_planes; ++i) {
igt_plane_t *plane = &display->planes[i];
@@ -3335,6 +3431,48 @@ igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_pipe_t *pipe,
}
}
+
+/*
+ * Add colorop properties
+ */
+static void
+igt_atomic_prepare_colorop_commit(igt_colorop_t *colorop, igt_pipe_t *pipe,
+ drmModeAtomicReq *req)
+{
+ igt_display_t *display = pipe->display;
+ int i, next_val;
+
+ while (colorop) {
+ igt_assert(colorop->drm_colorop);
+
+ LOG(display,
+ "populating colorop data: %s.%d\n",
+ kmstest_pipe_name(pipe->pipe),
+ colorop->drm_colorop->colorop_id);
+
+ for (i = 0; i < IGT_NUM_COLOROP_PROPS; i++) {
+ if (!igt_colorop_is_prop_changed(colorop, i))
+ continue;
+
+ /* it's an error to try an unsupported feature */
+ igt_assert(colorop->props[i]);
+
+ igt_debug("colorop %s.%d: Setting property \"%s\" to 0x%"PRIx64"/%"PRIi64"\n",
+ kmstest_pipe_name(pipe->pipe), colorop->drm_colorop->colorop_id, igt_colorop_prop_names[i],
+ colorop->values[i], colorop->values[i]);
+
+ igt_assert_lt(0, drmModeAtomicAddProperty(req, colorop->drm_colorop->colorop_id,
+ colorop->props[i],
+ colorop->values[i]));
+ }
+
+ /* get next colorop */
+ next_val = igt_colorop_get_prop(display, colorop,
+ IGT_COLOROP_NEXT);
+ colorop = igt_find_colorop(display, next_val);
+ }
+}
+
/*
* Properties that can be changed through legacy SetProperty:
* - Obviously not the XYWH SRC/CRTC coordinates.
@@ -3782,6 +3920,25 @@ uint64_t igt_plane_get_prop(igt_plane_t *plane, enum igt_atomic_plane_properties
plane->drm_plane->plane_id, plane->props[prop]);
}
+/**
+ * igt_colorop_get_prop:
+ * @colorop: Target colorop.
+ * @prop: Property to check.
+ *
+ * Return current value on a colorop for a given property.
+ *
+ * Returns: The value the property is set to, if this
+ * is a blob, the blob id is returned. This can be passed
+ * to drmModeGetPropertyBlob() to get the contents of the blob.
+ */
+uint64_t igt_colorop_get_prop(igt_display_t *display, igt_colorop_t *colorop, enum igt_atomic_colorop_properties prop)
+{
+ igt_assert(igt_colorop_has_prop(colorop, prop));
+
+ return igt_mode_object_get_prop(display, DRM_MODE_OBJECT_COLOROP,
+ colorop->drm_colorop->colorop_id, colorop->props[prop]);
+}
+
static bool igt_mode_object_get_prop_enum_value(int drm_fd, uint32_t id, const char *str, uint64_t *val)
{
drmModePropertyPtr prop = drmModeGetProperty(drm_fd, id);
@@ -3824,6 +3981,34 @@ void igt_plane_set_prop_enum(igt_plane_t *plane,
igt_assert(igt_plane_try_prop_enum(plane, prop, val));
}
+bool igt_colorop_try_prop_enum(igt_display_t *display,
+ igt_colorop_t *colorop,
+ enum igt_atomic_colorop_properties prop,
+ const char *val)
+{
+ uint64_t uval;
+
+ igt_assert(colorop->props[prop]);
+
+ if (!igt_mode_object_get_prop_enum_value(display->drm_fd,
+ colorop->props[prop], val, &uval))
+ return false;
+
+ igt_colorop_set_prop_value(colorop, prop, uval);
+ return true;
+}
+
+void igt_colorop_set_prop_enum(igt_display_t *display,
+ igt_colorop_t *colorop,
+ enum igt_atomic_colorop_properties prop,
+ const char *val)
+{
+ bool result = false;
+ result = igt_colorop_try_prop_enum(display, colorop, prop, val);
+ igt_assert(result);
+}
+
+
/**
* igt_plane_replace_prop_blob:
* @plane: plane to set property on.
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 356620dc688f..c6402979d10f 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -329,6 +329,19 @@ enum igt_atomic_plane_properties {
IGT_NUM_PLANE_PROPS
};
+enum igt_atomic_colorop_properties {
+ IGT_COLOROP_TYPE,
+ IGT_COLOROP_BYPASS,
+ IGT_COLOROP_CURVE_1D_TYPE,
+ IGT_COLOROP_NEXT,
+ IGT_NUM_COLOROP_PROPS
+};
+
+/* TODO move to libdrm header?? */
+enum drm_colorop_type {
+ DRM_COLOROP_1D_CURVE
+};
+
/**
* igt_plane_prop_names
*
@@ -337,6 +350,14 @@ enum igt_atomic_plane_properties {
*/
extern const char * const igt_plane_prop_names[];
+/**
+ * igt_colorop_prop_names
+ *
+ * igt_colorop_prop_names contains a list of colorop property names,
+ * as indexed by the igt_atomic_colorop_properties enum.
+ */
+extern const char * const igt_colorop_prop_names[];
+
typedef struct igt_display igt_display_t;
typedef struct igt_pipe igt_pipe_t;
typedef uint32_t igt_fixed_t; /* 16.16 fixed point */
@@ -359,6 +380,24 @@ static inline bool igt_rotation_90_or_270(igt_rotation_t rotation)
return rotation & (IGT_ROTATION_90 | IGT_ROTATION_270);
}
+typedef struct igt_plane igt_plane_t;
+
+typedef struct igt_colorop {
+ /*< private >*/
+ igt_pipe_t *pipe;
+
+ drmModeColorop *drm_colorop;
+
+ igt_plane_t *plane;
+
+ char name[DRM_PROP_NAME_LEN];
+
+ uint64_t changed;
+ uint32_t props[IGT_NUM_COLOROP_PROPS];
+ uint64_t values[IGT_NUM_COLOROP_PROPS];
+
+} igt_colorop_t;
+
typedef struct igt_plane {
/*< private >*/
igt_pipe_t *pipe;
@@ -412,6 +451,7 @@ struct igt_pipe {
int plane_cursor;
int plane_primary;
igt_plane_t *planes;
+ igt_colorop_t *colorops;
uint64_t changed;
uint32_t props[IGT_NUM_CRTC_PROPS];
@@ -450,9 +490,11 @@ struct igt_display {
int log_shift;
int n_pipes;
int n_planes;
+ int n_colorops;
int n_outputs;
igt_output_t *outputs;
igt_plane_t *planes;
+ igt_colorop_t *colorops;
igt_pipe_t *pipes;
bool has_cursor_plane;
bool is_atomic;
@@ -731,6 +773,53 @@ extern void igt_plane_set_prop_enum(igt_plane_t *plane,
enum igt_atomic_plane_properties prop,
const char *val);
+
+
+extern bool igt_plane_is_valid_colorop(igt_plane_t *plane, igt_colorop_t *colorop);
+
+/**
+ * igt_colorop_has_prop:
+ * @colorop: colorop to check.
+ * @prop: Property to check.
+ *
+ * Check whether colorop supports a given property.
+ *
+ * Returns: True if the property is supported, otherwise false.
+ */
+static inline bool
+igt_colorop_has_prop(igt_colorop_t *colorop, enum igt_atomic_colorop_properties prop)
+{
+ return colorop->props[prop];
+}
+
+uint64_t igt_colorop_get_prop(igt_display_t *display, igt_colorop_t *colorop, enum igt_atomic_colorop_properties prop);
+
+#define igt_colorop_is_prop_changed(colorop, prop) \
+ (!!((colorop)->changed & (1 << (prop))))
+
+#define igt_colorop_set_prop_changed(colorop, prop) \
+ (colorop)->changed |= 1 << (prop)
+
+#define igt_colorop_clear_prop_changed(colorop, prop) \
+ (colorop)->changed &= ~(1 << (prop))
+
+#define igt_colorop_set_prop_value(colorop, prop, value) \
+ do { \
+ colorop->values[prop] = value; \
+ igt_colorop_set_prop_changed(colorop, prop); \
+ } while (0)
+
+
+extern bool igt_colorop_try_prop_enum(igt_display_t *display,
+ igt_colorop_t *colorop,
+ enum igt_atomic_colorop_properties prop,
+ const char *val);
+
+extern void igt_colorop_set_prop_enum(igt_display_t *display,
+ igt_colorop_t *colorop,
+ enum igt_atomic_colorop_properties prop,
+ const char *val);
+
extern void igt_plane_replace_prop_blob(igt_plane_t *plane,
enum igt_atomic_plane_properties prop,
const void *ptr, size_t length);
@@ -1018,4 +1107,6 @@ bool igt_check_output_is_dp_mst(igt_output_t *output);
int igt_get_dp_mst_connector_id(igt_output_t *output);
int get_num_scalers(int drm_fd, enum pipe pipe);
+igt_colorop_t *igt_find_colorop(igt_display_t *display, uint32_t id);
+
#endif /* __IGT_KMS_H__ */
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 4/8] lib/igt_kms: Add new COLOR PIPELINE plane property
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (2 preceding siblings ...)
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 3/8] lib/igt_kms: Introduce drm_colorop object Harry Wentland
@ 2023-10-19 21:22 ` Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 5/8] tests/kms_properties: Add colorop properties test Harry Wentland
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
lib/igt_kms.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_kms.h | 10 ++++++++++
2 files changed, 63 insertions(+)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index cd36e778bae7..a03eae8fa992 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -616,6 +616,7 @@ const char * const igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = {
[IGT_PLANE_ZPOS] = "zpos",
[IGT_PLANE_FB_DAMAGE_CLIPS] = "FB_DAMAGE_CLIPS",
[IGT_PLANE_SCALING_FILTER] = "SCALING_FILTER",
+ [IGT_PLANE_COLOR_PIPELINE] = "COLOR_PIPELINE",
};
const char * const igt_colorop_prop_names[IGT_NUM_COLOROP_PROPS] = {
@@ -705,6 +706,27 @@ igt_colorop_t *igt_find_colorop(igt_display_t *display, uint32_t id)
return NULL;
}
+static void
+igt_fill_plane_color_pipelines(igt_display_t *display, igt_plane_t *plane,
+ drmModePropertyPtr prop)
+{
+ int i;
+
+ plane->num_color_pipelines = 0;
+
+ for (i = 0; i < prop->count_enums; i++) {
+ igt_colorop_t *colorop = igt_find_colorop(display, prop->enums[i].value);
+
+ if (colorop) {
+ plane->color_pipelines[plane->num_color_pipelines++] = colorop;
+ memcpy(colorop->name, prop->enums[i].name, sizeof(colorop->name));
+ }
+ }
+
+ igt_assert(plane->num_color_pipelines < IGT_NUM_PLANE_COLOR_PIPELINES);
+
+}
+
/*
* Retrieve all the properies specified in props_name and store them into
* plane->props.
@@ -736,6 +758,9 @@ igt_fill_plane_props(igt_display_t *display, igt_plane_t *plane,
if (strcmp(prop->name, "rotation") == 0)
plane->rotations = igt_plane_rotations(display, plane, prop);
+ if (strcmp(prop->name, "COLOR_PIPELINE") == 0)
+ igt_fill_plane_color_pipelines(display, plane, prop);
+
drmModeFreeProperty(prop);
}
@@ -3998,6 +4023,29 @@ bool igt_colorop_try_prop_enum(igt_display_t *display,
return true;
}
+bool igt_plane_is_valid_colorop(igt_plane_t *plane, igt_colorop_t *colorop)
+{
+ int i;
+ bool found = false;
+
+ for (i = 0; i < plane->num_color_pipelines; i++) {
+ if (plane->color_pipelines[i] == colorop) {
+ found = true;
+ break;
+ }
+ }
+
+ return found;
+}
+
+void igt_plane_set_color_pipeline(igt_plane_t *plane, igt_colorop_t *colorop)
+{
+ igt_assert(igt_plane_is_valid_colorop(plane, colorop));
+
+ plane->assigned_color_pipeline = colorop;
+ igt_plane_set_prop_enum(plane, IGT_PLANE_COLOR_PIPELINE, colorop->name);
+}
+
void igt_colorop_set_prop_enum(igt_display_t *display,
igt_colorop_t *colorop,
enum igt_atomic_colorop_properties prop,
@@ -4277,6 +4325,11 @@ static int igt_atomic_commit(igt_display_t *display, uint32_t flags, void *user_
if (plane->changed)
igt_atomic_prepare_plane_commit(plane, pipe_obj, req);
+
+ /* TODO iterate over assigned color pipeline and prepare colorop commit */
+ if (plane->assigned_color_pipeline)
+ igt_atomic_prepare_colorop_commit(plane->assigned_color_pipeline,
+ pipe_obj, req);
}
}
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index c6402979d10f..c24ae0017ff6 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -326,6 +326,7 @@ enum igt_atomic_plane_properties {
IGT_PLANE_SCALING_FILTER,
IGT_PLANE_HOTSPOT_X,
IGT_PLANE_HOTSPOT_Y,
+ IGT_PLANE_COLOR_PIPELINE,
IGT_NUM_PLANE_PROPS
};
@@ -362,6 +363,8 @@ typedef struct igt_display igt_display_t;
typedef struct igt_pipe igt_pipe_t;
typedef uint32_t igt_fixed_t; /* 16.16 fixed point */
+#define IGT_NUM_PLANE_COLOR_PIPELINES 4
+
typedef enum {
/* this maps to the kernel API */
IGT_ROTATION_0 = 1 << 0,
@@ -431,6 +434,11 @@ typedef struct igt_plane {
uint64_t *modifiers;
uint32_t *formats;
int format_mod_count;
+
+ igt_colorop_t *color_pipelines[IGT_NUM_PLANE_COLOR_PIPELINES];
+ int num_color_pipelines;
+
+ igt_colorop_t *assigned_color_pipeline;
} igt_plane_t;
/*
@@ -777,6 +785,8 @@ extern void igt_plane_set_prop_enum(igt_plane_t *plane,
extern bool igt_plane_is_valid_colorop(igt_plane_t *plane, igt_colorop_t *colorop);
+extern void igt_plane_set_color_pipeline(igt_plane_t *plane, igt_colorop_t *colorop);
+
/**
* igt_colorop_has_prop:
* @colorop: colorop to check.
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 5/8] tests/kms_properties: Add colorop properties test
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (3 preceding siblings ...)
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 4/8] lib/igt_kms: Add new COLOR PIPELINE plane property Harry Wentland
@ 2023-10-19 21:22 ` Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 6/8] igt/color: Add SW color transform functionality Harry Wentland
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
tests/kms_properties.c | 67 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 3284366228c0..45744c64a54f 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -46,6 +46,7 @@
* @crtc: CRTC
* @plane: Plane
* @invalid: Invalid (connector/crtc/plane)
+ * @colorop: Colorop
*
* arg[2]:
*
@@ -208,6 +209,39 @@ static void test_properties(int fd, uint32_t type, uint32_t id, bool atomic)
}
}
+static void run_colorop_property_tests(igt_display_t *display, enum pipe pipe, igt_output_t *output)
+{
+ struct igt_fb fb;
+ igt_plane_t *plane;
+ int i;
+
+ prepare_pipe(display, pipe, output, &fb);
+
+ for_each_plane_on_pipe(display, pipe, plane) {
+ igt_info("Testing colorop properties on plane %s.#%d-%s (output: %s)\n",
+ kmstest_pipe_name(pipe), plane->index, kmstest_plane_type_name(plane->type), output->name);
+
+ for (i = 0; i < display->n_colorops; i++) {
+ igt_colorop_t *global_colorop = &display->colorops[i];
+ drmModeColorop *drm_colorop = global_colorop->drm_colorop;
+
+ igt_info("Testing colorop properties on %s.#%d.#%d-%s (output: %s)\n",
+ kmstest_pipe_name(pipe), plane->index, drm_colorop->colorop_id, kmstest_plane_type_name(plane->type), output->name);
+
+ if (drm_colorop->plane_id != plane->drm_plane->plane_id) {
+ printf("bla: colorop %d is on plane %d, not on plane %d\n",
+ drm_colorop->colorop_id,
+ drm_colorop->plane_id,
+ plane->drm_plane->plane_id);
+ continue;
+ }
+ test_properties(display->drm_fd, DRM_MODE_OBJECT_COLOROP, drm_colorop->colorop_id, true);
+ }
+ }
+
+ cleanup_pipe(display, pipe, output, &fb);
+}
+
static void run_plane_property_tests(igt_display_t *display, enum pipe pipe, igt_output_t *output, bool atomic)
{
struct igt_fb fb;
@@ -253,6 +287,35 @@ static void run_connector_property_tests(igt_display_t *display, enum pipe pipe,
cleanup_pipe(display, pipe, output, &fb);
}
+static void colorop_properties(igt_display_t *display)
+{
+ bool found_any = false, found;
+ igt_output_t *output;
+ enum pipe pipe;
+
+ /* colorops are only available with atomic */
+ igt_skip_on(!display->is_atomic);
+
+ for_each_pipe(display, pipe) {
+ found = false;
+
+ for_each_valid_output_on_pipe(display, pipe, output) {
+ igt_display_reset(display);
+
+ igt_output_set_pipe(output, pipe);
+ if (!i915_pipe_output_combo_valid(display))
+ continue;
+
+ found_any = found = true;
+
+ run_colorop_property_tests(display, pipe, output);
+ break;
+ }
+ }
+
+ igt_skip_on(!found_any);
+}
+
static void plane_properties(igt_display_t *display, bool atomic)
{
bool found_any = false, found;
@@ -800,6 +863,10 @@ igt_main
igt_subtest("plane-properties-atomic")
plane_properties(&display, true);
+ igt_describe("Tests colorop properties with atomic commit");
+ igt_subtest("colorop-properties-atomic")
+ colorop_properties(&display);
+
igt_describe("Tests crtc properties with legacy commit");
igt_subtest("crtc-properties-legacy")
crtc_properties(&display, false);
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 6/8] igt/color: Add SW color transform functionality
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (4 preceding siblings ...)
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 5/8] tests/kms_properties: Add colorop properties test Harry Wentland
@ 2023-10-19 21:22 ` Harry Wentland
2023-10-19 21:23 ` [igt-dev] [RFC PATCH v2 7/8] lib/igt_fb: Add copy_fb function Harry Wentland
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:22 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
In order to test color we want to compare a HW (KMS) transform
with a SW transform. This introduces color transform for an
sRGB EOTF but this can be extended to other transforms. Code is
borrowed from Skia.
v2:
- Add inverse sRGB TF
- Make TF functions available to tests
- Modify tranform_pixels function to take multple transforms
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
lib/igt_color.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_color.h | 105 ++++++++++++++++
lib/igt_fb.c | 6 +-
lib/igt_fb.h | 2 +
lib/meson.build | 1 +
5 files changed, 423 insertions(+), 3 deletions(-)
create mode 100644 lib/igt_color.c
create mode 100644 lib/igt_color.h
diff --git a/lib/igt_color.c b/lib/igt_color.c
new file mode 100644
index 000000000000..912cb14424b4
--- /dev/null
+++ b/lib/igt_color.c
@@ -0,0 +1,312 @@
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <errno.h>
+#include <math.h>
+
+#include "igt_color.h"
+#include "igt_core.h"
+#include "igt_x86.h"
+
+
+static float clamp(float val, float min, float max)
+{
+ return ((val < min) ? min : ((val > max) ? max : val));
+}
+
+/*
+ * Below code is taken from Skia and adapted for style and needs of
+ * IGT.
+ *
+ * https://chromium.googlesource.com/chromium/src/+/3e1a26c44c024d97dc9a4c09bbc6a2365398ca2c/ui/gfx/skia_color_space_util.cc#15
+ *
+ * To comply with the original code's license we'll include it, as well
+ * as the original copyright here:
+ *
+ * // Copyright 2015 The Chromium Authors
+ * //
+ * // Redistribution and use in source and binary forms, with or without
+ * // modification, are permitted provided that the following conditions are
+ * // met:
+ * //
+ * // * Redistributions of source code must retain the above copyright
+ * // notice, this list of conditions and the following disclaimer.
+ * // * Redistributions in binary form must reproduce the above
+ * // copyright notice, this list of conditions and the following disclaimer
+ * // in the documentation and/or other materials provided with the
+ * // distribution.
+ * // * Neither the name of Google LLC nor the names of its
+ * // contributors may be used to endorse or promote products derived from
+ * // this software without specific prior written permission.
+ * //
+ * // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+static float igt_color_tf_eval_unclamped(const struct igt_color_tf *fn, float x)
+{
+ if (x < fn->d)
+ return fn->c * x + fn->f;
+ return pow(fn->a * x + fn->b, fn->g) + fn->e;
+}
+
+static float igt_color_tf_eval(const struct igt_color_tf *fn, float x)
+{
+ float fn_at_x_unclamped = igt_color_tf_eval_unclamped(fn, x);
+ return clamp(fn_at_x_unclamped, 0.0f, 1.0f);
+}
+
+static void tf_inverse(const struct igt_color_tf *fn, struct igt_color_tf *inv) {
+ memset(inv, 0, sizeof(struct igt_color_tf));
+
+ if (fn->a > 0 && fn->g > 0) {
+ double a_to_the_g = pow(fn->a, fn->g);
+ inv->a = 1.f / a_to_the_g;
+ inv->b = -fn->e / a_to_the_g;
+ inv->g = 1.f / fn->g;
+ }
+
+ inv->d = fn->c * fn->d + fn->f;
+ inv->e = -fn->b / fn->a;
+ if (fn->c != 0) {
+ inv->c = 1.f / fn->c;
+ inv->f = -fn->f / fn->c;
+ }
+}
+
+/* end of Skia-based code */
+
+void igt_color_srgb_inv_eotf(igt_pixel_t *pixel)
+{
+ struct igt_color_tf inv;
+
+ tf_inverse(&srgb_tf, &inv);
+
+ pixel->r = igt_color_tf_eval(&inv, pixel->r);
+ pixel->g = igt_color_tf_eval(&inv, pixel->g);
+ pixel->b = igt_color_tf_eval(&inv, pixel->b);
+}
+
+
+
+void igt_color_srgb_eotf(igt_pixel_t *pixel)
+{
+ pixel->r = igt_color_tf_eval(&srgb_tf, pixel->r);
+ pixel->g = igt_color_tf_eval(&srgb_tf, pixel->g);
+ pixel->b = igt_color_tf_eval(&srgb_tf, pixel->b);
+}
+
+int igt_color_transform_pixels(igt_fb_t *fb, igt_pixel_transform transforms[], int num_transforms)
+{
+ uint32_t *line = NULL;
+ void *map;
+ char *ptr;
+ int x, y, cpp = igt_drm_format_to_bpp(fb->drm_format) / 8;
+ uint32_t stride = igt_fb_calc_plane_stride(fb, 0);
+
+ if (fb->num_planes != 1)
+ return -EINVAL;
+
+ /* TODO expand for other formats */
+ if (fb->drm_format != DRM_FORMAT_XRGB8888)
+ return -EINVAL;
+
+ ptr = igt_fb_map_buffer(fb->fd, fb);
+ igt_assert(ptr);
+ map = ptr;
+
+ /*
+ * Framebuffers are often uncached, which can make byte-wise accesses
+ * very slow. We copy each line of the FB into a local buffer to speed
+ * up the hashing.
+ */
+ line = malloc(stride);
+ if (!line) {
+ munmap(map, fb->size);
+ return -ENOMEM;
+ }
+
+ for (y = 0; y < fb->height; y++, ptr += stride) {
+
+ /* get line from buffer */
+ igt_memcpy_from_wc(line, ptr, fb->width * cpp);
+
+ for (x = 0; x < fb->width; x++) {
+ uint32_t raw_pixel = le32_to_cpu(line[x]);
+ igt_pixel_t pixel;
+ int i;
+
+ raw_pixel &= 0x00ffffff;
+
+ /*
+ * unpack pixel into igt_pixel_t
+ *
+ * only for XRGB8888 for now
+ *
+ * TODO add "generic" mechanism for unpacking
+ * other FB formats
+ */
+ pixel.r = (raw_pixel & 0x00ff0000) >> 16;
+ pixel.g = (raw_pixel & 0x0000ff00) >> 8;
+ pixel.b = (raw_pixel & 0x000000ff);
+
+ /* normalize for 8-bit */
+ pixel.r /= (0xff);
+ pixel.g /= (0xff);
+ pixel.b /= (0xff);
+
+ /* TODO use read_rgb from igt_fb? */
+
+ /* run transform on pixel */
+
+ for (i = 0; i < num_transforms; i++)
+ transforms[i](&pixel);
+
+ /* de-normalize back to 8-bit */
+ pixel.r *= (0xff);
+ pixel.g *= (0xff);
+ pixel.b *= (0xff);
+
+ /* re-pack pixel into FB*/
+ raw_pixel = 0x0;
+ raw_pixel |= ((uint8_t) (lround(pixel.r) & 0xff)) << 16;
+ raw_pixel |= ((uint8_t) (lround(pixel.g) & 0xff)) << 8;
+ raw_pixel |= ((uint8_t) (lround(pixel.b) & 0xff));
+ /* TODO use write_rgb from igt_fb? */
+
+ /* write back to line */
+ line[x] = cpu_to_le32(raw_pixel);
+ }
+
+ /* copy line back to fb buffer */
+ igt_memcpy_from_wc(ptr, line, fb->width * cpp);
+ }
+
+ free(line);
+ igt_fb_unmap_buffer(fb, map);
+
+ return 0;
+
+ /* for each pixel */
+
+ /* convert to float and create igt_pixel */
+
+ /* call transform */
+
+ /* convert back to fb format from igt_pixel */
+
+
+}
+
+bool igt_cmp_fb_component(uint16_t comp1, uint16_t comp2, uint8_t up, uint8_t down)
+{
+ int16_t diff = comp2 - comp1;
+
+ if ((diff < -down) || (diff > up)) {
+ printf("comp1 %x comp2 %x diff %d down %d, up %d\n", comp1, comp2, diff, -down, up);
+ return false;
+ }
+
+ return true;
+}
+
+bool igt_cmp_fb_pixels(igt_fb_t *fb1, igt_fb_t *fb2, uint8_t up, uint8_t down)
+{
+ uint32_t *ptr1, *ptr2;
+ uint32_t pixel1, pixel2, i, j;
+ bool matched = true;
+
+
+ ptr1 = igt_fb_map_buffer(fb1->fd, fb1);
+ ptr2 = igt_fb_map_buffer(fb2->fd, fb2);
+
+ igt_assert(fb1->drm_format == fb2->drm_format);
+ igt_assert(fb1->size == fb2->size);
+
+ for (i = 0; i < fb1->size / sizeof(uint32_t); i++) {
+ uint16_t mask = 0xff;
+ uint16_t shift = 8;
+
+ if (fb1->drm_format == DRM_FORMAT_XRGB2101010) {
+ /* ignore alpha */
+ pixel1 = ptr1[i] & ~0xc0000000;
+ pixel2 = ptr2[i] & ~0xc0000000;
+
+ mask = 0x3ff;
+ shift = 10;
+
+
+ } else if (fb1->drm_format == DRM_FORMAT_XRGB8888) {
+ /* ignore alpha */
+ pixel1 = ptr1[i] & ~0xff000000;
+ pixel2 = ptr2[i] & ~0xff000000;
+
+ mask = 0xff;
+ shift = 8;
+
+ } else {
+ pixel1 = ptr1[i];
+ pixel2 = ptr2[i];
+ }
+
+ for (j = 0; j < 3; j++) {
+ uint16_t comp1 = (pixel1 >> (shift*j)) & mask;
+ uint16_t comp2 = (pixel2 >> (shift*j)) & mask;
+
+ if (!igt_cmp_fb_component(comp1, comp2, up, down)) {
+ /* TODO use proper log*/
+ printf("i %d j %d shift %d mask %x comp1 %x comp2 %x, pixel1 %x pixel2 %x\n",
+ i, j, shift, mask, comp1, comp2, pixel1, pixel2);
+ return false;
+ }
+ }
+ }
+
+ igt_fb_unmap_buffer(fb1, ptr1);
+ igt_fb_unmap_buffer(fb2, ptr2);
+
+ return matched;
+}
+
+
+void igt_dump_fb(igt_display_t *display, igt_fb_t *fb,
+ const char *path_name, const char *file_name)
+{
+ char filepath_out[PATH_MAX];
+ cairo_surface_t *fb_surface_out;
+ cairo_status_t status;
+
+ snprintf(filepath_out, PATH_MAX, "%s/%s.png", path_name, file_name);
+ fb_surface_out = igt_get_cairo_surface(display->drm_fd, fb);
+ status = cairo_surface_write_to_png(fb_surface_out, filepath_out);
+ igt_assert_eq(status, CAIRO_STATUS_SUCCESS);
+ cairo_surface_destroy(fb_surface_out);
+}
\ No newline at end of file
diff --git a/lib/igt_color.h b/lib/igt_color.h
new file mode 100644
index 000000000000..09da1cf2dd84
--- /dev/null
+++ b/lib/igt_color.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef __IGT_COLOR_H__
+#define __IGT_COLOR_H__
+
+#include <limits.h>
+
+#include "igt_fb.h"
+#include "igt_kms.h"
+
+/*
+ * Below code is taken from Skia and adapted for style and needs of
+ * IGT.
+ *
+ * https://chromium.googlesource.com/chromium/src/+/3e1a26c44c024d97dc9a4c09bbc6a2365398ca2c/ui/gfx/skia_color_space_util.cc#15
+ *
+ * To comply with the original code's license we'll include it, as well
+ * as the original copyright here:
+ *
+ * // Copyright 2015 The Chromium Authors
+ * //
+ * // Redistribution and use in source and binary forms, with or without
+ * // modification, are permitted provided that the following conditions are
+ * // met:
+ * //
+ * // * Redistributions of source code must retain the above copyright
+ * // notice, this list of conditions and the following disclaimer.
+ * // * Redistributions in binary form must reproduce the above
+ * // copyright notice, this list of conditions and the following disclaimer
+ * // in the documentation and/or other materials provided with the
+ * // distribution.
+ * // * Neither the name of Google LLC nor the names of its
+ * // contributors may be used to endorse or promote products derived from
+ * // this software without specific prior written permission.
+ * //
+ * // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * A transfer function mapping encoded values to linear values,
+ * represented by this 7-parameter piecewise function:
+ *
+ * linear = sign(encoded) * (c*|encoded| + f) , 0 <= |encoded| < d
+ * = sign(encoded) * ((a*|encoded| + b)^g + e), d <= |encoded|
+ *
+ * (A simple gamma transfer function sets g to gamma and a to 1.)
+ */
+struct igt_color_tf {
+ float g, a,b,c,d,e,f;
+};
+
+const struct igt_color_tf srgb_tf = {2.4f, (float)(1/1.055), (float)(0.055/1.055), (float)(1/12.92), 0.04045f, 0, 0};
+
+/* end of Skia-based code */
+
+typedef struct igt_pixel {
+ float r;
+ float g;
+ float b;
+} igt_pixel_t;
+
+bool igt_cmp_fb_component(uint16_t comp1, uint16_t comp2, uint8_t up, uint8_t down);
+bool igt_cmp_fb_pixels(igt_fb_t *fb1, igt_fb_t *fb2, uint8_t up, uint8_t down);
+
+void igt_dump_fb(igt_display_t *display, igt_fb_t *fb, const char *path_name, const char *file_name);
+
+/* TODO also allow 64-bit pixels, or other weird sizes */
+typedef void (*igt_pixel_transform)(igt_pixel_t *pixel);
+
+int igt_color_transform_pixels(igt_fb_t *fb, igt_pixel_transform transforms[], int num_transforms);
+
+void igt_color_srgb_inv_eotf(igt_pixel_t *pixel);
+void igt_color_srgb_eotf(igt_pixel_t *pixel);
+
+#endif
\ No newline at end of file
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index e531a041e567..9196deda2eac 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -761,7 +761,7 @@ void igt_init_fb(struct igt_fb *fb, int fd, int width, int height,
}
}
-static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
+uint32_t igt_fb_calc_plane_stride(struct igt_fb *fb, int plane)
{
uint32_t min_stride = fb->plane_width[plane] *
(fb->plane_bpp[plane] / 8);
@@ -943,7 +943,7 @@ static uint64_t calc_fb_size(struct igt_fb *fb)
/* respect the stride requested by the caller */
if (!fb->strides[plane])
- fb->strides[plane] = calc_plane_stride(fb, plane);
+ fb->strides[plane] = igt_fb_calc_plane_stride(fb, plane);
align = get_plane_alignment(fb, plane);
if (align)
@@ -4752,7 +4752,7 @@ int igt_fb_get_fnv1a_crc(struct igt_fb *fb, igt_crc_t *crc)
void *map;
char *ptr;
int x, y, cpp = igt_drm_format_to_bpp(fb->drm_format) / 8;
- uint32_t stride = calc_plane_stride(fb, 0);
+ uint32_t stride = igt_fb_calc_plane_stride(fb, 0);
if (fb->num_planes != 1)
return -EINVAL;
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index 834aaef54dea..d2751c0bb772 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -170,6 +170,8 @@ int igt_dirty_fb(int fd, struct igt_fb *fb);
void *igt_fb_map_buffer(int fd, struct igt_fb *fb);
void igt_fb_unmap_buffer(struct igt_fb *fb, void *buffer);
+uint32_t igt_fb_calc_plane_stride(struct igt_fb *fb, int plane);
+
void igt_create_bo_for_fb(int fd, int width, int height,
uint32_t format, uint64_t modifier,
struct igt_fb *fb);
diff --git a/lib/meson.build b/lib/meson.build
index a7bccafc35c0..5a649c86c7bd 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -102,6 +102,7 @@ lib_sources = [
'igt_edid.c',
'igt_eld.c',
'igt_infoframe.c',
+ 'igt_color.c',
'veboxcopy_gen12.c',
'igt_msm.c',
'igt_dsc.c',
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 7/8] lib/igt_fb: Add copy_fb function
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (5 preceding siblings ...)
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 6/8] igt/color: Add SW color transform functionality Harry Wentland
@ 2023-10-19 21:23 ` Harry Wentland
2023-10-19 21:23 ` [igt-dev] [RFC PATCH v2 8/8] tests/kms_colorop: Add kms_colorop tests Harry Wentland
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:23 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
lib/igt_fb.c | 34 ++++++++++++++++++++++++++++++++++
lib/igt_fb.h | 1 +
2 files changed, 35 insertions(+)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 9196deda2eac..46fe3cd0f27b 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -2151,6 +2151,40 @@ unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
fb, 0, 0);
}
+unsigned int igt_copy_fb(int fd, struct igt_fb *src, struct igt_fb *fb)
+{
+ char *in_ptr, *out_ptr;
+ int cpp = igt_drm_format_to_bpp(src->drm_format) / 8;
+
+ int fb_id = 0;
+ igt_assert(src);
+
+ /* TODO allow multiple planes */
+ if (src->num_planes != 1)
+ return -EINVAL;
+
+ /* TODO expand for other formats */
+ if (src->drm_format != DRM_FORMAT_XRGB8888)
+ return -EINVAL;
+
+ fb_id = igt_create_fb(fd, src->width, src->height, src->drm_format,
+ src->modifier, fb);
+
+ /* copy buffer contents */
+ /* TODO simplify :D */
+ in_ptr = igt_fb_map_buffer(fb->fd, src);
+ igt_assert(in_ptr);
+ out_ptr = igt_fb_map_buffer(fb->fd, fb);
+ igt_assert(out_ptr);
+
+ igt_memcpy_from_wc(out_ptr, in_ptr, fb->width * fb->height * cpp);
+
+ igt_fb_unmap_buffer(fb, out_ptr);
+ igt_fb_unmap_buffer(src, in_ptr);
+
+ return fb_id;
+}
+
/**
* igt_create_color_fb:
* @fd: open drm file descriptor
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index d2751c0bb772..258a7669e434 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -142,6 +142,7 @@ struct intel_buf *igt_fb_create_intel_buf(int fd, struct buf_ops *bops,
const struct igt_fb *fb, const char *name);
unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
uint64_t modifier, struct igt_fb *fb);
+unsigned int igt_copy_fb(int fd, struct igt_fb *src, struct igt_fb *fb);
unsigned int igt_create_color_fb(int fd, int width, int height,
uint32_t format, uint64_t modifier,
double r, double g, double b,
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] [RFC PATCH v2 8/8] tests/kms_colorop: Add kms_colorop tests
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (6 preceding siblings ...)
2023-10-19 21:23 ` [igt-dev] [RFC PATCH v2 7/8] lib/igt_fb: Add copy_fb function Harry Wentland
@ 2023-10-19 21:23 ` Harry Wentland
2023-10-23 21:16 ` [igt-dev] ✗ Fi.CI.BUILD: failure for IGT tests for the KMS Color Pipeline API (rev2) Patchwork
2023-10-23 21:23 ` [igt-dev] ✗ GitLab.Pipeline: warning " Patchwork
9 siblings, 0 replies; 11+ messages in thread
From: Harry Wentland @ 2023-10-19 21:23 UTC (permalink / raw)
To: igt-dev
Cc: Sasha McIntosh, Liviu Dudau, Victoria Brekenfeld,
Michel Dänzer, Sebastian Wick, Shashank Sharma,
Christopher Braga, Jonas Ådahl, Naseer Ahmed, Aleix Pol,
Alexander Goins, Pekka Paalanen, Simon Ser, Hector Martin,
Xaver Hugl, Sima, Joshua Ashton
This tests the color pipeline API, exposed via the
COLOR PIPELINE plane property and drm_colorop objects.
We introduce tests for:
- sRGB EOTF
- sRGB Inverse EOTF
- sRGB EOTF + sRGB Inverse EOTF
The last one is the holy grail of LUT testing. It tests that
after applying an EOTF, followed by its inverse EOTF we arrive
back at the original value. We can use this to test for
precision loss in the pipeline.
All tests are tested via writeback. All transforms are done in
SW (in floating point) and at the end the SW transformed buffer
is compared with the KMS writeback output buffer. The two should
match within a bracket of acceptable deviations. Since these
deviations might look different for different KMS drivers we'll
do this check on a driver-specific basis.
v2:
- Make tests dynamic, allowing definition of tests with an
arbitrary number of transforms
- Add test for sRGB Inverse EOTF
- Add test for sRGB EOTF, followed by sRGB Inverse EOTF
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Jonas Ådahl <jadahl@redhat.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Shashank Sharma <shashank.sharma@amd.com>
Cc: Alexander Goins <agoins@nvidia.com>
Cc: Joshua Ashton <joshua@froggi.es>
Cc: Michel Dänzer <mdaenzer@redhat.com>
Cc: Aleix Pol <aleixpol@kde.org>
Cc: Xaver Hugl <xaver.hugl@gmail.com>
Cc: Victoria Brekenfeld <victoria@system76.com>
Cc: Sima <daniel@ffwll.ch>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Naseer Ahmed <quic_naseer@quicinc.com>
Cc: Christopher Braga <quic_cbraga@quicinc.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Cc: Hector Martin <marcan@marcan.st>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sasha McIntosh <sashamcintosh@google.com>
---
tests/kms_colorop.c | 507 ++++++++++++++++++++++++++++++++++++++++++++
tests/kms_colorop.h | 87 ++++++++
tests/meson.build | 1 +
3 files changed, 595 insertions(+)
create mode 100644 tests/kms_colorop.c
create mode 100644 tests/kms_colorop.h
diff --git a/tests/kms_colorop.c b/tests/kms_colorop.c
new file mode 100644
index 000000000000..8f90001ce01f
--- /dev/null
+++ b/tests/kms_colorop.c
@@ -0,0 +1,507 @@
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "igt.h"
+#include "igt_color.h"
+#include "sw_sync.h"
+
+#include "kms_colorop.h"
+
+/**
+ * TEST: kms colorop
+ * Category: Display
+ * Description: Test to validate the retrieving and setting of DRM colorops
+ *
+ * SUBTEST: plane-%s
+ * Description: Tests DRM colorop properties on a plane
+ * Driver requirement: amdgpu
+ * Functionality: kms_core
+ * Mega feature: General Display Features
+ * Test category: functionality test
+ *
+ * arg[1]:
+ *
+ * @srgb_eotf: sRGB EOTF
+ * @srgb_inv_eotf: sRGB Inverse EOTF
+ * @srgb_eotf-srgb_inv_eotf: sRGB EOTF -> sRGB Inverse EOTF
+ *
+ */
+
+/* TODO move to lib for kms_writeback and kms_colorop (and other future) use */
+static bool check_writeback_config(igt_display_t *display, igt_output_t *output,
+ drmModeModeInfo override_mode)
+{
+ igt_fb_t input_fb, output_fb;
+ igt_plane_t *plane;
+ uint32_t writeback_format = DRM_FORMAT_XRGB8888;
+ uint64_t modifier = DRM_FORMAT_MOD_LINEAR;
+ int width, height, ret;
+
+ igt_output_override_mode(output, &override_mode);
+
+ width = override_mode.hdisplay;
+ height = override_mode.vdisplay;
+
+ ret = igt_create_fb(display->drm_fd, width, height,
+ DRM_FORMAT_XRGB8888, modifier, &input_fb);
+ igt_assert(ret >= 0);
+
+ ret = igt_create_fb(display->drm_fd, width, height,
+ writeback_format, modifier, &output_fb);
+ igt_assert(ret >= 0);
+
+ plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+ igt_plane_set_fb(plane, &input_fb);
+ igt_output_set_writeback_fb(output, &output_fb);
+
+ ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY |
+ DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+ igt_plane_set_fb(plane, NULL);
+ igt_remove_fb(display->drm_fd, &input_fb);
+ igt_remove_fb(display->drm_fd, &output_fb);
+
+ return !ret;
+}
+
+/* TODO move to lib for kms_writeback and kms_colorop (and other future) use */
+typedef struct {
+ bool builtin_mode;
+ bool custom_mode;
+ bool list_modes;
+ bool dump_check;
+ int mode_index;
+ drmModeModeInfo user_mode;
+} data_t;
+
+static data_t data;
+
+/* TODO move to lib for kms_writeback and kms_colorop (and other future) use */
+static igt_output_t *kms_writeback_get_output(igt_display_t *display)
+{
+ int i;
+ enum pipe pipe;
+
+ drmModeModeInfo override_mode = {
+ .clock = 25175,
+ .hdisplay = 640,
+ .hsync_start = 656,
+ .hsync_end = 752,
+ .htotal = 800,
+ .hskew = 0,
+ .vdisplay = 480,
+ .vsync_start = 490,
+ .vsync_end = 492,
+ .vtotal = 525,
+ .vscan = 0,
+ .vrefresh = 60,
+ .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
+ .name = {"640x480-60"},
+ };
+
+ for (i = 0; i < display->n_outputs; i++) {
+ igt_output_t *output = &display->outputs[i];
+
+ if (output->config.connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
+ continue;
+
+ for_each_pipe(display, pipe) {
+ igt_output_set_pipe(output, pipe);
+
+ if (data.custom_mode)
+ override_mode = data.user_mode;
+ if (data.builtin_mode)
+ override_mode = output->config.connector->modes[data.mode_index];
+
+ if (check_writeback_config(display, output, override_mode)) {
+ igt_debug("Using connector %u:%s on pipe %d\n",
+ output->config.connector->connector_id,
+ output->name, pipe);
+ return output;
+ }
+ }
+
+ igt_debug("We found %u:%s, but this test will not be able to use it.\n",
+ output->config.connector->connector_id, output->name);
+
+ /* Restore any connectors we don't use, so we don't trip on them later */
+ kmstest_force_connector(display->drm_fd, output->config.connector, FORCE_CONNECTOR_UNSPECIFIED);
+ }
+
+ return NULL;
+}
+
+/* TODO move to lib for kms_writeback and kms_colorop (and other future) use */
+static uint64_t get_writeback_fb_id(igt_output_t *output)
+{
+ return igt_output_get_prop(output, IGT_CONNECTOR_WRITEBACK_FB_ID);
+}
+
+/* TODO move to lib for kms_writeback and kms_colorop (and other future) use */
+static void detach_crtc(igt_display_t *display, igt_output_t *output)
+{
+ if (get_writeback_fb_id(output) == 0)
+ return;
+
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, COMMIT_ATOMIC);
+}
+
+static void get_and_wait_out_fence(igt_output_t *output)
+{
+ int ret;
+
+ igt_assert(output->writeback_out_fence_fd >= 0);
+
+ ret = sync_fence_wait(output->writeback_out_fence_fd, 1000);
+ igt_assert_f(ret == 0, "sync_fence_wait failed: %s\n", strerror(-ret));
+ close(output->writeback_out_fence_fd);
+ output->writeback_out_fence_fd = -1;
+}
+
+static bool can_use_colorop(igt_display_t *display, igt_colorop_t *colorop, kms_colorop_t *desired)
+{
+ switch (desired->type) {
+ case KMS_COLOROP_ENUMERATED_LUT1D:
+ if (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_CURVE) {
+ return true;
+ }
+ case KMS_COLOROP_CUSTOM_LUT1D:
+ case KMS_COLOROP_CTM:
+ case KMS_COLOROP_LUT3D:
+ default:
+ return false;
+ }
+}
+
+/**
+ * Iterate color pipeline that begins with colorop and try to map
+ * colorops[] to it.
+ */
+static bool map_to_pipeline(igt_display_t *display,
+ igt_colorop_t *colorop,
+ kms_colorop_t *colorops[])
+{
+ igt_colorop_t *next = colorop;
+ kms_colorop_t *current_op;
+ int i = 0;
+ int prop_val = 0;
+
+ current_op = colorops[i++];
+ igt_require(current_op);
+
+ while (next) {
+ if (can_use_colorop(display, next, current_op)) {
+ current_op->colorop = next;
+ current_op = colorops[i++];
+ if (!current_op)
+ break;
+ }
+ prop_val = igt_colorop_get_prop(display, colorop,
+ IGT_COLOROP_NEXT);
+ next = igt_find_colorop(display, prop_val);
+ }
+
+ if (current_op) {
+ /* we failed to map the pipeline */
+
+ /* clean up colorops[i].colorop mappings */
+ for(i = 0, current_op = colorops[0]; current_op; current_op = colorops[i++])
+ current_op->colorop = NULL;
+
+ return false;
+ }
+
+ return true;
+}
+
+static igt_colorop_t *get_color_pipeline(igt_display_t *display,
+ igt_plane_t *plane,
+ kms_colorop_t *colorops[])
+{
+ igt_colorop_t *colorop;
+ int i;
+
+ /* go through all color pipelines */
+ for (i = 0; i < plane->num_color_pipelines; ++i) {
+ colorop = plane->color_pipelines[i];
+ if (map_to_pipeline(display, colorop, colorops))
+ break;
+ }
+ igt_assert(colorop);
+
+ return colorop;
+}
+
+static void set_colorop(igt_display_t *display,
+ kms_colorop_t *colorop)
+{
+ igt_assert(colorop->colorop);
+ igt_colorop_set_prop_value(colorop->colorop, IGT_COLOROP_BYPASS, 0);
+
+ /* TODO set to desired value from kms_colorop_t */
+ switch (colorop->type) {
+ case KMS_COLOROP_ENUMERATED_LUT1D:
+ switch (colorop->enumerated_lut1d_info.tf) {
+ case KMS_COLOROP_LUT1D_SRGB_EOTF:
+ igt_colorop_set_prop_enum(display, colorop->colorop, IGT_COLOROP_CURVE_1D_TYPE, "sRGB EOTF");
+ break;
+ case KMS_COLOROP_LUT1D_SRGB_INV_EOTF:
+ igt_colorop_set_prop_enum(display, colorop->colorop, IGT_COLOROP_CURVE_1D_TYPE, "sRGB Inverse EOTF");
+ break;
+ case KMS_COLOROP_LUT1D_PQ_EOTF:
+ case KMS_COLOROP_LUT1D_PQ_INV_EOTF:
+ default:
+ igt_fail(IGT_EXIT_FAILURE);
+ }
+ break;
+ case KMS_COLOROP_CUSTOM_LUT1D:
+ case KMS_COLOROP_CTM:
+ case KMS_COLOROP_LUT3D:
+ default:
+ igt_fail(IGT_EXIT_FAILURE);
+ }
+}
+
+static void set_color_pipeline(igt_display_t *display,
+ igt_plane_t *plane,
+ kms_colorop_t *colorops[],
+ igt_colorop_t *colorop)
+{
+ igt_colorop_t *next;
+ int prop_val = 0;
+ int i;
+
+ igt_plane_set_color_pipeline(plane, colorop);
+
+ for(i = 0; colorops[i]; i++)
+ set_colorop(display, colorops[i]);
+
+ /* set unused ops in pipeline to bypass */
+ next = colorop;
+ i = 0;
+ while (next) {
+ if (!colorops[i] || colorops[i]->colorop != next)
+ igt_colorop_set_prop_value(next, IGT_COLOROP_BYPASS, 1);
+ else
+ i++;
+
+ prop_val = igt_colorop_get_prop(display, next,
+ IGT_COLOROP_NEXT);
+ next = igt_find_colorop(display, prop_val);
+ }
+}
+
+static void set_color_pipeline_bypass(igt_plane_t *plane)
+{
+ igt_plane_set_prop_enum(plane, IGT_PLANE_COLOR_PIPELINE, "Bypass");
+}
+
+static bool compare_with_bracket(igt_fb_t *in, igt_fb_t *out)
+{
+ if (is_vkms_device(in->fd))
+ return igt_cmp_fb_pixels(in, out, 1, 1);
+ else
+ /*
+ * By default we'll look for a [0, 0] bracket. We can then
+ * define it for each driver that implements support for this
+ * test. That way we can understand the precision of each
+ * driver better.
+ */
+ return igt_cmp_fb_pixels(in, out, 0, 0);
+}
+
+#define DUMP_FBS 1
+
+#define MAX_COLOROPS 3
+#define NUM_COLOROP_TESTS 3
+#define MAX_NAME_SIZE 256
+
+static void apply_transforms(kms_colorop_t *colorops[], igt_fb_t *sw_transform_fb)
+{
+ int i;
+ igt_pixel_transform transforms[MAX_COLOROPS];
+
+ /*
+ * TODO
+ *
+ * This is wrong and loses precision since it always goes back
+ * to an 8-bpc framebuffer.
+ *
+ * Instead we need to stay as UNORM or float 16-bpc value throughout
+ * all transforms.
+ */
+
+ for (i = 0; colorops[i]; i++)
+ transforms[i] = colorops[i]->transform;
+
+ igt_color_transform_pixels(sw_transform_fb, transforms, i);
+}
+
+static void colorop_plane_test(igt_display_t *display,
+ kms_colorop_t *colorops[])
+{
+ igt_colorop_t *colorop = NULL;
+ igt_output_t *output;
+ igt_plane_t *plane;
+ igt_fb_t input_fb;
+ igt_fb_t sw_transform_fb;
+ igt_fb_t output_fb;
+ drmModeModeInfo mode;
+ unsigned int fb_id;
+ igt_crc_t input_crc, output_crc;
+
+ output = kms_writeback_get_output(display);
+ igt_require(output);
+
+ if (output->use_override_mode)
+ memcpy(&mode, &output->override_mode, sizeof(mode));
+ else
+ memcpy(&mode, &output->config.default_mode, sizeof(mode));
+
+ /* create input fb */
+ plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+ igt_assert(plane);
+
+ fb_id = igt_create_color_pattern_fb(display->drm_fd,
+ mode.hdisplay, mode.vdisplay,
+ DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
+ 0.2, 0.2, 0.2, &input_fb);
+ igt_assert(fb_id >= 0);
+ igt_plane_set_fb(plane, &input_fb);
+#if DUMP_FBS
+ igt_dump_fb(display, &input_fb, ".", "input");
+#endif
+
+ /* create output fb */
+ fb_id = igt_create_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
+ DRM_FORMAT_XRGB8888,
+ igt_fb_mod_to_tiling(0),
+ &output_fb);
+ igt_require(fb_id > 0);
+
+ igt_fb_get_fnv1a_crc(&input_fb, &input_crc);
+
+ igt_require(igt_plane_has_prop(plane, IGT_PLANE_COLOR_PIPELINE));
+
+ /* reset color pipeline*/
+
+ /* TODO do we need this? might be good sanity anyways */
+ set_color_pipeline_bypass(plane);
+
+ /* Commit */
+ igt_plane_set_fb(plane, &input_fb);
+ igt_output_set_writeback_fb(output, &output_fb);
+
+ igt_display_commit_atomic(output->display,
+ DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ get_and_wait_out_fence(output);
+
+ /* Compare input and output buffers. They should be equal here. */
+ igt_fb_get_fnv1a_crc(&output_fb, &output_crc);
+
+ igt_assert_crc_equal(&input_crc, &output_crc);
+
+ /* create sw transformed buffer */
+
+ igt_copy_fb(display->drm_fd, &input_fb, &sw_transform_fb);
+ igt_assert(igt_cmp_fb_pixels(&input_fb, &sw_transform_fb, 0, 0));
+
+ apply_transforms(colorops, &sw_transform_fb);
+#if DUMP_FBS
+ igt_dump_fb(display, &sw_transform_fb, ".", "sw_transform");
+#endif
+ /* discover and set COLOR PIPELINE */
+
+ /* get COLOR_PIPELINE enum */
+ colorop = get_color_pipeline(display, plane, colorops);
+
+ set_color_pipeline(display, plane, colorops, colorop);
+
+ igt_output_set_writeback_fb(output, &output_fb);
+
+ /* commit COLOR_PIPELINE */
+ igt_display_commit_atomic(display,
+ DRM_MODE_ATOMIC_ALLOW_MODESET,
+ NULL);
+ get_and_wait_out_fence(output);
+#if DUMP_FBS
+ igt_dump_fb(display, &output_fb, ".", "output");
+#endif
+
+ /* compare sw transformed and KMS transformed FBs */
+ igt_assert(compare_with_bracket(&sw_transform_fb, &output_fb));
+
+ /* cleanup */
+ detach_crtc(display, output);
+ igt_remove_fb(display->drm_fd, &input_fb);
+ igt_remove_fb(display->drm_fd, &output_fb);
+}
+
+igt_main
+{
+
+ struct {
+ kms_colorop_t *colorops[MAX_COLOROPS];
+ const char *name;
+ } tests[] = {
+ { { &kms_colorop_srgb_eotf, NULL }, "srgb_eotf" },
+ { { &kms_colorop_srgb_inv_eotf, NULL }, "srgb_inv_eotf" },
+ { { &kms_colorop_srgb_eotf, &kms_colorop_srgb_inv_eotf, NULL }, "srgb_eotf-srgb_inv_eotf" }
+ };
+
+ igt_display_t display;
+ int i;
+
+ igt_fixture {
+ display.drm_fd = drm_open_driver_master(DRIVER_ANY);
+ igt_display_require(&display, display.drm_fd);
+
+ kmstest_set_vt_graphics_mode();
+
+ igt_display_require(&display, display.drm_fd);
+
+ igt_require(display.is_atomic);
+
+ }
+
+ for (i = 0; i < sizeof(tests) / sizeof (tests[0]); i++) {
+ igt_describe("Bla bla bla");
+ igt_subtest_f("plane-%s", tests[i].name)
+ colorop_plane_test(&display, tests[i].colorops);
+ }
+
+ igt_describe("Tests getting and setting COLOR_PIPELINE property on plane");
+#if 0
+ igt_subtest("plane-srgb") {
+ colorop_plane_test(&display, colorops_srgb);
+ }
+ igt_subtest("plane-inv_srgb") {
+ colorop_plane_test(&display, colorops_srgb_inv);
+ }
+#endif
+ igt_fixture {
+
+ igt_display_fini(&display);
+ }
+}
+
diff --git a/tests/kms_colorop.h b/tests/kms_colorop.h
new file mode 100644
index 000000000000..8102d25b13be
--- /dev/null
+++ b/tests/kms_colorop.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __KMS_COLOROP_H__
+#define __KMS_COLOROP_H__
+
+#include "igt_color.h"
+
+typedef bool (*compare_fb_t)(igt_fb_t *in, igt_fb_t *out);
+
+typedef int (*transform_fb)(igt_fb_t *in);
+
+typedef int (*transform_pixel)(igt_pixel_t *pixel);
+
+/* Test version definitions */
+typedef enum kms_colorop_type {
+ KMS_COLOROP_ENUMERATED_LUT1D,
+ KMS_COLOROP_CUSTOM_LUT1D,
+ KMS_COLOROP_CTM,
+ KMS_COLOROP_LUT3D
+} kms_colorop_type_t;
+
+typedef enum kms_colorop_lut1d_tf {
+ KMS_COLOROP_LUT1D_SRGB_EOTF,
+ KMS_COLOROP_LUT1D_SRGB_INV_EOTF,
+ KMS_COLOROP_LUT1D_PQ_EOTF,
+ KMS_COLOROP_LUT1D_PQ_INV_EOTF,
+} kms_colorop_lut1d_tf_t;
+
+typedef struct kms_colorop_enumerated_lut1d_info {
+ kms_colorop_lut1d_tf_t tf;
+} kms_colorop_enumerated_lut1d_info_t;
+
+typedef struct kms_colorop {
+ kms_colorop_type_t type;
+
+ union {
+ kms_colorop_enumerated_lut1d_info_t enumerated_lut1d_info;
+ };
+
+ const char *name;
+
+ igt_pixel_transform transform;
+
+ /* Mapped colorop */
+ igt_colorop_t *colorop;
+
+} kms_colorop_t;
+
+kms_colorop_t kms_colorop_srgb_eotf = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_SRGB_EOTF
+ },
+ .name = "srgb_eotf",
+ .transform = &igt_color_srgb_eotf
+};
+
+kms_colorop_t kms_colorop_srgb_inv_eotf = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_SRGB_INV_EOTF
+ },
+ .name = "srgb_inv_eotf",
+ .transform = &igt_color_srgb_inv_eotf
+};
+
+#endif /* __KMS_COLOROP_H__ */
diff --git a/tests/meson.build b/tests/meson.build
index 5afcd8cbba9e..2cf6e1412c92 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -23,6 +23,7 @@ test_progs = [
'kms_bw',
'kms_color',
'kms_concurrent',
+ 'kms_colorop',
'kms_content_protection',
'kms_cursor_crc',
'kms_cursor_edge_walk',
--
2.42.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [igt-dev] ✗ Fi.CI.BUILD: failure for IGT tests for the KMS Color Pipeline API (rev2)
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (7 preceding siblings ...)
2023-10-19 21:23 ` [igt-dev] [RFC PATCH v2 8/8] tests/kms_colorop: Add kms_colorop tests Harry Wentland
@ 2023-10-23 21:16 ` Patchwork
2023-10-23 21:23 ` [igt-dev] ✗ GitLab.Pipeline: warning " Patchwork
9 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2023-10-23 21:16 UTC (permalink / raw)
To: Harry Wentland; +Cc: igt-dev
== Series Details ==
Series: IGT tests for the KMS Color Pipeline API (rev2)
URL : https://patchwork.freedesktop.org/series/123448/
State : failure
== Summary ==
IGT patchset build failed on latest successful build
15e7d92ca5f98d10feffa27a76724c33cbd68da5 tests/kms_cursor_crc: Fix test intermittent failures on AMD gpu
Tail of build.log:
../../../usr/src/igt-gpu-tools/lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
[112/1650] Compiling C object 'tests/59830eb@@kms_color@exe/kms_color_helper.c.o'.
FAILED: tests/59830eb@@kms_color@exe/kms_color_helper.c.o
cc -Itests/59830eb@@kms_color@exe -Itests -I../../../usr/src/igt-gpu-tools/tests -I../../../usr/src/igt-gpu-tools/include -I../../../usr/src/igt-gpu-tools/include/drm-uapi -I../../../usr/src/igt-gpu-tools/include/linux-uapi -Ilib -I../../../usr/src/igt-gpu-tools/lib -I../../../usr/src/igt-gpu-tools/lib/stubs/syscalls -I. -I../../../usr/src/igt-gpu-tools/ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/x86_64-linux-gnu -I/usr/include/valgrind -I/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@kms_color@exe/kms_color_helper.c.o' -MF 'tests/59830eb@@kms_color@exe/kms_color_helper.c.o.d' -o 'tests/59830eb@@kms_color@exe/kms_color_helper.c.o' -c ../../../usr/src/igt-gpu-tools/tests/kms_color_helper.c
In file included from ../../../usr/src/igt-gpu-tools/lib/igt.h:38,
from ../../../usr/src/igt-gpu-tools/tests/kms_color_helper.h:38,
from ../../../usr/src/igt-gpu-tools/tests/kms_color_helper.c:25:
../../../usr/src/igt-gpu-tools/lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
[113/1650] Compiling C object 'tests/59830eb@@kms_concurrent@exe/kms_concurrent.c.o'.
FAILED: tests/59830eb@@kms_concurrent@exe/kms_concurrent.c.o
cc -Itests/59830eb@@kms_concurrent@exe -Itests -I../../../usr/src/igt-gpu-tools/tests -I../../../usr/src/igt-gpu-tools/include -I../../../usr/src/igt-gpu-tools/include/drm-uapi -I../../../usr/src/igt-gpu-tools/include/linux-uapi -Ilib -I../../../usr/src/igt-gpu-tools/lib -I../../../usr/src/igt-gpu-tools/lib/stubs/syscalls -I. -I../../../usr/src/igt-gpu-tools/ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/x86_64-linux-gnu -I/usr/include/valgrind -I/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@kms_concurrent@exe/kms_concurrent.c.o' -MF 'tests/59830eb@@kms_concurrent@exe/kms_concurrent.c.o.d' -o 'tests/59830eb@@kms_concurrent@exe/kms_concurrent.c.o' -c ../../../usr/src/igt-gpu-tools/tests/kms_concurrent.c
In file included from ../../../usr/src/igt-gpu-tools/lib/igt.h:38,
from ../../../usr/src/igt-gpu-tools/tests/kms_concurrent.c:25:
../../../usr/src/igt-gpu-tools/lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
[114/1650] Compiling C object 'tests/59830eb@@kms_atomic@exe/kms_atomic.c.o'.
FAILED: tests/59830eb@@kms_atomic@exe/kms_atomic.c.o
cc -Itests/59830eb@@kms_atomic@exe -Itests -I../../../usr/src/igt-gpu-tools/tests -I../../../usr/src/igt-gpu-tools/include -I../../../usr/src/igt-gpu-tools/include/drm-uapi -I../../../usr/src/igt-gpu-tools/include/linux-uapi -Ilib -I../../../usr/src/igt-gpu-tools/lib -I../../../usr/src/igt-gpu-tools/lib/stubs/syscalls -I. -I../../../usr/src/igt-gpu-tools/ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/x86_64-linux-gnu -I/usr/include/valgrind -I/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@kms_atomic@exe/kms_atomic.c.o' -MF 'tests/59830eb@@kms_atomic@exe/kms_atomic.c.o.d' -o 'tests/59830eb@@kms_atomic@exe/kms_atomic.c.o' -c ../../../usr/src/igt-gpu-tools/tests/kms_atomic.c
In file included from ../../../usr/src/igt-gpu-tools/lib/igt.h:38,
from ../../../usr/src/igt-gpu-tools/tests/kms_atomic.c:47:
../../../usr/src/igt-gpu-tools/lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
[115/1650] Compiling C object 'tests/59830eb@@kms_color@exe/kms_color.c.o'.
FAILED: tests/59830eb@@kms_color@exe/kms_color.c.o
cc -Itests/59830eb@@kms_color@exe -Itests -I../../../usr/src/igt-gpu-tools/tests -I../../../usr/src/igt-gpu-tools/include -I../../../usr/src/igt-gpu-tools/include/drm-uapi -I../../../usr/src/igt-gpu-tools/include/linux-uapi -Ilib -I../../../usr/src/igt-gpu-tools/lib -I../../../usr/src/igt-gpu-tools/lib/stubs/syscalls -I. -I../../../usr/src/igt-gpu-tools/ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/x86_64-linux-gnu -I/usr/include/valgrind -I/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@kms_color@exe/kms_color.c.o' -MF 'tests/59830eb@@kms_color@exe/kms_color.c.o.d' -o 'tests/59830eb@@kms_color@exe/kms_color.c.o' -c ../../../usr/src/igt-gpu-tools/tests/kms_color.c
In file included from ../../../usr/src/igt-gpu-tools/lib/igt.h:38,
from ../../../usr/src/igt-gpu-tools/tests/kms_color_helper.h:38,
from ../../../usr/src/igt-gpu-tools/tests/kms_color.c:30:
../../../usr/src/igt-gpu-tools/lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
[116/1650] Compiling C object 'lib/tests/dc197ac@@igt_ktap_parser@exe/igt_ktap_parser.c.o'.
[117/1650] Generating i915-perf-registers-mtlgt3 with a custom command.
[118/1650] Compiling C object 'tests/59830eb@@dumb_buffer@exe/dumb_buffer.c.o'.
[119/1650] Generating i915-perf-metrics-mtlgt3 with a custom command.
[120/1650] Generating i915-perf-registers-acmgt1 with a custom command.
[121/1650] Generating i915-perf-metrics-acmgt1 with a custom command.
[122/1650] Generating i915-perf-registers-acmgt2 with a custom command.
[123/1650] Compiling C object 'lib/76b5a35@@igt_device_scan@sta/igt_device_scan.c.o'.
[124/1650] Generating i915-perf-metrics-acmgt2 with a custom command.
[125/1650] Generating i915-perf-registers-acmgt3 with a custom command.
[126/1650] Generating i915-perf-metrics-acmgt3 with a custom command.
[127/1650] Generating i915-perf-equations with a custom command.
ninja: build stopped: subcommand failed.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [igt-dev] ✗ GitLab.Pipeline: warning for IGT tests for the KMS Color Pipeline API (rev2)
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
` (8 preceding siblings ...)
2023-10-23 21:16 ` [igt-dev] ✗ Fi.CI.BUILD: failure for IGT tests for the KMS Color Pipeline API (rev2) Patchwork
@ 2023-10-23 21:23 ` Patchwork
9 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2023-10-23 21:23 UTC (permalink / raw)
To: Harry Wentland; +Cc: igt-dev
== Series Details ==
Series: IGT tests for the KMS Color Pipeline API (rev2)
URL : https://patchwork.freedesktop.org/series/123448/
State : warning
== Summary ==
Pipeline status: FAILED.
see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/1017014 for the overview.
build:tests-debian-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654399):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1632] Generating version.h with a custom command.
[2/1632] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1632] Linking static target lib/libigt-drmtest_c.a.
[4/1632] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
cc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/x86_64-linux-gnu -I/usr/include/valgrind -I/usr/include/alsa -I/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
drmModeColorop *drm_colorop;
^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096163:step_script
section_start:1698096163:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096164:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-debian-meson-arm64 has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654402):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1295] Generating version.h with a custom command.
[2/1295] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1295] Linking static target lib/libigt-drmtest_c.a.
[4/1295] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
/usr/bin/aarch64-linux-gnu-gcc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/aarch64-linux-gnu -I/usr/include/valgrind -I/usr/include/alsa -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
drmModeColorop *drm_colorop;
^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096171:step_script
section_start:1698096171:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096172:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-debian-meson-armhf has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654401):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1300] Generating version.h with a custom command.
[2/1300] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1300] Linking static target lib/libigt-drmtest_c.a.
[4/1300] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
/usr/bin/arm-linux-gnueabihf-gcc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/arm-linux-gnueabihf -I/usr/include/valgrind -I/usr/include/alsa -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
drmModeColorop *drm_colorop;
^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096175:step_script
section_start:1698096175:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096176:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-debian-meson-mips has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654403):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1296] Generating version.h with a custom command.
[2/1296] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1296] Linking static target lib/libigt-drmtest_c.a.
[4/1296] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
/usr/bin/mips-linux-gnu-gcc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/mips-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/mips-linux-gnu -I/usr/include/valgrind -I/usr/include/alsa -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
drmModeColorop *drm_colorop;
^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096173:step_script
section_start:1698096173:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096175:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-debian-minimal has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654400):
[30/556] Generating i915-perf-equations with a custom command.
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/530] Generating version.h with a custom command.
[2/529] Linking static target lib/libigt-drmtest_c.a.
[3/529] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
cc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I../lib/stubs/libunwind -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
drmModeColorop *drm_colorop;
^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096165:step_script
section_start:1698096165:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096166:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654394):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1639] Generating version.h with a custom command.
[2/1639] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1639] Linking static target lib/libigt-drmtest_c.a.
[4/1639] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
cc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/opt/igt/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096163:step_script
section_start:1698096163:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096165:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654398):
[4/1637] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
clang -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -Xclang -fcolor-diagnostics -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/dmabuf_sync_file.c:6:
In file included from ../lib/igt.h:38:
../lib/igt_kms.h:399:2: error: unknown type name 'drmModeColorop'; did you mean 'drmModeClip'?
drmModeColorop *drm_colorop;
^~~~~~~~~~~~~~
drmModeClip
/usr/include/xf86drmMode.h:226:30: note: 'drmModeClip' declared here
typedef struct drm_clip_rect drmModeClip, *drmModeClipPtr;
^
1 error generated.
ninja: build stopped: subcommand failed.
section_end:1698096170:step_script
section_start:1698096170:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096171:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-no-libdrm-nouveau has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654397):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1477] Generating version.h with a custom command.
[2/1477] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1477] Linking static target lib/libigt-drmtest_c.a.
[4/1477] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
cc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096163:step_script
section_start:1698096163:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096165:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-no-libunwind has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654395):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1640] Generating version.h with a custom command.
[2/1640] Compiling C object 'lib/76b5a35@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1640] Linking static target lib/libigt-drmtest_c.a.
[4/1640] Compiling C object 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
cc -Ilib/76b5a35@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I../lib/stubs/libunwind -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/76b5a35@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096165:step_script
section_start:1698096165:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096166:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-oldest-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/50654396):
ninja: build stopped: subcommand failed.
ninja: Entering directory `build'
[1/1641] Generating version.h with a custom command.
[2/1641] Compiling C object 'lib/lib@@igt-drmtest_c@sta/drmtest.c.o'.
[3/1641] Linking static target lib/libigt-drmtest_c.a.
[4/1641] Compiling C object 'lib/lib@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o'.
FAILED: lib/lib@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o
cc -Ilib/lib@@igt-dmabuf_sync_file_c@sta -Ilib -I../lib -I../include -I../include/drm-uapi -I../include/linux-uapi -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -fPIC -pthread '-DIGT_DATADIR="/usr/local/share/igt-gpu-tools"' '-DIGT_SRCDIR="/builds/gfx-ci/igt-ci-tags/tests"' '-DIGT_LOG_DOMAIN="dmabuf_sync_file"' -MD -MQ 'lib/lib@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -MF 'lib/lib@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o.d' -o 'lib/lib@@igt-dmabuf_sync_file_c@sta/dmabuf_sync_file.c.o' -c ../lib/dmabuf_sync_file.c
In file included from ../lib/igt.h:38,
from ../lib/dmabuf_sync_file.c:6:
../lib/igt_kms.h:399:2: error: unknown type name ‘drmModeColorop’
399 | drmModeColorop *drm_colorop;
| ^~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.
section_end:1698096166:step_script
section_start:1698096166:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1698096167:cleanup_file_variables
ERROR: Job failed: exit code 1
== Logs ==
For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/1017014
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-10-23 21:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-19 21:22 [igt-dev] [RFC PATCH v2 0/8] IGT tests for the KMS Color Pipeline API Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 1/8] lib/drmtest: Add is_vkms_device() Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 2/8] include/drm-uapi: Add COLOROP object Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 3/8] lib/igt_kms: Introduce drm_colorop object Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 4/8] lib/igt_kms: Add new COLOR PIPELINE plane property Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 5/8] tests/kms_properties: Add colorop properties test Harry Wentland
2023-10-19 21:22 ` [igt-dev] [RFC PATCH v2 6/8] igt/color: Add SW color transform functionality Harry Wentland
2023-10-19 21:23 ` [igt-dev] [RFC PATCH v2 7/8] lib/igt_fb: Add copy_fb function Harry Wentland
2023-10-19 21:23 ` [igt-dev] [RFC PATCH v2 8/8] tests/kms_colorop: Add kms_colorop tests Harry Wentland
2023-10-23 21:16 ` [igt-dev] ✗ Fi.CI.BUILD: failure for IGT tests for the KMS Color Pipeline API (rev2) Patchwork
2023-10-23 21:23 ` [igt-dev] ✗ GitLab.Pipeline: warning " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox