[PATCH 08/10] drm/i915/display: Set and get the casf config

[Nemesa Garg]

Set the configuration for CASF and capture it
in crtc_state and get the configuration by
reading back. Add the support to compare the
software and hardware state of CASF.

v2: Update subject[Ankit]
v3: Add the state compare[Ankit]

Signed-off-by: Nemesa Garg <nemesa.g...@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c |  7 +++++++
 drivers/gpu/drm/i915/display/skl_scaler.c    | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 08515c69efb5..1b2e848a1705 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4243,6 +4243,10 @@ static int intel_crtc_atomic_check(struct 
intel_atomic_state *state,
                return ret;
        }
 
+       ret = intel_casf_compute_config(crtc_state);
+       if (ret)
+               return ret;
+
        if (DISPLAY_VER(display) >= 9) {
                if (intel_crtc_needs_modeset(crtc_state) ||
                    intel_crtc_needs_fastset(crtc_state) ||
@@ -5305,6 +5309,9 @@ intel_pipe_config_compare(const struct intel_crtc_state 
*current_config,
 
                PIPE_CONF_CHECK_I(scaler_state.scaler_id);
                PIPE_CONF_CHECK_I(pixel_rate);
+               PIPE_CONF_CHECK_BOOL(hw.casf_params.casf_enable);
+               PIPE_CONF_CHECK_I(hw.casf_params.win_size);
+               PIPE_CONF_CHECK_I(hw.casf_params.strength);
 
                PIPE_CONF_CHECK_X(gamma_mode);
                if (display->platform.cherryview)
diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c 
b/drivers/gpu/drm/i915/display/skl_scaler.c
index e7d1e1fa16ab..17abff14e815 100644
--- a/drivers/gpu/drm/i915/display/skl_scaler.c
+++ b/drivers/gpu/drm/i915/display/skl_scaler.c
@@ -963,16 +963,22 @@ void skl_scaler_get_config(struct intel_crtc_state 
*crtc_state)
                        continue;
 
                id = i;
-               crtc_state->pch_pfit.enabled = true;
+
+               if (HAS_CASF(display) && id == 1)
+                       intel_casf_sharpness_get_config(crtc_state);
+
+               if (!crtc_state->hw.casf_params.casf_enable)
+                       crtc_state->pch_pfit.enabled = true;
 
                pos = intel_de_read(display, SKL_PS_WIN_POS(crtc->pipe, i));
                size = intel_de_read(display, SKL_PS_WIN_SZ(crtc->pipe, i));
 
-               drm_rect_init(&crtc_state->pch_pfit.dst,
-                             REG_FIELD_GET(PS_WIN_XPOS_MASK, pos),
-                             REG_FIELD_GET(PS_WIN_YPOS_MASK, pos),
-                             REG_FIELD_GET(PS_WIN_XSIZE_MASK, size),
-                             REG_FIELD_GET(PS_WIN_YSIZE_MASK, size));
+               if (!crtc_state->hw.casf_params.casf_enable)
+                       drm_rect_init(&crtc_state->pch_pfit.dst,
+                                     REG_FIELD_GET(PS_WIN_XPOS_MASK, pos),
+                                     REG_FIELD_GET(PS_WIN_YPOS_MASK, pos),
+                                     REG_FIELD_GET(PS_WIN_XSIZE_MASK, size),
+                                     REG_FIELD_GET(PS_WIN_YSIZE_MASK, size));
 
                scaler_state->scalers[i].in_use = true;
                break;
-- 
2.25.1