Create properties associated for histogram and then export function to initialize the color pipeline element histogram. The properties include histogram capabilities, enable and data.
Signed-off-by: Arun R Murthy <[email protected]> --- drivers/gpu/drm/drm_atomic_uapi.c | 18 +++++++++ drivers/gpu/drm/drm_colorop.c | 84 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_colorop.h | 55 +++++++++++++++++++++++++ 3 files changed, 157 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index f2ba8e4c2bf2317880eed9d17f7ba3b113f2c057..3505c00dfc5168de3476fb94bced123f9c886cb2 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -778,6 +778,9 @@ static int drm_atomic_colorop_set_property(struct drm_colorop *colorop, struct drm_property *property, uint64_t val) { + u32 ret = 0; + bool replaced = false; + if (property == colorop->bypass_property) { state->bypass = val; } else if (property == colorop->lut1d_interpolation_property) { @@ -788,6 +791,15 @@ static int drm_atomic_colorop_set_property(struct drm_colorop *colorop, state->multiplier = val; } else if (property == colorop->lut3d_interpolation_property) { colorop->lut3d_interpolation = val; + } else if (property == colorop->histogram_enable_property) { + ret = drm_property_replace_blob_from_id(colorop->dev, + &state->histogram_enable, + val, + -1, + sizeof(struct drm_histogram_config), + &replaced); + state->histogram_updated |= replaced; + return ret; } else if (property == colorop->data_property) { return drm_atomic_color_set_data_property(colorop, state, property, val); @@ -823,6 +835,12 @@ drm_atomic_colorop_get_property(struct drm_colorop *colorop, *val = colorop->lut3d_interpolation; else if (property == colorop->data_property) *val = (state->data) ? state->data->base.id : 0; + else if (property == colorop->histogram_caps_property) + *val = (state->histogram_caps) ? state->histogram_caps->base.id : 0; + else if (property == colorop->histogram_enable_property) + *val = (state->histogram_enable) ? state->histogram_enable->base.id : 0; + else if (property == colorop->histogram_data_property) + *val = (state->histogram_data) ? state->histogram_data->base.id : 0; else return -EINVAL; diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c index 96eaaa078281a48dad057e06900b112ebb032631..e3e22db3b911e79979488b1493e72cd9a11ed418 100644 --- a/drivers/gpu/drm/drm_colorop.c +++ b/drivers/gpu/drm/drm_colorop.c @@ -461,6 +461,90 @@ int drm_plane_colorop_3dlut_init(struct drm_device *dev, struct drm_colorop *col } EXPORT_SYMBOL(drm_plane_colorop_3dlut_init); +/** + * drm_crtc_colorop_histogram_init: create histogram properties + * + * @colorop: pointer to the color pipeline + * @crtc: pointer to the struct drm_crtc. + * @caps: pointer to the struct drm_histogram_caps, holds the + * histogram hardware capabilities. + * @flags: colorop pipeline flags defined in drm_colorop.h + * + * The property HISTOGRAM_CAPS exposes the hardware capability for + * histogram which includes the histogram mode, number of bins etc + * The property HISTOGRAM_ENABLE allows user to enable/disable the + * histogram feature and also configure the hardware. + * Upon KMD enabling by writing to the hardware registers, histogram + * is generated. Histogram is composed of 'n' bins with each bin + * being an integer(pixel count). + * An event HISTOGRAM will be sent to the user. User upon receiving this + * event can read the hardware generated histogram using crtc property + * DATA. + * User can use this histogram data to enhance the image or in shaders. + * + * Property HISTOGRAM_CAPS is a blob pointing to the struct drm_histogram_caps + * Description of the structure is in include/uapi/drm/drm_mode.h + * Property HISTOGRAM_ENABLE is a blob pointing to the struct + * drm_histogram_config + * Description of the structure is in include/uapi/drm/drm_mode.h + * Property DATA is a blob pointing to the struct drm_histogram + * Description of the structure is in include/uapi/drm/drm_mode.h + * + * RETURNS: + * Zero for success or -errno + */ +int drm_crtc_colorop_histogram_init(struct drm_colorop *colorop, + struct drm_crtc *crtc, + struct drm_histogram_caps *caps, + uint32_t flags) +{ + struct drm_property *prop; + struct drm_property_blob *blob; + struct drm_histogram_caps *blob_data; + int ret; + + ret = drm_crtc_colorop_init(crtc->dev, colorop, crtc, + DRM_COLOROP_HISTOGRAM, flags); + if (ret) + return ret; + + blob = drm_property_create_blob(crtc->dev, + sizeof(struct drm_histogram_caps), + NULL); + if (IS_ERR(blob)) + return -1; + blob_data = blob->data; + blob_data->histogram_mode = caps->histogram_mode; + blob_data->bins_count = caps->bins_count; + + /* histogram capabilities */ + prop = drm_property_create(crtc->dev, DRM_MODE_PROP_ATOMIC | + DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, + "HISTOGRAM_CAPS", blob->base.id); + if (!prop) + return -ENOMEM; + colorop->histogram_caps_property = prop; + drm_object_attach_property(&colorop->base, colorop->histogram_caps_property, + 0); + + /* histogram enable */ + prop = drm_property_create(crtc->dev, DRM_MODE_PROP_ATOMIC | + DRM_MODE_PROP_BLOB, "HISTOGRAM_ENABLE", 0); + if (!prop) + return -ENOMEM; + colorop->histogram_enable_property = prop; + drm_object_attach_property(&colorop->base, colorop->histogram_enable_property, + 0); + + /* histogram data/bins */ + ret = drm_colorop_create_data_prop(crtc->dev, colorop); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_crtc_colorop_histogram_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 33cb6a2446dacf612d5f4dc35674e7518dfa9c58..4d905c13274c13d8d50e1c9e45a87feec72f82ae 100644 --- a/include/drm/drm_colorop.h +++ b/include/drm/drm_colorop.h @@ -185,6 +185,37 @@ struct drm_colorop_state { */ struct drm_property_blob *data; + /** + * @histogram_caps: + * + * The blob points to the structure drm_histogram_caps. + * For more info on the elements of the struct drm_histogram_caps + * see include/uapi/drm/drm_mode.h + */ + struct drm_property_blob *histogram_caps; + /** + * @histogram_enable: + * + * The blob points to the structure drm_histogram_config. + * For more information on the elements of struct drm_histogram_config + * see include/uapi/drm/drm_mode.h + */ + struct drm_property_blob *histogram_enable; + /** + * @histogram_data: + * + * The blob points to the structure drm_histogram. + * For more information on the elements of struct drm_histogram + * see include/uapi/drm/drm_mode.h + */ + struct drm_property_blob *histogram_data; + /** + * @histogram_updated: + * + * Flag to say that the histogram data is updated by the KMD. + */ + bool histogram_updated; + /** @state: backpointer to global drm_atomic_state */ struct drm_atomic_state *state; }; @@ -348,6 +379,26 @@ struct drm_colorop { */ struct drm_property *lut3d_interpolation_property; + /** + * @histogram_caps_property: Optional CRTC property for getting the + * histogram hardware capability. + */ + struct drm_property *histogram_caps_property; + + /** + * @histogram_enable_property: + * + * property to enable hardware histogram + */ + struct drm_property *histogram_enable_property; + + /** + * @histogram_data_property + * + * Read only property for histogram data + */ + struct drm_property *histogram_data_property; + /** * @data_property: * @@ -408,6 +459,10 @@ int drm_plane_colorop_3dlut_init(struct drm_device *dev, struct drm_colorop *col uint32_t lut_size, enum drm_colorop_lut3d_interpolation_type interpolation, uint32_t flags); +int drm_crtc_colorop_histogram_init(struct drm_colorop *colorop, + struct drm_crtc *crtc, + struct drm_histogram_caps *caps, + uint32_t flags); struct drm_colorop_state * drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop); -- 2.25.1
