[RFC v2 13/22] drm: Add Plane CTM property

[Uma Shankar]

Add a blob property for plane CSC usage.

Signed-off-by: Uma Shankar <uma.shan...@intel.com>
---
 drivers/gpu/drm/drm_atomic_state_helper.c |  3 +++
 drivers/gpu/drm/drm_atomic_uapi.c         | 10 ++++++++++
 drivers/gpu/drm/drm_color_mgmt.c          | 11 +++++++++++
 include/drm/drm_plane.h                   | 15 +++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c 
b/drivers/gpu/drm/drm_atomic_state_helper.c
index 6e358067cb7a..fafb8af1c9cb 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -314,6 +314,8 @@ void __drm_atomic_helper_plane_duplicate_state(struct 
drm_plane *plane,
 
        if (state->degamma_lut)
                drm_property_blob_get(state->degamma_lut);
+       if (state->ctm)
+               drm_property_blob_get(state->ctm);
 
        state->color_mgmt_changed = false;
 }
@@ -363,6 +365,7 @@ void __drm_atomic_helper_plane_destroy_state(struct 
drm_plane_state *state)
 
        drm_property_blob_put(state->fb_damage_clips);
        drm_property_blob_put(state->degamma_lut);
+       drm_property_blob_put(state->ctm);
 }
 EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);
 
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c 
b/drivers/gpu/drm/drm_atomic_uapi.c
index 904291b96ba9..e736fd7c1d5b 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -605,6 +605,14 @@ static int drm_atomic_plane_set_property(struct drm_plane 
*plane,
                                        &replaced);
                state->color_mgmt_changed |= replaced;
                return ret;
+       } else if (property == plane->ctm_property) {
+               ret = drm_atomic_replace_property_blob_from_id(dev,
+                                       &state->ctm,
+                                       val,
+                                       sizeof(struct drm_color_ctm), -1,
+                                       &replaced);
+               state->color_mgmt_changed |= replaced;
+               return ret;
        } else if (property == config->prop_fb_damage_clips) {
                ret = drm_atomic_replace_property_blob_from_id(dev,
                                        &state->fb_damage_clips,
@@ -676,6 +684,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
        } else if (property == plane->degamma_lut_property) {
                *val = (state->degamma_lut) ?
                        state->degamma_lut->base.id : 0;
+       } else if (property == plane->ctm_property) {
+               *val = (state->ctm) ? state->ctm->base.id : 0;
        } else if (property == config->prop_fb_damage_clips) {
                *val = (state->fb_damage_clips) ?
                        state->fb_damage_clips->base.id : 0;
diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
index 29d0fc1e52b5..83832adf3adf 100644
--- a/drivers/gpu/drm/drm_color_mgmt.c
+++ b/drivers/gpu/drm/drm_color_mgmt.c
@@ -602,6 +602,10 @@ EXPORT_SYMBOL(drm_plane_create_color_properties);
  *     engine, thereby making the content as linear for further color
  *     processing.
  *
+ * ctm_property:
+ *     Blob property which allows a userspace to provide CTM coefficients
+ *     to do color space conversion or any other enhancement by doing a
+ *     matrix multiplication using the h/w CTM processing engine
  */
 int drm_plane_create_color_mgmt_properties(struct drm_device *dev,
                                           struct drm_plane *plane,
@@ -623,6 +627,13 @@ int drm_plane_create_color_mgmt_properties(struct 
drm_device *dev,
 
        plane->degamma_lut_property = prop;
 
+       prop = drm_property_create(dev, DRM_MODE_PROP_BLOB,
+                                  "PLANE_CTM", 0);
+       if (!prop)
+               return -ENOMEM;
+
+       plane->ctm_property = prop;
+
        return 0;
 }
 EXPORT_SYMBOL(drm_plane_create_color_mgmt_properties);
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index fbfada0b990d..c4ed1799ecaf 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -255,6 +255,14 @@ struct drm_plane_state {
         */
        struct drm_property_blob *degamma_lut;
 
+       /**
+        * @ctm:
+        *
+        * Color transformation matrix. See drm_plane_enable_color_mgmt(). The
+        * blob (if not NULL) is a &struct drm_color_ctm.
+        */
+       struct drm_property_blob *ctm;
+
        u8 color_mgmt_changed : 1;
 };
 
@@ -779,6 +787,13 @@ struct drm_plane {
         * used to convert the framebuffer's colors to linear gamma.
         */
        struct drm_property *degamma_lut_property;
+
+       /**
+        * @plane_ctm_property: Optional Plane property to set the
+        * matrix used to convert colors after the lookup in the
+        * degamma LUT.
+        */
+       struct drm_property *ctm_property;
 };
 
 #define obj_to_plane(x) container_of(x, struct drm_plane, base)
-- 
2.26.2