> -----Original Message-----
> From: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Sent: Friday, August 30, 2024 2:04 PM
> To: Murthy, Arun R <arun.r.murthy@xxxxxxxxx>; Garg, Nemesa
> <nemesa.garg@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-
> devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: Garg, Nemesa <nemesa.garg@xxxxxxxxx>
> Subject: RE: [4/5] drm/i915/display: Add registers and compute the strength
>
> On Fri, 30 Aug 2024, "Murthy, Arun R" <arun.r.murthy@xxxxxxxxx> wrote:
> >> -----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: [4/5] drm/i915/display: Add registers and compute the
> >> strength
> >>
> >> Add new registers and related bits. Compute the strength value and
> >> tap value based on display mode.
> >>
> >> Signed-off-by: Nemesa Garg <nemesa.garg@xxxxxxxxx>
> >> ---
> >> drivers/gpu/drm/i915/display/intel_display.c | 5 +-
> >> .../drm/i915/display/intel_display_types.h | 1 +
> >> .../drm/i915/display/intel_sharpen_filter.c | 105 ++++++++++++++++++
> >> .../drm/i915/display/intel_sharpen_filter.h | 5 +
> >> drivers/gpu/drm/i915/i915_reg.h | 17 +++
> >> 5 files changed, 132 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> >> b/drivers/gpu/drm/i915/display/intel_display.c
> >> index 385a254528f9..e0a82ab46d29 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_display.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> >> @@ -5910,7 +5910,10 @@ static int intel_atomic_check_planes(struct
> >> intel_atomic_state *state)
> >> if (ret)
> >> return ret;
> >>
> >> - intel_sharpness_scaler_compute_config(new_crtc_state);
> >> + if (sharp_compute(new_crtc_state)) {
> >> +
> >> intel_sharpness_scaler_compute_config(new_crtc_state);
> >> + intel_filter_compute_config(new_crtc_state);
> >> + }
> >>
> >> /*
> >> * On some platforms the number of active planes affects diff --
> >> git a/drivers/gpu/drm/i915/display/intel_display_types.h
> >> b/drivers/gpu/drm/i915/display/intel_display_types.h
> >> index 130740aaaa21..782192f2b9ae 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> >> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> >> @@ -835,6 +835,7 @@ struct intel_sharpness_filter {
> >> bool strength_changed;
> >> u8 win_size;
> >> bool need_scaler;
> >> + u8 strength;
> >> };
> >>
> >> struct intel_crtc_scaler_state {
> >> diff --git a/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> >> b/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> >> index 627a0dbd3dfd..6600a66d3960 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_sharpen_filter.c
> >> @@ -18,11 +18,87 @@
> >> #define FILTER_COEFF_1_0 1000
> >> #define FILTER_COEFF_0_0 0
> >>
> >> +/*
> >> + * Default LUT values to be loaded one time.
> >> + */
> > Single line comment style /* */
> >Sure.
> >> +static const u16 lut_data[] = {
> >> + 4095, 2047, 1364, 1022, 816, 678, 579,
> >> + 504, 444, 397, 357, 323, 293, 268, 244, 224,
> >> + 204, 187, 170, 154, 139, 125, 111, 98, 85,
> >> + 73, 60, 48, 36, 24, 12, 0
> >> +};
> >> +
> >> +void intel_filter_lut_load(struct intel_crtc *crtc,
> >> + const struct intel_crtc_state *crtc_state) {
> >> + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> >
> > dev_priv => i915
>
> Actually,
>
> struct intel_display *display = to_intel_display(crtc);
>
> everywhere instead of dev_priv or i915.
> Will replace dev_priv or i915 with intel_display *display in series.
Thanks and Regards,
Nemesa
> >
> >> + int i;
> >> +
> >> + intel_de_write(dev_priv, SHRPLUT_INDEX(crtc->pipe),
> >> INDEX_AUTO_INCR |
> >> +INDEX_VALUE(0));
> >> +
> >> + for (i = 0; i < ARRAY_SIZE(lut_data); i++)
> >> + intel_de_write(dev_priv, SHRPLUT_DATA(crtc->pipe),
> >> lut_data[i]); }
> > Sharpness LUT is from bit[0:11] and lut_data is u16.
> >
> >> +
> >> +static void intel_filter_size_compute(struct intel_crtc_state
> > Can the same function naming convention be used
> > intel_filter_size_compute => intel_sharpness_filter_size_compute
> >
> >> +*crtc_state) {
> >> + const struct drm_display_mode *mode = &crtc_state-
> >> >hw.adjusted_mode;
> >> +
> >> + if (mode->hdisplay <= 1920 && mode->vdisplay <= 1080)
> >> + crtc_state->hw.casf_params.win_size = 0;
> >> + else if (mode->hdisplay <= 3840 && mode->vdisplay <= 2160)
> >> + crtc_state->hw.casf_params.win_size = 1;
> >> + else
> >> + crtc_state->hw.casf_params.win_size = 2; }
> >> +
> >> +bool intel_sharpness_strength_changed(struct intel_atomic_state
> >> +*state) {
> >> + int i;
> >> + struct intel_crtc_state *old_crtc_state, *new_crtc_state;
> >> + struct intel_crtc *crtc;
> >> +
> >> + for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> >> + new_crtc_state, i) {
> >> + if (new_crtc_state->uapi.sharpness_strength !=
> >> + old_crtc_state->uapi.sharpness_strength)
> >> + return true;
> >> + }
> >> +
> >> + return false;
> >> +}
> >> +
> >> 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);
> >> int id = crtc_state->scaler_state.scaler_id;
> >> + u32 sharpness_ctl;
> >> + u8 val;
> >> +
> >> + if (crtc_state->uapi.sharpness_strength == 0) {
> >> + intel_sharpness_disable(crtc_state);
> >> +
> >> + return;
> >> + }
> >> +
> >> + /*
> >> + * HW takes a value in form (1.0 + strength) in 4.4 fixed format.
> >> + * Strength is from 0.0-14.9375 ie from 0-239.
> >> + * User can give value from 0-255 but is clamped to 239.
> >> + * Ex. User gives 85 which is 5.3125 and adding 1.0 gives 6.3125.
> >> + * 6.3125 in 4.4 format is 01100101 which is equal to 101.
> >> + * Also 85 + 16 = 101.
> >> + */
> >> + val = min(crtc_state->uapi.sharpness_strength, 0xEF) + 0x10;
> >> +
> >> + drm_dbg(&dev_priv->drm, "Filter strength value: %d\n", val);
> >> +
> >> + sharpness_ctl = FILTER_EN | FILTER_STRENGTH(val) |
> >> + FILTER_SIZE(crtc_state->hw.casf_params.win_size);
> >> +
> >> + intel_de_write(dev_priv, SHARPNESS_CTL(crtc->pipe),
> >> + sharpness_ctl);
> >>
> >> intel_de_write_fw(dev_priv, GLK_PS_COEF_INDEX_SET(crtc->pipe, id,
> >> 0),
> >> PS_COEF_INDEX_AUTO_INC);
> >> @@ -42,9 +118,21 @@ void intel_sharpness_filter_enable(struct
> >> intel_crtc_state *crtc_state)
> >>
> >> int intel_filter_compute_config(struct intel_crtc_state *crtc_state)
> >> {
> >> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->uapi.crtc);
> >> + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
> >> +
> >> + if (crtc_state->uapi.sharpness_strength == 0) {
> >> + crtc_state->hw.casf_params.need_scaler = false;
> >> + return 0;
> >> + }
> >> +
> >> if (!crtc_state->pch_pfit.enabled)
> >> crtc_state->hw.casf_params.need_scaler = true;
> >>
> >> + intel_filter_size_compute(crtc_state);
> >> + drm_dbg(&dev_priv->drm, "Tap Size: %d\n",
> >> + crtc_state->hw.casf_params.win_size);
> >> +
> >> return 0;
> >> }
> >>
> >> @@ -129,3 +217,20 @@ void
> >> intel_sharpness_scaler_compute_config(struct
> >> intel_crtc_state *crtc_state)
> >> }
> >> }
> >> }
> >> +
> >> +void intel_sharpness_disable(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);
> >> +
> >> + intel_de_write(dev_priv, SHARPNESS_CTL(crtc->pipe), 0);
> >> + drm_dbg(&dev_priv->drm, "Filter strength value: %d\n", 0); }
> >> +
> >> +bool sharp_compute(struct intel_crtc_state *crtc_state) {
> >> + if (!(FILTER_EN & 1) && crtc_state->uapi.sharpness_strength != 0)
> >> + return true;
> >> +
> >> + return false;
> >> +}
> >> diff --git a/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> >> b/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> >> index d20e65971a55..4fffdd99d0fb 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> >> +++ b/drivers/gpu/drm/i915/display/intel_sharpen_filter.h
> >> @@ -24,5 +24,10 @@ struct scaler_filter_coeff { void
> >> intel_sharpness_filter_enable(struct intel_crtc_state *crtc_state);
> >> void intel_sharpness_scaler_compute_config(struct intel_crtc_state
> >> *crtc_state); int intel_filter_compute_config(struct
> >> intel_crtc_state *crtc_state);
> >> +void intel_filter_lut_load(struct intel_crtc *crtc,
> >> + const struct intel_crtc_state *crtc_state); bool
> >> +intel_sharpness_strength_changed(struct intel_atomic_state *state);
> >> +void intel_sharpness_disable(struct intel_crtc_state *crtc_state);
> >> +bool sharp_compute(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
> >> 9492fda15627..2fa42e10bb63 100644
> >> --- a/drivers/gpu/drm/i915/i915_reg.h
> >> +++ b/drivers/gpu/drm/i915/i915_reg.h
> >> @@ -2396,6 +2396,23 @@
> >> _ID(id, _PS_COEF_SET0_DATA_1A,
> >> _PS_COEF_SET0_DATA_2A) + (set) * 8, \
> >> _ID(id, _PS_COEF_SET0_DATA_1B,
> >> _PS_COEF_SET0_DATA_2B) + (set) * 8)
> >>
> >> +#define _SHARPNESS_CTL_A 0x682B0
> >> +#define SHARPNESS_CTL(trans) _MMIO_PIPE2(dev_priv, trans,
> >> _SHARPNESS_CTL_A)
> >> +#define FILTER_EN REG_BIT(31)
> >> +#define FILTER_STRENGTH_MASK REG_GENMASK(15, 8)
> >> +#define FILTER_STRENGTH(x)
> >> REG_FIELD_PREP(FILTER_STRENGTH_MASK, (x))
> >> +#define FILTER_SIZE_MASK REG_GENMASK(1, 0)
> >> +#define FILTER_SIZE(x) REG_FIELD_PREP(FILTER_SIZE_MASK, (x))
> >> +
> >> +#define _SHRPLUT_DATA_A 0x682B8
> >> +#define SHRPLUT_DATA(trans) _MMIO_PIPE2(dev_priv, trans,
> >> _SHRPLUT_DATA_A)
> >> +
> >> +#define _SHRPLUT_INDEX_A 0x682B4
> >> +#define SHRPLUT_INDEX(trans) _MMIO_PIPE2(dev_priv, trans,
> >> _SHRPLUT_INDEX_A)
> >> +#define INDEX_AUTO_INCR REG_BIT(10)
> >> +#define INDEX_VALUE_MASK REG_GENMASK(4, 0)
> >> +#define INDEX_VALUE(x)
> >> REG_FIELD_PREP(INDEX_VALUE_MASK, (x))
> >> +
> >> /* Display Internal Timeout Register */
> >> #define RM_TIMEOUT _MMIO(0x42060)
> >> #define MMIO_TIMEOUT_US(us) ((us) << 0)
> >> --
> >> 2.25.1
> >
> > Thanks and Regards,
> > Arun R Murthy
> > --------------------
>
> --
> Jani Nikula, Intel
