[PATCH 02/10] drm: Add Plane Degamma properties
Shankar, Uma
uma.shankar at intel.com
Wed Feb 28 14:54:16 UTC 2018
>-----Original Message-----
>From: Sean Paul [mailto:seanpaul at chromium.org]
>Sent: Tuesday, February 27, 2018 8:44 PM
>To: Daniele Castagna <dcastagna at chromium.org>
>Cc: dri-devel at lists.freedesktop.org; brian.starkey at arm.com; Shankar, Uma
><uma.shankar at intel.com>
>Subject: Re: [PATCH 02/10] drm: Add Plane Degamma properties
>
>On Thu, Feb 15, 2018 at 12:32:52AM -0500, Daniele Castagna wrote:
>> From: "uma.shankar at intel.com (Uma Shankar)" <uma.shankar at intel.com>
>>
>> Add Plane Degamma as a blob property and plane degamma size as a range
>> property.
>>
>> (am from https://patchwork.kernel.org/patch/10046515/)
>
>The discussion on this previous version has some feedback on using 32-bit values
>in the gamma lut instead of 16-bit. Have you considered this?
>
This needs to be modified. Will address this and send a next version.
Kept it on hold since was trying to get a userspace implementation done.
But, it's good to refresh the series addressing all the review comments.
Thanks for the review Sean Paul.
>>
>> Change-Id: Iaead6f944a8b677227d1be11169f46178de533b1
>> Signed-off-by: Uma Shankar <uma.shankar at intel.com>
>> ---
>> drivers/gpu/drm/drm_atomic.c | 12 ++++++++++++
>> drivers/gpu/drm/drm_atomic_helper.c | 7 +++++++
>> drivers/gpu/drm/drm_mode_config.c | 14 ++++++++++++++
>> include/drm/drm_mode_config.h | 10 ++++++++++
>> include/drm/drm_plane.h | 10 ++++++++++
>> 5 files changed, 53 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/drm_atomic.c
>> b/drivers/gpu/drm/drm_atomic.c index b76d49218cf1d..4a06ff2fd1a5e
>> 100644
>> --- a/drivers/gpu/drm/drm_atomic.c
>> +++ b/drivers/gpu/drm/drm_atomic.c
>> @@ -717,6 +717,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); @@ -762,6 +764,12 @@ static int drm_atomic_plane_set_property(struct
>drm_plane *plane,
>> } else if (plane->funcs->atomic_set_property) {
>> return plane->funcs->atomic_set_property(plane, state,
>> property, val);
>> + } else if (property == config->plane_degamma_lut_property) {
>> + ret = drm_atomic_replace_property_blob_from_id(dev,
>> + &state->degamma_lut,
>> + val, -1, &replaced);
>> + state->color_mgmt_changed |= replaced;
>> + return ret;
>> } else {
>> return -EINVAL;
>> }
>> @@ -820,6 +828,9 @@ drm_atomic_plane_get_property(struct drm_plane
>*plane,
>> *val = state->zpos;
>> } else if (plane->funcs->atomic_get_property) {
>> return plane->funcs->atomic_get_property(plane, state,
>property,
>> val);
>> + } else if (property == config->plane_degamma_lut_property) {
>> + *val = (state->degamma_lut) ?
>> + state->degamma_lut->base.id : 0;
>> } else {
>> return -EINVAL;
>> }
>> @@ -944,6 +955,7 @@ static void drm_atomic_plane_print_state(struct
>drm_printer *p,
>> drm_printf(p, "\tcrtc-pos=" DRM_RECT_FMT "\n",
>DRM_RECT_ARG(&dest));
>> drm_printf(p, "\tsrc-pos=" DRM_RECT_FP_FMT "\n",
>DRM_RECT_FP_ARG(&src));
>> drm_printf(p, "\trotation=%x\n", state->rotation);
>> + 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 ab4032167094c..d3eaf4d397681 100644
>> --- a/drivers/gpu/drm/drm_atomic_helper.c
>> +++ b/drivers/gpu/drm/drm_atomic_helper.c
>> @@ -3488,7 +3488,12 @@ void
>__drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,
>> drm_framebuffer_get(state->fb);
>>
>> state->fence = NULL;
>> +
>
>Extra line snuck in here
>
Will rectify this.
>> state->commit = NULL;
>> +
>> + if (state->degamma_lut)
>> + drm_property_reference_blob(state->degamma_lut);
>> + state->color_mgmt_changed = false;
>> }
>> EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);
>>
>> @@ -3533,6 +3538,8 @@ void
>> __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state)
>>
>> if (state->commit)
>> drm_crtc_commit_put(state->commit);
>> +
>> + drm_property_unreference_blob(state->degamma_lut);
>> }
>> EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);
>>
>> diff --git a/drivers/gpu/drm/drm_mode_config.c
>> b/drivers/gpu/drm/drm_mode_config.c
>> index e5c653357024d..7d8e74715b565 100644
>> --- a/drivers/gpu/drm/drm_mode_config.c
>> +++ b/drivers/gpu/drm/drm_mode_config.c
>> @@ -348,6 +348,20 @@ static int
>drm_mode_create_standard_properties(struct drm_device *dev)
>> return -ENOMEM;
>> dev->mode_config.modifiers_property = prop;
>>
>> + prop = drm_property_create(dev,
>> + DRM_MODE_PROP_BLOB,
>> + "PLANE_DEGAMMA_LUT", 0);
>> + if (!prop)
>> + return -ENOMEM;
>> + dev->mode_config.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;
>> + dev->mode_config.plane_degamma_lut_size_property = prop;
>
>Since these are optional, we probably want a helper for them which is only called
>if a plane wants to use them instead of always instantiating them.
>
Ok, will update this.
>> +
>> return 0;
>> }
>>
>> diff --git a/include/drm/drm_mode_config.h
>> b/include/drm/drm_mode_config.h index 2cb6f02df64ab..dcec93d062b4d
>> 100644
>> --- a/include/drm/drm_mode_config.h
>> +++ b/include/drm/drm_mode_config.h
>> @@ -724,6 +724,16 @@ struct drm_mode_config {
>> * the degamma LUT as supported by the driver (read-only).
>> */
>> struct drm_property *degamma_lut_size_property;
>> + /**
>> + * @plane_degamma_lut_property: Optional Plane property to set the
>LUT
>> + * used to convert the framebuffer's colors to linear gamma.
>> + */
>> + struct drm_property *plane_degamma_lut_property;
>> + /**
>> + * @plane_degamma_lut_size_property: Optional Plane property for the
>> + * size of the degamma LUT as supported by the driver (read-only).
>> + */
>> + struct drm_property *plane_degamma_lut_size_property;
>
>Can we put these in drm_plane instead? If we do, we don't need the "plane_"
>prefix.
>
Yeah, will do that.
>> /**
>> * @ctm_property: Optional CRTC property to set the
>> * matrix used to convert colors after the lookup in the diff --git
>> a/include/drm/drm_plane.h b/include/drm/drm_plane.h index
>> 8185e3468a231..2f8f5db77a406 100644
>> --- a/include/drm/drm_plane.h
>> +++ b/include/drm/drm_plane.h
>> @@ -131,7 +131,17 @@ struct drm_plane_state {
>> */
>> struct drm_crtc_commit *commit;
>>
>> + /* @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.
>> + */
>> + struct drm_property_blob *degamma_lut;
>> +
>> struct drm_atomic_state *state;
>> +
>> + bool color_mgmt_changed : 1;
>> };
>>
>> static inline struct drm_rect
>> --
>> 2.16.1.291.g4437f3f132-goog
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>--
>Sean Paul, Software Engineer, Google / Chromium OS
More information about the dri-devel
mailing list