RE: [PATCH v8 10/14] drm/i915/iet: Add support to writing the IET LUT data

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




> -----Original Message-----
> From: Murthy, Arun R <arun.r.murthy@xxxxxxxxx>
> Sent: Tuesday, January 28, 2025 9:21 PM
> To: intel-xe@xxxxxxxxxxxxxxxxxxxxx; intel-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-
> devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: Kandpal, Suraj <suraj.kandpal@xxxxxxxxx>; dmitry.baryshkov@xxxxxxxxxx;
> Murthy, Arun R <arun.r.murthy@xxxxxxxxx>
> Subject: [PATCH v8 10/14] drm/i915/iet: Add support to writing the IET LUT data
> 
> User created LUT can be fed back to the hardware so that the hardware can
> apply this LUT data to see the enhancement in the image.
> 
> Signed-off-by: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
> ---
>  drivers/gpu/drm/i915/display/intel_histogram.c | 70
> ++++++++++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_histogram.h |  4 ++
>  2 files changed, 74 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c
> b/drivers/gpu/drm/i915/display/intel_histogram.c
> index
> 4f3dcbabfe96e955a65874718272c4beb53b0827..aa02e7ce42b930a858de4ad7e
> 0d39d93fa7d4298 100644
> --- a/drivers/gpu/drm/i915/display/intel_histogram.c
> +++ b/drivers/gpu/drm/i915/display/intel_histogram.c
> @@ -20,6 +20,7 @@
>  /* Precision factor for threshold guardband */  #define
> HISTOGRAM_GUARDBAND_PRECISION_FACTOR 10000  #define
> HISTOGRAM_BIN_READ_RETRY_COUNT 5
> +#define IET_SAMPLE_FORMAT_1_INT_9_FRACT 0x1000009
> 
>  static bool intel_histogram_get_data(struct intel_crtc *intel_crtc)  { @@ -223,6
> +224,60 @@ int intel_histogram_update(struct intel_crtc *intel_crtc,
>  	return 0;
>  }
> 
> +int intel_histogram_set_iet_lut(struct intel_crtc *intel_crtc,
> +				struct drm_property_blob *blob)
> +{
> +	struct intel_histogram *histogram = intel_crtc->histogram;
> +	struct intel_display *display = to_intel_display(intel_crtc);
> +	int pipe = intel_crtc->pipe;
> +	int i = 0;
> +	struct drm_iet_1dlut_sample *iet;
> +	u32 *data;
> +	int ret;
> +
> +	if (!histogram)
> +		return -EINVAL;
> +
> +	if (!histogram->enable) {
> +		drm_err(display->drm, "histogram not enabled");

Please add /n at the end of sentence.
Nit: start the log statement with a capital letter

> +		return -EINVAL;
> +	}
> +
> +	if (!data) {
> +	drm_err(display->drm, "enhancement LUT data is NULL");
> +		return -EINVAL;
> +	}
> +
> +	/* Set DPST_CTL Bin Reg function select to IE & wait for a vblabk */

Typo you mean vblank

> +	intel_de_rmw(display, DPST_CTL(pipe),
> +		     DPST_CTL_BIN_REG_FUNC_SEL,
> DPST_CTL_BIN_REG_FUNC_IE);
> +
> +	drm_crtc_wait_one_vblank(&intel_crtc->base);
> +
> +	 /* Set DPST_CTL Bin Register Index to 0 */
> +	intel_de_rmw(display, DPST_CTL(pipe),
> +		     DPST_CTL_BIN_REG_MASK, DPST_CTL_BIN_REG_CLEAR);
> +
> +	iet = (struct drm_iet_1dlut_sample *)blob->data;
> +	data = kzalloc(sizeof(data) * iet->nr_elements, GFP_KERNEL);
> +	if (!data)
> +		return -ENOMEM;

New line here

> +	ret = copy_from_user(data, (uint32_t __user *)(unsigned long)iet-
> >iet_lut,
> +			     sizeof(uint32_t) * iet->nr_elements);
> +	if (ret)
> +		return ret;
> +
> +	for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) {
> +		intel_de_rmw(display, DPST_BIN(pipe),
> +			     DPST_BIN_DATA_MASK, data[i]);

DATA_BIN_MASK is 0:23 for TC mode and only 0:9 for IE I think you should create a new
IE DATA_BIN_MASK and then write the data.

> +		drm_dbg_atomic(display->drm, "iet_lut[%d]=%x\n", i, data[i]);

Drm_dbg_kms

Regards,
Suraj Kandpal
> +	}
> +	kfree(data);
> +	drm_property_blob_put(intel_crtc->base.state->iet_lut);
> +
> +	return 0;
> +}
> +
>  void intel_histogram_finish(struct intel_crtc *intel_crtc)  {
>  	struct intel_histogram *histogram = intel_crtc->histogram; @@ -235,6
> +290,8 @@ int intel_histogram_init(struct intel_crtc *crtc)  {
>  	struct intel_histogram *histogram;
>  	struct drm_histogram_caps *histogram_caps;
> +	struct drm_iet_caps *iet_caps;
> +	u32 *iet_format;
> 
>  	/* Allocate histogram internal struct */
>  	histogram = kzalloc(sizeof(*histogram), GFP_KERNEL); @@ -247,10
> +304,23 @@ int intel_histogram_init(struct intel_crtc *crtc)
>  	histogram_caps->histogram_mode =
> DRM_MODE_HISTOGRAM_HSV_MAX_RGB;
>  	histogram_caps->bins_count = HISTOGRAM_BIN_COUNT;
> 
> +	iet_caps = kzalloc(sizeof(*iet_caps), GFP_KERNEL);
> +	if (!iet_caps)
> +		return -ENOMEM;
> +
> +	iet_caps->iet_mode = DRM_MODE_IET_MULTIPLICATIVE;
> +	iet_caps->nr_iet_sample_formats = 1;
> +	iet_caps->nr_iet_lut_entries = HISTOGRAM_IET_LENGTH;
> +	iet_format = kzalloc(sizeof(u32)*iet_caps->nr_iet_sample_formats,
> +			     GFP_KERNEL);
> +	*iet_format = IET_SAMPLE_FORMAT_1_INT_9_FRACT;
> +	iet_caps->iet_sample_format = *iet_format;
> +
>  	crtc->histogram = histogram;
>  	histogram->crtc = crtc;
>  	histogram->can_enable = false;
>  	histogram->caps = histogram_caps;
> +	histogram->iet_caps = iet_caps;
> 
>  	INIT_DEFERRABLE_WORK(&histogram->work,
>  			     intel_histogram_handle_int_work); diff --git
> a/drivers/gpu/drm/i915/display/intel_histogram.h
> b/drivers/gpu/drm/i915/display/intel_histogram.h
> index
> b44ba3afc94f79f291f4e5ebdd04dcf9434b48a4..0999d1720c7abee8907c77896e
> 4b1e6ff756160f 100644
> --- a/drivers/gpu/drm/i915/display/intel_histogram.h
> +++ b/drivers/gpu/drm/i915/display/intel_histogram.h
> @@ -18,9 +18,11 @@ struct intel_display;  enum pipe;
> 
>  #define HISTOGRAM_BIN_COUNT                    32
> +#define HISTOGRAM_IET_LENGTH                   33
> 
>  struct intel_histogram {
>  	struct drm_histogram_caps *caps;
> +	struct drm_iet_caps *iet_caps;
>  	struct intel_crtc *crtc;
>  	struct delayed_work work;
>  	bool enable;
> @@ -45,6 +47,8 @@ void intel_histogram_irq_handler(struct intel_display
> *display, enum pipe pipe);  int intel_histogram_atomic_check(struct intel_crtc
> *intel_crtc);  int intel_histogram_update(struct intel_crtc *intel_crtc,
>  			   struct drm_histogram_config *config);
> +int intel_histogram_set_iet_lut(struct intel_crtc *intel_crtc,
> +				struct drm_property_blob *blob);
>  int intel_histogram_init(struct intel_crtc *intel_crtc);  void
> intel_histogram_finish(struct intel_crtc *intel_crtc);
> 
> 
> --
> 2.25.1





[Index of Archives]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux