Leandro Ribeiro · 98e22b39 · 60130206 · 60130206 · 60130206 · 60130206
--- a/libweston/backend-drm/colorops.c 0 → 100644
+++ b/libweston/backend-drm/colorops.c 0 → 100644
+		return inverse ? WDRM_COLOROP_1D_CURVE_SRGB_INV_EOTF :
+				 WDRM_COLOROP_1D_CURVE_SRGB_EOTF;
+	case WESTON_TF_BT1886:
+		/* BT.2020 refers to BT.1886 EOTF for decoding. */
+		return inverse ? WDRM_COLOROP_1D_CURVE_BT2020_OETF :
+				 WDRM_COLOROP_1D_CURVE_BT2020_INV_OETF;
+	case WESTON_TF_ST2084_PQ:
+		/**
+		 * The PQ transfer function, scaled by 125.0f, so that 10,000
+		 * nits correspond to 125.0f.
+		 *
+		 * TODO: does that change how we handle this? Luminance mapping
+		 * required?
+		 */
+		return inverse ? WDRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF :
+				WDRM_COLOROP_1D_CURVE_PQ_125_EOTF;
--- a/libweston/backend-drm/colorops.c 0 → 100644
+++ b/libweston/backend-drm/colorops.c 0 → 100644
+
+	colorop_props = drmModeObjectGetProperties(device->drm.fd, colorop_id,
+						   DRM_MODE_OBJECT_COLOROP);
+	if (!colorop_props)
+		return NULL;
+
+	colorop = xzalloc(sizeof(*colorop));
+	colorop->id = colorop_id;
+	colorop->pipeline = pipeline;
+	wl_list_insert(pipeline->colorop_list.prev, &colorop->link);
+
+	for (i = 0; i < colorop_props->count_props; i++) {
+		prop = drmModeGetProperty(device->drm.fd, colorop_props->props[i]);
+
+		if (strcmp(prop->name, "TYPE") == 0) {
+			colorop->type = colorop_props->prop_values[i];
--- a/libweston/backend-drm/state-propose.c
+++ b/libweston/backend-drm/state-propose.c
+ * @param pipeline The DRM color pipeline to use.
+ * @return 0 on success, -1 on failure.
+ */
+int
+drm_color_pipeline_program(drmModeAtomicReq *req,
+			   struct drm_color_pipeline *pipeline)
+{
+	struct drm_plane *plane = pipeline->plane;
+	struct drm_backend *b = plane->device->backend;
+	struct weston_color_transform *xform = pipeline->state.xform;
+	uint32_t pipeline_id;
+	struct drm_colorop *colorop;
+
+	/* First colorop from the pipeline contains the pipeline id. */
+	colorop = wl_container_of(pipeline->colorop_list.next, colorop, link);
+	pipeline_id = colorop->id;
--- a/libweston/backend-drm/state-propose.c
+++ b/libweston/backend-drm/state-propose.c
+	}
+
+	/**
+	 * TODO:
+	 *
+	 * Either the pipelines are not compatible with our xform or we were
+	 * unable to optimize the xform to steps. Our last resource would be
+	 * crafting a shaper + 3D LUT from the xform. Let's check if any
+	 * pipelines would be able to handle that.
+	 */
+
+	return NULL;
+
+success:
+	pipeline = &plane->pipelines[i];
+	pipeline->state.xform = surf_xform->transform;
--- a/libweston/backend-drm/drm-internal.h
+++ b/libweston/backend-drm/drm-internal.h
 struct drm_color_pipeline {
 	struct drm_plane *plane;
 	struct wl_list colorop_list; /* drm_colorop::link */
+
+	struct {
+		struct weston_color_transform *xform;
+		uint32_t colorops_ids[3];
+	} state;
--- a/libweston/backend-drm/colorops.c
+++ b/libweston/backend-drm/colorops.c
+	 */
+	weston_assert_uint32_neq(b->compositor,
+				 curve->type, WESTON_COLOR_CURVE_TYPE_IDENTITY);
+
+	/* No previous colorop, so consider all of them. */
+	if (!previous_colorop)
+		consider = true;
+
+	wl_list_for_each(colorop, &pipeline->colorop_list, link) {
+		/* We only consider colorop after previous_colorop. */
+		if (colorop == previous_colorop) {
+			consider = true;
+			continue;
+		}
+		if (!consider)
+			continue;
--- a/libweston/backend-drm/colorops.c
+++ b/libweston/backend-drm/colorops.c
+ * @param type The colorop curve type.
+ * @return The string describing it.
+ */
+const char *
+drm_colorop_curve_type_to_str(struct weston_compositor *compositor,
+			      enum drm_colorop_curve_1d_type type)
+{
+	switch(type) {
+	case WDRM_COLOROP_1D_CURVE_SRGB_EOTF:
+		return "sRGB EOTF";
+	case WDRM_COLOROP_1D_CURVE_SRGB_INV_EOTF:
+		return "sRGB inv EOTF";
+	case WDRM_COLOROP_1D_CURVE_BT2020_INV_OETF:
+		return "BT.2020 inv OETF";
+	case WDRM_COLOROP_1D_CURVE_BT2020_OETF:
+		return "BT.2020 OETF";
--- a/libweston/backend-drm/colorops.c
+++ b/libweston/backend-drm/colorops.c
+int32_t
+weston_tf_to_colorop_curve(const struct weston_color_tf_info *tf_info, bool inverse)
+{
+	enum weston_transfer_function tf = tf_info->tf;
+
+	/* TODO: move this to 'color-properties.c'? */
+
+	switch(tf) {
+	case WESTON_TF_SRGB:
+		/* sRGB piece-wise is the EOTF, and its inverse is the OETF. */
+		return inverse ? WDRM_COLOROP_1D_CURVE_SRGB_INV_EOTF :
+				 WDRM_COLOROP_1D_CURVE_SRGB_EOTF;
+	case WESTON_TF_BT1886:
+		/* BT.2020 refers to BT.1886 EOTF for decoding. */
+		return inverse ? WDRM_COLOROP_1D_CURVE_BT2020_OETF :
+				 WDRM_COLOROP_1D_CURVE_BT2020_INV_OETF;
--- a/libweston/backend-drm/colorops.c
+++ b/libweston/backend-drm/colorops.c
+			matrix_3x4[i] = 0.0f;
+		} else {
+			matrix_3x4[i] = matrix_3x3[i - row];
+		}
+	}
+
+	mat_3x4 = xzalloc(sizeof(*mat_3x4));
+
+	for (i = 0; i < 12; i++) {
+		float val = matrix_3x4[i];
+		if (val < 0) {
+			mat_3x4->matrix[i] = (int64_t) (-val * ((int64_t) 1L << 32));
+			mat_3x4->matrix[i] |= 1ULL << 63;
+		} else {
+			mat_3x4->matrix[i] = (int64_t) (val * ((int64_t) 1L << 32));
+		}
--- a/libweston/backend-drm/colorops.c
+++ b/libweston/backend-drm/colorops.c
+	float matrix_3x4[12] = {0.0f};
+	float matrix_3x3[9] = {0.0f};
+	unsigned int i, row, col;
+	uint32_t blob_id;
+	int ret;
+
+	/* No need, color mapping already cached. */
+	wl_list_for_each(color_mapping, &plane->cached_color_mapping_list, link)
+		if (color_mapping->mapping == mapping)
+			return color_mapping;
+
+	/* mapping->u.mat.matrix is in column-major order.
+	 * Let's put it in row-major order. */
+	for (row = 0; row < 3; row++)
+		for (col = 0; col < 3; col++)
+			matrix_3x3[row * 3 + col] = mapping->u.mat.matrix[col * 3 + row];
-	for (row = 0; row < 3; row++)
-		for (col = 0; col < 3; col++)
-			matrix_3x3[row * 3 + col] = mapping->u.mat.matrix[col * 3 + row];
+	for (row = 0; row < 3; row++) {
+		for (col = 0; col < 3; col++)
+			mat_3x4->matrix[row * 4 + col] = xxx(mapping->u.mat.matrix[col * 3 + row]);
+		mat_3x4->matrix[row * 4 + 3] = xxx(0);
+	}
--- a/libweston/backend-drm/colorops.c
+++ b/libweston/backend-drm/colorops.c
+	ret = drmModeCreatePropertyBlob(device->drm.fd, shaper,
+					len_shaper * sizeof(*shaper),
+					&blob_id_shaper);
+	free(shaper);
+
+	if (ret < 0) {
+		free(cm_lut3d);
+		return NULL;
+	}
+
+	/* Create the DRM object for the 3D LUT. */
+	lut3d = xzalloc(len_lut3d * len_lut3d * len_lut3d * sizeof(*lut3d));
+	for (i = 0; i < len_lut3d * len_lut3d * len_lut3d; i++) {
+		lut3d[i].red   = cm_lut3d[3 * i + 0] * 0xffff;
+		lut3d[i].green = cm_lut3d[3 * i + 1] * 0xffff;
+		lut3d[i].blue  = cm_lut3d[3 * i + 2] * 0xffff;
--- a/libweston/backend-drm/drm-internal.h
+++ b/libweston/backend-drm/drm-internal.h
 	uint32_t blob_id;
 };

+struct drm_color_shaper_3dlut {
+	struct wl_list link; /* drm_plane::cached_color_shaper_3d_lut */
+	struct drm_plane *plane;
+
+	struct weston_color_transform *xform;
+	struct wl_listener destroy_listener;
+	uint32_t len_shaper;
+	uint32_t len_3dlut;
+
+	uint32_t blob_id_shaper;
+	uint32_t blob_id_lut3d;
+};