Add a new plane blob property "SET_COLOR_PIPELINE" using
which the user can select a color pipeline and send data
for corresponding hardware blocks.
Once the user space decides on a color pipeline, it can
set the pipeline and corresponding data for the hardware
blocks within the pipeline.
Co-developed-by: Chaitanya Kumar Borah <chaitanya.kumar.bo...@intel.com>
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.bo...@intel.com>
Signed-off-by: Uma Shankar <uma.shan...@intel.com>
---
drivers/gpu/drm/drm_atomic_uapi.c | 12 +++++++++
drivers/gpu/drm/drm_color_mgmt.c | 42 +++++++++++++++++++++++++++++++
include/drm/drm_plane.h | 22 ++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
b/drivers/gpu/drm/drm_atomic_uapi.c
index 98d3b10c08ae..a2d3393d21a2 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -590,6 +590,15 @@ static int drm_atomic_plane_set_property(struct drm_plane
*plane,
return ret;
} else if (property == plane->scaling_filter_property) {
state->scaling_filter = val;
+ } else if (property == plane->set_color_pipeline_prop) {
+ ret = drm_atomic_replace_property_blob_from_id(dev,
+ &state->set_color_pipeline_data,
+ val,
+ -1,
+ sizeof(struct drm_color_pipeline),
+ &replaced);
+ state->color_mgmt_changed |= replaced;
+ return ret;
} else if (plane->funcs->atomic_set_property) {
return plane->funcs->atomic_set_property(plane, state,
property, val);
@@ -651,6 +660,9 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
state->fb_damage_clips->base.id : 0;
} else if (property == plane->scaling_filter_property) {
*val = state->scaling_filter;
+ } else if (property == plane->set_color_pipeline_prop) {
+ *val = (state->set_color_pipeline_data) ?
+ state->set_color_pipeline_data->base.id : 0;
} else if (plane->funcs->atomic_get_property) {
return plane->funcs->atomic_get_property(plane, state,
property, val);
} else {
diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
index 43d0187faa98..3ef58da94556 100644
--- a/drivers/gpu/drm/drm_color_mgmt.c
+++ b/drivers/gpu/drm/drm_color_mgmt.c
@@ -634,6 +634,48 @@ void drm_plane_attach_get_color_pipeline_property(struct
drm_plane *plane)
}
EXPORT_SYMBOL(drm_plane_attach_get_color_pipeline_property);
+/**
+ * drm_plane_create_set_color_pipeline_property - create property to set color
pipeline
+ * @dev: DRM device
+ * @plane: plane object
+ *
+ * create blob property using which the user space can set up a plane color
pipeline.
+ * Userspace can send data for one or multiple hardware blocks in the pipeline.
+ */
+int drm_plane_create_set_color_pipeline_property(struct drm_device *dev,
+ struct drm_plane *plane)
+{
+ struct drm_property *prop;
+
+ prop = drm_property_create(dev, DRM_MODE_PROP_BLOB,
+ "SET_COLOR_PIPELINE", 0);
+ if (!prop)
+ return -ENOMEM;
+
+ plane->set_color_pipeline_prop = prop;
+
+ return 0;
+}
+EXPORT_SYMBOL(drm_plane_create_set_color_pipeline_property);
+
+/**
+ * drm_plane_attach_set_color_pipeline_property - attach set color pipeline
property to a plane
+ * @plane: plane object
+ *
+ * Attach "SET_COLOR_PIPELINE" property to a plane. The property will be
visible to
+ * the userspace once we attach the property. The default value is set to 0
indicating
+ * no colorpipeline which essentially disables all the color HW blocks in the
pipeline.
+ */
+void drm_plane_attach_set_color_pipeline_property(struct drm_plane *plane)
+{
+ if (!plane->set_color_pipeline_prop)
+ return;
+
+ drm_object_attach_property(&plane->base,
+ plane->set_color_pipeline_prop, 0);
+}
+EXPORT_SYMBOL(drm_plane_attach_set_color_pipeline_property);
+
/**
* drm_plane_add_color_pipeline - helper to add a color pipeline
* @plane: plane object
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index ffd7887c2acf..fcd589cb38f2 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -237,6 +237,20 @@ struct drm_plane_state {
/** @state: backpointer to global drm_atomic_state */
struct drm_atomic_state *state;
+
+ /**
+ * @set_color_pipeline_data:
+ *
+ * Stores information about the current selected color pipeline
+ */
+ struct drm_property_blob *set_color_pipeline_data;
+
+ /**
+ * @color_mgmt_changed: Plane color pipeline state has changed
+ * Used by the atomic helpers and
+ * drivers to steer the atomic commit control flow.
+ */
+ u8 color_mgmt_changed : 1;
};
static inline struct drm_rect
@@ -754,6 +768,11 @@ struct drm_plane {
* that the plane supports
*/
struct drm_property *get_color_pipeline_prop;
+
+ /**
+ * @set_color_pipeline_prop: Optional Plane property to set the color
pipeline
+ */
+ struct drm_property *set_color_pipeline_prop;
};
#define obj_to_plane(x) container_of(x, struct drm_plane, base)
@@ -955,6 +974,9 @@ int drm_plane_create_get_color_pipeline_property(struct
drm_device *dev,
struct drm_plane *plane,
int num_val);
void drm_plane_attach_get_color_pipeline_property(struct drm_plane *plane);
+int drm_plane_create_set_color_pipeline_property(struct drm_device *dev,
+ struct drm_plane *plane);
+void drm_plane_attach_set_color_pipeline_property(struct drm_plane *plane);
int drm_plane_add_color_pipeline(struct drm_plane *plane, char *name,
struct drm_color_op *color_pipeline,
size_t len);
--
2.38.1
