The generated histogram can be used the user algorithm to generate a LUT, which is referred as image enhanced LUT. This is fed back to the hardware to get an enhanced image.
Signed-off-by: Arun R Murthy <[email protected]> --- drivers/gpu/drm/drm_atomic_uapi.c | 21 +++++++++---- drivers/gpu/drm/drm_colorop.c | 62 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_colorop.h | 17 +++++++++++ 3 files changed, 94 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 3505c00dfc5168de3476fb94bced123f9c886cb2..579210be8288d6788a6cfc357394c3794b13a417 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -719,6 +719,7 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, ssize_t elem_size = -1; ssize_t size = -1; bool replaced = false; + u32 ret; switch (colorop->type) { case DRM_COLOROP_1D_LUT: @@ -731,17 +732,25 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, size = colorop->size * colorop->size * colorop->size * sizeof(struct drm_color_lut32); break; + case DRM_COLOROP_IET: + elem_size = state->data->length; + break; default: /* should never get here */ return -EINVAL; } - return drm_property_replace_blob_from_id(colorop->dev, - &state->data, - val, - size, - elem_size, - &replaced); + ret = drm_property_replace_blob_from_id(colorop->dev, + &state->data, + val, + size, + elem_size, + &replaced); + + if (colorop->type == DRM_COLOROP_IET && !ret) + state->iet_lut_updated |= replaced; + + return ret; } /** diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c index e3e22db3b911e79979488b1493e72cd9a11ed418..797a6f5ef79c7cc04109e87c44566f2461aee965 100644 --- a/drivers/gpu/drm/drm_colorop.c +++ b/drivers/gpu/drm/drm_colorop.c @@ -545,6 +545,68 @@ int drm_crtc_colorop_histogram_init(struct drm_colorop *colorop, } EXPORT_SYMBOL(drm_crtc_colorop_histogram_init); +/** + * drm_crtc_colorop_iet_lut_init + * + * @crtc: pointer to the struct drm_crtc. + * @caps: pointer to the struct drm_iet_caps, holds the + * image enhancement LUT hardware capabilities. + * + * This 1DLUT is used by the hardware to enahance the image. Hardware + * interpolates this LUT value to generate the enhanced output image. + * + * The blob property IET_LUT_CAPS points to the struct drm_iet_lut_caps + * The blob property DATA points to the struct drm_iet_1dlut_sample + * Description of the structure is in include/uapi/drm/drm_mode.h + * + * RETURNS: + * Zero for success or -errno + */ +int drm_crtc_colorop_iet_lut_init(struct drm_colorop *colorop, + struct drm_crtc *crtc, + struct drm_iet_caps *caps, + uint32_t flags) +{ + struct drm_property *prop; + struct drm_iet_caps *blob_data; + struct drm_property_blob *blob; + int ret = 0; + + ret = drm_crtc_colorop_init(crtc->dev, colorop, crtc, + DRM_COLOROP_IET, flags); + if (ret) + return ret; + + blob = drm_property_create_blob(crtc->dev, + sizeof(struct drm_iet_caps), + NULL); + if (IS_ERR(blob)) + return -1; + blob_data = blob->data; + blob_data->iet_mode = caps->iet_mode; + blob_data->nr_iet_sample_formats = caps->nr_iet_sample_formats; + blob_data->nr_iet_lut_entries = caps->nr_iet_lut_entries; + blob_data->iet_sample_format = caps->iet_sample_format; + + /* IET LUT Capabilities */ + prop = drm_property_create(crtc->dev, DRM_MODE_PROP_ATOMIC | + DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, + "IET_LUT_CAPS", blob->base.id); + if (!prop) + return -ENOMEM; + colorop->iet_lut_caps_property = prop; + drm_object_attach_property(&colorop->base, colorop->iet_lut_caps_property, + 0); + + /* IET LUT data */ + ret = drm_colorop_create_data_prop(crtc->dev, colorop); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_crtc_colorop_iet_lut_init); + static void __drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop, struct drm_colorop_state *state) { diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h index 4d905c13274c13d8d50e1c9e45a87feec72f82ae..fa37277232dbec3c7c58781d27cfaf62163b6922 100644 --- a/include/drm/drm_colorop.h +++ b/include/drm/drm_colorop.h @@ -215,6 +215,12 @@ struct drm_colorop_state { * Flag to say that the histogram data is updated by the KMD. */ bool histogram_updated; + /** + * @iet_lut_updated: + * + * Boolean flag to say that there are some updates on iet_lut property + */ + bool iet_lut_updated; /** @state: backpointer to global drm_atomic_state */ struct drm_atomic_state *state; @@ -399,6 +405,13 @@ struct drm_colorop { */ struct drm_property *histogram_data_property; + /** + * @iet_lut_caps_proeprty + * Optional colorpipeline property for writing the + * image enhanced LUT + */ + struct drm_property *iet_lut_caps_property; + /** * @data_property: * @@ -463,6 +476,10 @@ int drm_crtc_colorop_histogram_init(struct drm_colorop *colorop, struct drm_crtc *crtc, struct drm_histogram_caps *caps, uint32_t flags); +int drm_crtc_colorop_iet_lut_init(struct drm_colorop *colorop, + struct drm_crtc *crtc, + struct drm_iet_caps *caps, + uint32_t flags); struct drm_colorop_state * drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop); -- 2.25.1
