[RFC 5/5] drm/i915/display: Load the lut values and enable sharpness

[Nemesa Garg]

Load the lut values during pipe enable.

Signed-off-by: Nemesa Garg <nemesa.g...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_crtc.c    |  3 +++
 drivers/gpu/drm/i915/display/intel_display.c | 12 +++++++++++-
 drivers/gpu/drm/i915/display/skl_scaler.c    | 11 ++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c 
b/drivers/gpu/drm/i915/display/intel_crtc.c
index 25593f6aae7d..74c498733283 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -383,6 +383,9 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum 
pipe pipe)
 
        drm_WARN_ON(&dev_priv->drm, drm_crtc_index(&crtc->base) != crtc->pipe);
 
+       if (DISPLAY_VER(dev_priv) >= 20)
+               drm_crtc_create_sharpening_strength_property(&crtc->base);
+
        return 0;
 
 fail:
diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 3d05bd203ca8..e8bd615e6977 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1722,6 +1722,9 @@ static void hsw_crtc_enable(struct intel_atomic_state 
*state,
                intel_crtc_wait_for_next_vblank(wa_crtc);
                intel_crtc_wait_for_next_vblank(wa_crtc);
        }
+
+       if (new_crtc_state->hw.casf_params.strength_changed)
+               intel_filter_lut_load(crtc, new_crtc_state);
 }
 
 void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)
@@ -2444,8 +2447,12 @@ static int intel_crtc_compute_config(struct 
intel_atomic_state *state,
        if (crtc_state->has_pch_encoder)
                return ilk_fdi_compute_config(crtc, crtc_state);
 
-       if (crtc_state->hw.casf_params.strength_changed)
+       intel_sharpen_strength_changed(state);
+
+       if (crtc_state->hw.casf_params.strength_changed) {
                intel_sharpness_scaler_compute_config(crtc_state);
+               intel_filter_compute_config(crtc_state);
+       }
 
        return 0;
 }
@@ -6744,6 +6751,9 @@ static void intel_update_crtc(struct intel_atomic_state 
*state,
        if (intel_crtc_needs_fastset(new_crtc_state) &&
            old_crtc_state->inherited)
                intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
+
+       if (new_crtc_state->hw.casf_params.strength_changed)
+               intel_sharpen_filter_enable(new_crtc_state);
 }
 
 static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c 
b/drivers/gpu/drm/i915/display/skl_scaler.c
index be61a6ebd7e3..cb828b3880b2 100644
--- a/drivers/gpu/drm/i915/display/skl_scaler.c
+++ b/drivers/gpu/drm/i915/display/skl_scaler.c
@@ -925,7 +925,7 @@ void skl_scaler_get_config(struct intel_crtc_state 
*crtc_state)
 
        /* find scaler attached to this pipe */
        for (i = 0; i < crtc->num_scalers; i++) {
-               u32 ctl, pos, size;
+               u32 ctl, pos, size, sharp;
 
                ctl = intel_de_read(dev_priv, SKL_PS_CTRL(crtc->pipe, i));
                if ((ctl & (PS_SCALER_EN | PS_BINDING_MASK)) != (PS_SCALER_EN | 
PS_BINDING_PIPE))
@@ -933,6 +933,15 @@ void skl_scaler_get_config(struct intel_crtc_state 
*crtc_state)
 
                id = i;
 
+               sharp = intel_de_read(dev_priv, SHARPNESS_CTL(crtc->pipe));
+               if (sharp & FILTER_EN) {
+                       crtc_state->hw.casf_params.strength =
+                               REG_FIELD_GET(FILTER_STRENGTH_MASK, sharp) - 16;
+                       crtc_state->hw.casf_params.need_scaler = true;
+                       crtc_state->hw.casf_params.win_size =
+                               REG_FIELD_GET(FILTER_SIZE_MASK, sharp);
+               }
+
                if (!crtc_state->hw.casf_params.need_scaler)
                        crtc_state->pch_pfit.enabled = true;
 
-- 
2.25.1