> -----Original Message-----
> From: Murthy, Arun R <arun.r.murthy@xxxxxxxxx>
> Sent: Thursday, August 29, 2024 2:34 PM
> To: Garg, Nemesa <nemesa.garg@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx;
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: Garg, Nemesa <nemesa.garg@xxxxxxxxx>
> Subject: RE: [v4 2/5] drm/i915/display: Compute the scaler filter coefficients
>
> > -----Original Message-----
> > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of
> > Nemesa Garg
> > Sent: Monday, July 8, 2024 1:39 PM
> > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > Cc: Garg, Nemesa <nemesa.garg@xxxxxxxxx>
> > Subject: [v4 2/5] drm/i915/display: Compute the scaler filter
> > coefficients
> >
> > The sharpness property requires the use of one of the scaler so need
> > to set the sharpness scaler coefficient values.
> > These values are based on experiments and vary for different tap
> > value/win size. These values are normalized by taking the sum of all
> > values and then dividing each value with a sum.
> >
> > --v4: fix ifndef header naming issue reported by kernel test robot
> >
> > Signed-off-by: Nemesa Garg <nemesa.garg@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/Makefile | 1 +
> > drivers/gpu/drm/i915/display/intel_display.c | 2 +
> > .../drm/i915/display/intel_display_types.h | 9 ++
> > .../drm/i915/display/intel_sharpen_filter.c | 121 ++++++++++++++++++
> > .../drm/i915/display/intel_sharpen_filter.h | 27 ++++
> > drivers/gpu/drm/i915/i915_reg.h | 2 +
> > drivers/gpu/drm/xe/Makefile | 1 +
> > 7 files changed, 163 insertions(+)
> > create mode 100644
> > drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> > create mode 100644
> > drivers/gpu/drm/i915/display/intel_sharpen_filter.h
>
> Can a unified name be used across the patches. -> intel_sharpness_filter.c
>
> >
> > diff --git a/drivers/gpu/drm/i915/Makefile
> > b/drivers/gpu/drm/i915/Makefile index c63fa2133ccb..0021f0a372ab
> > 100644
> > --- a/drivers/gpu/drm/i915/Makefile
> > +++ b/drivers/gpu/drm/i915/Makefile
> > @@ -280,6 +280,7 @@ i915-y += \
> > display/intel_pmdemand.o \
> > display/intel_psr.o \
> > display/intel_quirks.o \
> > + display/intel_sharpen_filter.o \
> > display/intel_sprite.o \
> > display/intel_sprite_uapi.o \
> > display/intel_tc.o \
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index c2c388212e2e..a62560a0c1a9 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -5906,6 +5906,8 @@ static int intel_atomic_check_planes(struct
> > intel_atomic_state *state)
> > if (ret)
> > return ret;
> >
> > + intel_sharpness_scaler_compute_config(new_crtc_state);
> > +
> > /*
> > * On some platforms the number of active planes affects
> > * the planes' minimum cdclk calculation. Add such planes diff -
> > -git a/drivers/gpu/drm/i915/display/intel_display_types.h
> > b/drivers/gpu/drm/i915/display/intel_display_types.h
> > index 8713835e2307..1c3e031ab369 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > @@ -55,6 +55,7 @@
> > #include "intel_display_limits.h"
> > #include "intel_display_power.h"
> > #include "intel_dpll_mgr.h"
> > +#include "intel_sharpen_filter.h"
> > #include "intel_wm_types.h"
> >
> > struct drm_printer;
> > @@ -828,6 +829,13 @@ struct intel_scaler {
> > u32 mode;
> > };
> >
> > +struct intel_sharpness_filter {
> > + struct scaler_filter_coeff coeff[7];
> > + u32 scaler_coefficient[119];
> What is this magic number 119 and 7?
> For each win size there are 7 coefficients, so coeff[7] is used to store these values which are further used in calculating scaler coefficients.
As we need to compute scaler coefficients for 17 phases of 7 taps I have used scaler_coefficient[119] .
> > + bool strength_changed;
> > + u8 win_size;
> > +};
> Better to have this struct in intel_sharpness_filter.c as this is not used elsewhere.
>
> > +
> > struct intel_crtc_scaler_state {
> > #define SKL_NUM_SCALERS 2
> > struct intel_scaler scalers[SKL_NUM_SCALERS]; @@ -1072,6 +1080,7
> @@
> > struct intel_crtc_state {
> > struct drm_property_blob *degamma_lut, *gamma_lut, *ctm;
> > struct drm_display_mode mode, pipe_mode, adjusted_mode;
> > enum drm_scaling_filter scaling_filter;
> > + struct intel_sharpness_filter casf_params;
> > } hw;
> >
> > /* actual state of LUTs */
> > diff --git a/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> > b/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> > new file mode 100644
> > index 000000000000..b3ebd72b4116
> > --- /dev/null
> > +++ b/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> > @@ -0,0 +1,121 @@
> > +// SPDX-License-Identifier: MIT
> > +/*
> > + * Copyright © 2024 Intel Corporation
> > + *
> > + */
> > +
> > +#include "i915_reg.h"
> > +#include "intel_de.h"
> > +#include "intel_display_types.h"
> > +#include "skl_scaler.h"
> > +
> > +#define MAX_NUM_UNIQUE_COEF_FOR_SHARPNESS_FILTER 7 #define
> > +SCALER_FILTER_NUM_TAPS 7 #define SCALER_FILTER_NUM_PHASES 17
> > #define
> > +FILTER_COEFF_0_125 125 #define FILTER_COEFF_0_25 250 #define
> > +FILTER_COEFF_0_5 500 #define FILTER_COEFF_1_0 1000 #define
> > +FILTER_COEFF_0_0 0
> > +
> > +void intel_sharpness_filter_enable(struct intel_crtc_state
> > +*crtc_state) {
> > + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> Can i915 be used instead of dev_priv?
> Will use struct intel_display *display = to_intel_display(crtc);
> > + int id = crtc_state->scaler_state.scaler_id;
> > +
> > + intel_de_write_fw(dev_priv, GLK_PS_COEF_INDEX_SET(crtc->pipe, id,
> > 0),
> > + PS_COEF_INDEX_AUTO_INC);
> > +
> > + intel_de_write_fw(dev_priv, GLK_PS_COEF_INDEX_SET(crtc->pipe, id,
> > 1),
> > + PS_COEF_INDEX_AUTO_INC);
> > +
> > + for (int index = 0; index < 60; index++) {
> > + intel_de_write_fw(dev_priv, GLK_PS_COEF_DATA_SET(crtc-
> > >pipe, id, 0),
> > + crtc_state-
> > >hw.casf_params.scaler_coefficient[index]);
> > + intel_de_write_fw(dev_priv, GLK_PS_COEF_DATA_SET(crtc-
> > >pipe, id, 1),
> > + crtc_state->hw.casf_params.
> > scaler_coefficient[index]);
> This is an array of 119 elements any reason of using only 60 over here.
> There are two sets of programmed coefficients are available for each scaler and these 119 coefficients need to be filled in form of 60
Dwords per set.
> > + }
> > +}
> > +
> > +static void convert_sharpness_coef_binary(struct scaler_filter_coeff *coeff,
> > + u16 coefficient)
> > +{
> > + if (coefficient < 25) {
> > + coeff->mantissa = (coefficient * 2048) / 100;
> > + coeff->exp = 3;
> > + }
>
> If () {
> } else {
> } if () {
> }
> Thanks for pointing out.
> > +
> > + else if (coefficient < 50) {
> > + coeff->mantissa = (coefficient * 1024) / 100;
> > + coeff->exp = 2;
> > + }
> > +
> > + else if (coefficient < 100) {
> > + coeff->mantissa = (coefficient * 512) / 100;
> > + coeff->exp = 1;
> > + } else {
> > + coeff->mantissa = (coefficient * 256) / 100;
> > + coeff->exp = 0;
> > + }
> > +}
> > +
> > +static void intel_sharpness_filter_coeff(struct intel_crtc_state
> > +*crtc_state) {
> > + u16 filtercoeff[MAX_NUM_UNIQUE_COEF_FOR_SHARPNESS_FILTER];
> > + u16 sumcoeff = 0;
> > + u8 i;
> > +
> > + if (crtc_state->hw.casf_params.win_size == 0) {
> > + filtercoeff[0] = FILTER_COEFF_0_0;
> > + filtercoeff[1] = FILTER_COEFF_0_0;
> > + filtercoeff[2] = FILTER_COEFF_0_5;
> > + filtercoeff[3] = FILTER_COEFF_1_0;
> > + filtercoeff[4] = FILTER_COEFF_0_5;
> > + filtercoeff[5] = FILTER_COEFF_0_0;
> > + filtercoeff[6] = FILTER_COEFF_0_0;
> > + }
> > +
> > + else if (crtc_state->hw.casf_params.win_size == 1) {
> > + filtercoeff[0] = FILTER_COEFF_0_0;
> > + filtercoeff[1] = FILTER_COEFF_0_25;
> > + filtercoeff[2] = FILTER_COEFF_0_5;
> > + filtercoeff[3] = FILTER_COEFF_1_0;
> > + filtercoeff[4] = FILTER_COEFF_0_5;
> > + filtercoeff[5] = FILTER_COEFF_0_25;
> > + filtercoeff[6] = FILTER_COEFF_0_0;
> > + } else {
> > + filtercoeff[0] = FILTER_COEFF_0_125;
> > + filtercoeff[1] = FILTER_COEFF_0_25;
> > + filtercoeff[2] = FILTER_COEFF_0_5;
> > + filtercoeff[3] = FILTER_COEFF_1_0;
> > + filtercoeff[4] = FILTER_COEFF_0_5;
> > + filtercoeff[5] = FILTER_COEFF_0_25;
> > + filtercoeff[6] = FILTER_COEFF_0_125;
> > + }
> If this is always a constant, then can this be in a lookup table?
Sure.
Thanks and Regards,
Nemesa
> > +
> > + for (i = 0; i < MAX_NUM_UNIQUE_COEF_FOR_SHARPNESS_FILTER; i++)
> > + sumcoeff += filtercoeff[i];
> > +
> > + for (i = 0; i < MAX_NUM_UNIQUE_COEF_FOR_SHARPNESS_FILTER; i++)
> > {
> > + filtercoeff[i] = (filtercoeff[i] * 100 / sumcoeff);
> > + convert_sharpness_coef_binary(&crtc_state-
> > >hw.casf_params.coeff[i],
> > + filtercoeff[i]);
> > + }
> > +}
> > +
> > +void intel_sharpness_scaler_compute_config(struct intel_crtc_state
> > +*crtc_state) {
> > + u16 phase, tapindex, phaseoffset;
> > + u16 *coeff = (u16 *)crtc_state->hw.casf_params.scaler_coefficient;
> > +
> > + intel_sharpness_filter_coeff(crtc_state);
> > +
> > + for (phase = 0; phase < SCALER_FILTER_NUM_PHASES; phase++) {
> > + phaseoffset = SCALER_FILTER_NUM_TAPS * phase;
> > + for (tapindex = 0; tapindex < SCALER_FILTER_NUM_TAPS;
> > tapindex++) {
> > + coeff[phaseoffset + tapindex] =
> > + SHARP_COEFF_TO_REG_FORMAT(crtc_state-
> > >hw.casf_params.coeff[tapindex]);
> > + }
> > + }
> > +}
> > diff --git a/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> > b/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> > new file mode 100644
> > index 000000000000..6ab70a635e2f
> > --- /dev/null
> > +++ b/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> > @@ -0,0 +1,27 @@
> > +/* SPDX-License-Identifier: MIT */
> > +/*
> > + * Copyright © 2024 Intel Corporation */
> > +
> > +#ifndef __INTEL_SHARPEN_FILTER_H__
> > +#define __INTEL_SHARPEN_FILTER_H__
> > +
> > +#include <linux/types.h>
> > +
> > +#define SHARP_COEFF_TO_REG_FORMAT(coefficient)
> > +((u16)(coefficient.sign <<
> > 15 | \
> > + coefficient.exp << 12 | coefficient.mantissa << 3))
> > +
> > +struct intel_crtc;
> > +struct intel_crtc_state;
> > +struct intel_atomic_state;
> > +
> > +struct scaler_filter_coeff {
> > + u16 sign;
> > + u16 exp;
> > + u16 mantissa;
> > +};
> > +
> > +void intel_sharpness_filter_enable(struct intel_crtc_state
> > +*crtc_state); void intel_sharpness_scaler_compute_config(struct
> > +intel_crtc_state *crtc_state);
> > +
> > +#endif /* __INTEL_SHARPEN_FILTER_H__ */
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h
> > b/drivers/gpu/drm/i915/i915_reg.h index 0e3d79227e3c..9492fda15627
> > 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -2257,6 +2257,8 @@
> > #define PS_VERT_INT_INVERT_FIELD REG_BIT(20)
> > #define PS_PROG_SCALE_FACTOR REG_BIT(19) /* tgl+ */
> > #define PS_PWRUP_PROGRESS REG_BIT(17)
> > +#define PS_BYPASS_ARMING REG_BIT(10)
> > +#define PS_DB_STALL REG_BIT(9)
> > #define PS_V_FILTER_BYPASS REG_BIT(8)
> > #define PS_VADAPT_EN REG_BIT(7) /* skl/bxt
> > */
> > #define PS_VADAPT_MODE_MASK REG_GENMASK(6, 5)
> > /* skl/bxt */
> > diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> > index
> > 0eb0acc4f198..8681ca89af27 100644
> > --- a/drivers/gpu/drm/xe/Makefile
> > +++ b/drivers/gpu/drm/xe/Makefile
> > @@ -278,6 +278,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
> > i915-display/intel_psr.o \
> > i915-display/intel_qp_tables.o \
> > i915-display/intel_quirks.o \
> > + i915-display/intel_sharpen_filter.o \
> > i915-display/intel_snps_phy.o \
> > i915-display/intel_tc.o \
> > i915-display/intel_vblank.o \
> > --
> > 2.25.1
> Thanks and Regards,
> Arun R Murthy
> --------------------
