> > CRTC properties have been added for enable/disable histogram, reading
> > the histogram data and writing the IET data.
> > "HISTOGRAM_EN" is the crtc property to enable/disable the global
> > histogram and takes a value 0/1 accordingly.
> > "Histogram" is a crtc property to read the binary histogram data.
> > "Global IET" is a crtc property to write the IET binary LUT data.
> >
> > v2: Read the histogram blob data before sending uevent (Jani)
> > v3: use drm_property_replace_blob_from_id (Vandita)
> > Add substruct for histogram in intel_crtc_state (Jani)
> > v4: Rebased after addressing comments on patch 1
> > v5: histogram check with old/new crtc_state (Suraj)
> >
> > Signed-off-by: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/display/intel_atomic.c | 5 +
> > drivers/gpu/drm/i915/display/intel_crtc.c | 168 +++++++++++++++++-
> > drivers/gpu/drm/i915/display/intel_crtc.h | 5 +
> > drivers/gpu/drm/i915/display/intel_display.c | 18 ++
> > .../drm/i915/display/intel_display_types.h | 13 ++
> > .../gpu/drm/i915/display/intel_histogram.c | 6 +
> > 6 files changed, 214 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c
> > b/drivers/gpu/drm/i915/display/intel_atomic.c
> > index 03dc54c802d3..a0d64a20b01e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> > +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> > @@ -246,6 +246,8 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
> >
> > __drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->uapi);
> >
> > + if (crtc_state->histogram.global_iet)
> > + drm_property_blob_get(crtc_state->histogram.global_iet);
> > /* copy color blobs */
> > if (crtc_state->hw.degamma_lut)
> > drm_property_blob_get(crtc_state->hw.degamma_lut);
> > @@ -278,6 +280,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
> > crtc_state->dsb_color_vblank = NULL;
> > crtc_state->dsb_commit = NULL;
> > crtc_state->use_dsb = false;
> > + crtc_state->histogram.histogram_enable_changed = false;
> >
> > return &crtc_state->uapi;
> > }
> > @@ -314,6 +317,8 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,
> > drm_WARN_ON(crtc->dev, crtc_state->dsb_color_vblank);
> > drm_WARN_ON(crtc->dev, crtc_state->dsb_commit);
> >
> > + if (crtc_state->histogram.global_iet)
> > + drm_property_blob_put(crtc_state->histogram.global_iet);
> > __drm_atomic_helper_crtc_destroy_state(&crtc_state->uapi);
> > intel_crtc_free_hw_state(crtc_state);
> > if (crtc_state->dp_tunnel_ref.tunnel)
> > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c
> > b/drivers/gpu/drm/i915/display/intel_crtc.c
> > index a2c528d707f4..3be81a5a789b 100644
> > --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> > @@ -11,6 +11,7 @@
> > #include <drm/drm_plane.h>
> > #include <drm/drm_vblank.h>
> > #include <drm/drm_vblank_work.h>
> > +#include <drm/drm_atomic_uapi.h>
> >
> > #include "i915_vgpu.h"
> > #include "i9xx_plane.h"
> > @@ -27,6 +28,7 @@
> > #include "intel_drrs.h"
> > #include "intel_dsi.h"
> > #include "intel_fifo_underrun.h"
> > +#include "intel_histogram.h"
> > #include "intel_pipe_crc.h"
> > #include "intel_psr.h"
> > #include "intel_sprite.h"
> > @@ -210,6 +212,7 @@ static struct intel_crtc *intel_crtc_alloc(void)
> > static void intel_crtc_free(struct intel_crtc *crtc) {
> > intel_crtc_destroy_state(&crtc->base, crtc->base.state);
> > + intel_histogram_finish(crtc);
> > kfree(crtc);
> > }
> >
> > @@ -229,6 +232,66 @@ static int intel_crtc_late_register(struct
> > drm_crtc
> > *crtc)
> > return 0;
> > }
> >
> > +static int intel_crtc_get_property(struct drm_crtc *crtc,
> > + const struct drm_crtc_state *state,
> > + struct drm_property *property,
> > + uint64_t *val)
> > +{
> > + struct drm_i915_private *i915 = to_i915(crtc->dev);
> > + const struct intel_crtc_state *intel_crtc_state =
> > + to_intel_crtc_state(state);
> > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > +
> > + if (property == intel_crtc->histogram_en_property) {
> > + *val = intel_crtc_state->histogram.histogram_enable;
> > + } else if (property == intel_crtc->global_iet_property) {
> > + *val = (intel_crtc_state->histogram.global_iet) ?
> > + intel_crtc_state->histogram.global_iet->base.id : 0;
> > + } else if (property == intel_crtc->histogram_property) {
> > + *val = (intel_crtc_state->histogram.histogram) ?
> > + intel_crtc_state->histogram.histogram->base.id : 0;
> > + } else {
> > + drm_err(&i915->drm,
> > + "Unknown property [PROP:%d:%s]\n",
> > + property->base.id, property->name);
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int intel_crtc_set_property(struct drm_crtc *crtc,
> > + struct drm_crtc_state *state,
> > + struct drm_property *property,
> > + u64 val)
> > +{
> > + struct drm_i915_private *i915 = to_i915(crtc->dev);
> > + struct intel_crtc_state *intel_crtc_state =
> > + to_intel_crtc_state(state);
> > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > + bool replaced = false;
> > +
> > + if (property == intel_crtc->histogram_en_property) {
> > + intel_crtc_state->histogram.histogram_enable = val;
> > + return 0;
> > + }
> > +
> > + if (property == intel_crtc->global_iet_property) {
> > + drm_property_replace_blob_from_id(crtc->dev,
> > + &intel_crtc_state-
> > >histogram.global_iet,
> > + val,
> > + sizeof(uint32_t) *
> > HISTOGRAM_IET_LENGTH,
> > + -1, &replaced);
> > + if (replaced)
> > + intel_crtc_state->histogram.global_iet_changed =
> > true;
> > + return 0;
> > + }
> > +
> > + drm_dbg_atomic(&i915->drm, "Unknown property [PROP:%d:%s]\n",
> > + property->base.id, property->name);
> > + return -EINVAL;
> > +}
> > +
> > #define INTEL_CRTC_FUNCS \
> > .set_config = drm_atomic_helper_set_config, \
> > .destroy = intel_crtc_destroy, \
> > @@ -238,7 +301,9 @@ static int intel_crtc_late_register(struct drm_crtc
> *crtc)
> > .set_crc_source = intel_crtc_set_crc_source, \
> > .verify_crc_source = intel_crtc_verify_crc_source, \
> > .get_crc_sources = intel_crtc_get_crc_sources, \
> > - .late_register = intel_crtc_late_register
> > + .late_register = intel_crtc_late_register, \
> > + .atomic_set_property = intel_crtc_set_property, \
> > + .atomic_get_property = intel_crtc_get_property
> >
> > static const struct drm_crtc_funcs bdw_crtc_funcs = {
> > INTEL_CRTC_FUNCS,
> > @@ -383,6 +448,10 @@ int intel_crtc_init(struct drm_i915_private
> > *dev_priv, enum pipe pipe)
> > intel_color_crtc_init(crtc);
> > intel_drrs_crtc_init(crtc);
> > intel_crtc_crc_init(crtc);
> > + intel_histogram_init(crtc);
> > +
> > + /* Initialize crtc properties */
> > + intel_crtc_add_property(crtc);
> >
> > cpu_latency_qos_add_request(&crtc->vblank_pm_qos,
> > PM_QOS_DEFAULT_VALUE);
> >
> > @@ -737,3 +806,100 @@ void intel_pipe_update_end(struct
> > intel_atomic_state *state,
> > out:
> > intel_psr_unlock(new_crtc_state);
> > }
> > +
> > +static const struct drm_prop_enum_list histogram_enable_names[] = {
> > + { INTEL_HISTOGRAM_DISABLE, "Disable" },
> > + { INTEL_HISTOGRAM_ENABLE, "Enable" }, };
> > +
> > +/**
> > + * intel_attach_histogram_en_property() - add property to
> > +enable/disable histogram
> > + * @intel_crtc: pointer to the struct intel_crtc on which the global
> > +histogram
> > is to
> > + * be enabled/disabled
> > + *
> > + * "HISTOGRAM_EN" is the crtc propety to enable/disable global
> > +histogram */ void intel_attach_histogram_en_property(struct
> > +intel_crtc
> > +*intel_crtc) {
> > + struct drm_crtc *crtc = &intel_crtc->base;
> > + struct drm_device *dev = crtc->dev;
> > + struct drm_property *prop;
> > +
> > + prop = intel_crtc->histogram_en_property;
> > + if (!prop) {
> > + prop = drm_property_create_enum(dev, 0,
> > + "Histogram_Enable",
> > + histogram_enable_names,
> > +
> > ARRAY_SIZE(histogram_enable_names));
> > + if (!prop)
> > + return;
> > +
> > + intel_crtc->histogram_en_property = prop;
> > + }
> > +
> > + drm_object_attach_property(&crtc->base, prop, 0); }
> > +
> > +/**
> > + * intel_attach_global_iet_property() - add property to write Image
> > +Enhancement data
> > + * @intel_crtc: pointer to the struct intel_crtc on which global
> > +histogram is enabled
> > + *
> > + * "Global IET" is the crtc property to write the Image Enhancement
> > +LUT binary data */ void intel_attach_global_iet_property(struct
> > +intel_crtc
> > +*intel_crtc) {
> > + struct drm_crtc *crtc = &intel_crtc->base;
> > + struct drm_device *dev = crtc->dev;
> > + struct drm_property *prop;
> > +
> > + prop = intel_crtc->global_iet_property;
> > + if (!prop) {
> > + prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
> > DRM_MODE_PROP_ATOMIC,
> > + "Global IET", 0);
> > + if (!prop)
> > + return;
> > +
> > + intel_crtc->global_iet_property = prop;
> > + }
> > +
> > + drm_object_attach_property(&crtc->base, prop, 0); }
> > +
> > +/**
> > + * intel_attach_histogram_property() - crtc property to read the histogram.
> > + * @intel_crtc: pointer to the struct intel_crtc on which the global histogram
> > + * was enabled.
> > + * "Global Histogram" is the crtc property to read the binary histogram data.
> > + */
> > +void intel_attach_histogram_property(struct intel_crtc *intel_crtc) {
> > + struct drm_crtc *crtc = &intel_crtc->base;
> > + struct drm_device *dev = crtc->dev;
> > + struct drm_property *prop;
> > + struct drm_property_blob *blob;
> > +
> > + prop = intel_crtc->histogram_property;
> > + if (!prop) {
> > + prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
> > + DRM_MODE_PROP_ATOMIC |
> > + DRM_MODE_PROP_IMMUTABLE,
> > + "Global Histogram", 0);
> > + if (!prop)
> > + return;
> > +
> > + intel_crtc->histogram_property = prop;
> > + }
> > + blob = drm_property_create_blob(dev, sizeof(uint32_t) *
> > HISTOGRAM_BIN_COUNT, NULL);
> > + intel_crtc->config->histogram.histogram = blob;
> > +
> > + drm_object_attach_property(&crtc->base, prop, blob->base.id); }
> > +
> > +int intel_crtc_add_property(struct intel_crtc *intel_crtc) {
> > + intel_attach_histogram_en_property(intel_crtc);
> > + intel_attach_histogram_property(intel_crtc);
> > + intel_attach_global_iet_property(intel_crtc);
> > +
> > + return 0;
> > +}
> > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h
> > b/drivers/gpu/drm/i915/display/intel_crtc.h
> > index de54ae1deedf..4e0a3c43d4f8 100644
> > --- a/drivers/gpu/drm/i915/display/intel_crtc.h
> > +++ b/drivers/gpu/drm/i915/display/intel_crtc.h
> > @@ -7,6 +7,7 @@
> > #define _INTEL_CRTC_H_
> >
> > #include <linux/types.h>
> > +#include <drm/drm_crtc.h>
> >
> > enum i9xx_plane_id;
> > enum pipe;
> > @@ -59,4 +60,8 @@ void intel_wait_for_vblank_if_active(struct
> > drm_i915_private *i915,
> > enum pipe pipe);
> > void intel_crtc_wait_for_next_vblank(struct intel_crtc *crtc);
> >
> > +int intel_crtc_add_property(struct intel_crtc *intel_crtc); void
> > +intel_attach_histogram_en_property(struct intel_crtc *intel_crtc);
> > +void intel_attach_global_iet_property(struct intel_crtc *intel_crtc);
> > +void intel_attach_histogram_property(struct intel_crtc *intel_crtc);
> > #endif
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index e790a2de5b3d..0c3008a2d774 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -93,6 +93,7 @@
> > #include "intel_fifo_underrun.h"
> > #include "intel_frontbuffer.h"
> > #include "intel_hdmi.h"
> > +#include "intel_histogram.h"
> > #include "intel_hotplug.h"
> > #include "intel_link_bw.h"
> > #include "intel_lvds.h"
> > @@ -4607,6 +4608,10 @@ static int intel_crtc_atomic_check(struct
> > intel_atomic_state *state,
> > if (ret)
> > return ret;
> >
> > + /* HISTOGRAM changed */
>
> No need for the above comment
>
Done
Thanks and Regards,
Arun R Murthy
--------------------
