Re: [RFC v4 2/8] drm: Add Plane Degamma properties

Hi Uma,

On Fri, Aug 17, 2018 at 07:48:45PM +0530, Uma Shankar wrote:

Add Plane Degamma as a blob property and plane degamma size as a range property.

v2: Rebase

v3: Fixed Sean, Paul's review comments. Moved the property from mode_config to drm_plane. Created a helper function to instantiate these properties and removed from drm_mode_create_standard_properties Added property documentation as suggested by Daniel, Vetter.

v4: Rebase

Signed-off-by: Uma Shankar uma.shankar@intel.com

Documentation/gpu/drm-kms.rst | 9 +++++++++ drivers/gpu/drm/drm_atomic.c | 13 +++++++++++++ drivers/gpu/drm/drm_atomic_helper.c | 6 ++++++ drivers/gpu/drm/drm_plane.c | 35 +++++++++++++++++++++++++++++++++++ include/drm/drm_plane.h | 24 ++++++++++++++++++++++++ 5 files changed, 87 insertions(+)

diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst index 5dee6b8..8b10b12 100644 --- a/Documentation/gpu/drm-kms.rst +++ b/Documentation/gpu/drm-kms.rst @@ -551,6 +551,15 @@ Color Management Properties .. kernel-doc:: drivers/gpu/drm/drm_color_mgmt.c :export:

+Plane Color Management Properties +---------------------------

+.. kernel-doc:: drivers/gpu/drm/drm_plane.c

• :doc: degamma_lut_property

+.. kernel-doc:: drivers/gpu/drm/drm_plane.c

• :doc: degamma_lut_size_property

Tile Group Property

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 3eb061e..f8cad9b 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -857,6 +857,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, { struct drm_device *dev = plane->dev; struct drm_mode_config *config = &dev->mode_config;

• bool replaced = false;

• int ret;

  if (property == config->prop_fb_id) { struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, NULL, val);

@@ -908,6 +910,13 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->color_encoding = val; } else if (property == plane->color_range_property) { state->color_range = val;

• } else if (property == plane->degamma_lut_property) {

• ret = drm_atomic_replace_property_blob_from_id(dev,
  

• 			&state->degamma_lut,
  

• 			val, -1, sizeof(struct drm_color_lut),
  

• 			&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);

@@ -976,6 +985,9 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->color_encoding; } else if (property == plane->color_range_property) { *val = state->color_range;

• } else if (property == plane->degamma_lut_property) {

• *val = (state->degamma_lut) ?
  

• 	state->degamma_lut->base.id : 0;
  

  } else if (plane->funcs->atomic_get_property) { return plane->funcs->atomic_get_property(plane, state, property, val); } else {

@@ -1116,6 +1128,7 @@ static void drm_atomic_plane_print_state(struct drm_printer *p, drm_get_color_encoding_name(state->color_encoding)); drm_printf(p, "\tcolor-range=%s\n", drm_get_color_range_name(state->color_range));

• drm_printf(p, "\tcolor_mgmt_changed=%d\n", state->color_mgmt_changed);

  if (plane->funcs->atomic_print_state) plane->funcs->atomic_print_state(p, state);

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 38ce9a3..67c5b51 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3613,6 +3613,10 @@ void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,

state->fence = NULL; state->commit = NULL;

• if (state->degamma_lut)

• drm_property_blob_get(state->degamma_lut);
  

• state->color_mgmt_changed = false;

} EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);

@@ -3657,6 +3661,8 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state)

if (state->commit) drm_crtc_commit_put(state->commit);

• drm_property_blob_put(state->degamma_lut);

} EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);

diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index cd71fd0..03e0560 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -478,6 +478,41 @@ int drm_mode_plane_set_obj_prop(struct drm_plane *plane, } EXPORT_SYMBOL(drm_mode_plane_set_obj_prop);

+/**

• • DOC: degamma_lut_property
• • degamma_lut_property:
• • Blob property which allows a userspace to provide LUT values
• • to apply degamma curve using the h/w plane degamma processing
• • engine, thereby making the content as linear for further color
• • processing.
• • degamma_lut_size_property:
• • Range Property to indicate size of the plane degamma LUT.
• */

+int drm_plane_color_create_prop(struct drm_device *dev,

• 		struct drm_plane *plane)
  

+{

• struct drm_property *prop;
• prop = drm_property_create(dev,

• 	DRM_MODE_PROP_BLOB,
  

• 	"PLANE_DEGAMMA_LUT", 0);
  

• if (!prop)

• return -ENOMEM;
  

• plane->degamma_lut_property = prop;
• prop = drm_property_create_range(dev,

• 	DRM_MODE_PROP_IMMUTABLE,
  

• 	"PLANE_DEGAMMA_LUT_SIZE", 0, UINT_MAX);
  

• if (!prop)

• return -ENOMEM;
  

• plane->degamma_lut_size_property = prop;
• return 0;

+} +EXPORT_SYMBOL(drm_plane_color_create_prop);

int drm_mode_getplane_res(struct drm_device *dev, void *data, struct drm_file *file_priv) { diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 8a152dc..28357ac 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -174,6 +174,14 @@ struct drm_plane_state { */ bool visible;

• /* @degamma_lut:

• *
  

• * Lookup table for converting framebuffer pixel data before apply the
  

• * color conversion matrix @ctm. See drm_plane_enable_color_mgmt(). The
  

• * blob (if not NULL) is an array of &struct drm_color_lut_ext.
  

• */
  

• struct drm_property_blob *degamma_lut;
• /**
  • @commit: Tracks the pending commit to prevent use-after-free conditions,
  • and for async plane updates.

@@ -184,6 +192,8 @@ struct drm_plane_state {

/** @state: backpointer to global drm_atomic_state */ struct drm_atomic_state *state;

• u8 color_mgmt_changed : 1;

};

static inline struct drm_rect @@ -676,6 +686,18 @@ struct drm_plane { * See drm_plane_create_color_properties(). */ struct drm_property *color_range_property;

• /**

• * @degamma_lut_property: Optional Plane property to set the LUT
  

• * used to convert the framebuffer's colors to linear gamma.
  

• */
  

• struct drm_property *degamma_lut_property;
• /**

• * @degamma_lut_size_property: Optional Plane property for the
  

• * size of the degamma LUT as supported by the driver (read-only).
  

• */
  

• struct drm_property *degamma_lut_size_property;

};

#define obj_to_plane(x) container_of(x, struct drm_plane, base) @@ -725,6 +747,8 @@ static inline u32 drm_plane_mask(const struct drm_plane *plane) int drm_mode_plane_set_obj_prop(struct drm_plane *plane, struct drm_property *property, uint64_t value); +int drm_plane_color_create_prop(struct drm_device *dev,

• 		struct drm_plane *plane);
  
  

/**

• drm_plane_find - find a &drm_plane

-- 1.9.1

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by: Alexandru Gheorghe alexandru-cosmin.gheorghe@arm.com