drm/i915/psr: Move plane sel fetch configuration into plane source files

Currently selective fetch configuration for planes is implemented in psr
code. More suitable place for this code is where everything else is
configured for planes -> move it into skl_universal_plane.c and
intel_cursor.c. This also allows us to drop hooks for cursor handling.

v3: Checkpatch warnings fixed
v2: Removed setting sel_fetch_area->y1/y2 as -1

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231120082606.3156488-2-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index b342fad..c025caf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -21,6 +21,7 @@
 #include "intel_fb_pin.h"
 #include "intel_frontbuffer.h"
 #include "intel_psr.h"
+#include "intel_psr_regs.h"
 #include "skl_watermark.h"
 
 /* Cursor formats */
@@ -484,6 +485,32 @@ static int i9xx_check_cursor(struct intel_crtc_state *crtc_state,
        return 0;
 }
 
+static void i9xx_cursor_update_sel_fetch_arm(struct intel_plane *plane,
+                                            const struct intel_crtc_state *crtc_state,
+                                            const struct intel_plane_state *plane_state)
+{
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+       enum pipe pipe = plane->pipe;
+
+       if (!crtc_state->enable_psr2_sel_fetch)
+               return;
+
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_CTL(pipe, plane->id),
+                         plane_state->ctl);
+}
+
+static void i9xx_cursor_disable_sel_fetch_arm(struct intel_plane *plane,
+                                             const struct intel_crtc_state *crtc_state)
+{
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+       enum pipe pipe = plane->pipe;
+
+       if (!crtc_state->enable_psr2_sel_fetch)
+               return;
+
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_CTL(pipe, plane->id), 0);
+}
+
 /* TODO: split into noarm+arm pair */
 static void i9xx_cursor_update_arm(struct intel_plane *plane,
                                   const struct intel_crtc_state *crtc_state,
@@ -531,10 +558,10 @@ static void i9xx_cursor_update_arm(struct intel_plane *plane,
                skl_write_cursor_wm(plane, crtc_state);
 
        if (plane_state)
-               intel_psr2_program_plane_sel_fetch_arm(plane, crtc_state,
-                                                      plane_state);
+               i9xx_cursor_update_sel_fetch_arm(plane, crtc_state,
+                                                plane_state);
        else
-               intel_psr2_disable_plane_sel_fetch_arm(plane, crtc_state);
+               i9xx_cursor_disable_sel_fetch_arm(plane, crtc_state);
 
        if (plane->cursor.base != base ||
            plane->cursor.size != fbc_ctl ||

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 15c1804..e7d6528 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1917,81 +1917,6 @@ static void psr_force_hw_tracking_exit(struct intel_dp *intel_dp)
        intel_de_write(dev_priv, CURSURFLIVE(intel_dp->psr.pipe), 0);
 }
 
-void intel_psr2_disable_plane_sel_fetch_arm(struct intel_plane *plane,
-                                           const struct intel_crtc_state *crtc_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       enum pipe pipe = plane->pipe;
-
-       if (!crtc_state->enable_psr2_sel_fetch)
-               return;
-
-       intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_CTL(pipe, plane->id), 0);
-}
-
-void intel_psr2_program_plane_sel_fetch_arm(struct intel_plane *plane,
-                                           const struct intel_crtc_state *crtc_state,
-                                           const struct intel_plane_state *plane_state)
-{
-       struct drm_i915_private *i915 = to_i915(plane->base.dev);
-       enum pipe pipe = plane->pipe;
-
-       if (!crtc_state->enable_psr2_sel_fetch)
-               return;
-
-       if (plane->id == PLANE_CURSOR)
-               intel_de_write_fw(i915, PLANE_SEL_FETCH_CTL(pipe, plane->id),
-                                 plane_state->ctl);
-       else
-               intel_de_write_fw(i915, PLANE_SEL_FETCH_CTL(pipe, plane->id),
-                                 PLANE_SEL_FETCH_CTL_ENABLE);
-}
-
-void intel_psr2_program_plane_sel_fetch_noarm(struct intel_plane *plane,
-                                             const struct intel_crtc_state *crtc_state,
-                                             const struct intel_plane_state *plane_state,
-                                             int color_plane)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       enum pipe pipe = plane->pipe;
-       const struct drm_rect *clip;
-       u32 val;
-       int x, y;
-
-       if (!crtc_state->enable_psr2_sel_fetch)
-               return;
-
-       if (plane->id == PLANE_CURSOR)
-               return;
-
-       clip = &plane_state->psr2_sel_fetch_area;
-
-       val = (clip->y1 + plane_state->uapi.dst.y1) << 16;
-       val |= plane_state->uapi.dst.x1;
-       intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_POS(pipe, plane->id), val);
-
-       x = plane_state->view.color_plane[color_plane].x;
-
-       /*
-        * From Bspec: UV surface Start Y Position = half of Y plane Y
-        * start position.
-        */
-       if (!color_plane)
-               y = plane_state->view.color_plane[color_plane].y + clip->y1;
-       else
-               y = plane_state->view.color_plane[color_plane].y + clip->y1 / 2;
-
-       val = y << 16 | x;
-
-       intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_OFFSET(pipe, plane->id),
-                         val);
-
-       /* Sizes are 0 based */
-       val = (drm_rect_height(clip) - 1) << 16;
-       val |= (drm_rect_width(&plane_state->uapi.src) >> 16) - 1;
-       intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_SIZE(pipe, plane->id), val);
-}
-
 void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_state)
 {
        struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);

diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h
index 6a1f457..143e059 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.h
+++ b/drivers/gpu/drm/i915/display/intel_psr.h
@@ -55,16 +55,6 @@ bool intel_psr_enabled(struct intel_dp *intel_dp);
 int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
                                struct intel_crtc *crtc);
 void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_state);
-void intel_psr2_program_plane_sel_fetch_noarm(struct intel_plane *plane,
-                                             const struct intel_crtc_state *crtc_state,
-                                             const struct intel_plane_state *plane_state,
-                                             int color_plane);
-void intel_psr2_program_plane_sel_fetch_arm(struct intel_plane *plane,
-                                           const struct intel_crtc_state *crtc_state,
-                                           const struct intel_plane_state *plane_state);
-
-void intel_psr2_disable_plane_sel_fetch_arm(struct intel_plane *plane,
-                                           const struct intel_crtc_state *crtc_state);
 void intel_psr_pause(struct intel_dp *intel_dp);
 void intel_psr_resume(struct intel_dp *intel_dp);
 

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index f5c77a0..0cac8be 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -18,6 +18,7 @@
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
 #include "intel_psr.h"
+#include "intel_psr_regs.h"
 #include "skl_scaler.h"
 #include "skl_universal_plane.h"
 #include "skl_watermark.h"
@@ -629,6 +630,18 @@ skl_plane_disable_arm(struct intel_plane *plane,
        intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), 0);
 }
 
+static void icl_plane_disable_sel_fetch_arm(struct intel_plane *plane,
+                                           const struct intel_crtc_state *crtc_state)
+{
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+       enum pipe pipe = plane->pipe;
+
+       if (!crtc_state->enable_psr2_sel_fetch)
+               return;
+
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_CTL(pipe, plane->id), 0);
+}
+
 static void
 icl_plane_disable_arm(struct intel_plane *plane,
                      const struct intel_crtc_state *crtc_state)
@@ -642,7 +655,7 @@ icl_plane_disable_arm(struct intel_plane *plane,
 
        skl_write_plane_wm(plane, crtc_state);
 
-       intel_psr2_disable_plane_sel_fetch_arm(plane, crtc_state);
+       icl_plane_disable_sel_fetch_arm(plane, crtc_state);
        intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), 0);
        intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), 0);
 }
@@ -1197,6 +1210,48 @@ skl_plane_update_arm(struct intel_plane *plane,
                          skl_plane_surf(plane_state, 0));
 }
 
+static void icl_plane_update_sel_fetch_noarm(struct intel_plane *plane,
+                                            const struct intel_crtc_state *crtc_state,
+                                            const struct intel_plane_state *plane_state,
+                                            int color_plane)
+{
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+       enum pipe pipe = plane->pipe;
+       const struct drm_rect *clip;
+       u32 val;
+       int x, y;
+
+       if (!crtc_state->enable_psr2_sel_fetch)
+               return;
+
+       clip = &plane_state->psr2_sel_fetch_area;
+
+       val = (clip->y1 + plane_state->uapi.dst.y1) << 16;
+       val |= plane_state->uapi.dst.x1;
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_POS(pipe, plane->id), val);
+
+       x = plane_state->view.color_plane[color_plane].x;
+
+       /*
+        * From Bspec: UV surface Start Y Position = half of Y plane Y
+        * start position.
+        */
+       if (!color_plane)
+               y = plane_state->view.color_plane[color_plane].y + clip->y1;
+       else
+               y = plane_state->view.color_plane[color_plane].y + clip->y1 / 2;
+
+       val = y << 16 | x;
+
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_OFFSET(pipe, plane->id),
+                         val);
+
+       /* Sizes are 0 based */
+       val = (drm_rect_height(clip) - 1) << 16;
+       val |= (drm_rect_width(&plane_state->uapi.src) >> 16) - 1;
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_SIZE(pipe, plane->id), val);
+}
+
 static void
 icl_plane_update_noarm(struct intel_plane *plane,
                       const struct intel_crtc_state *crtc_state,
@@ -1269,7 +1324,21 @@ icl_plane_update_noarm(struct intel_plane *plane,
        if (plane_state->force_black)
                icl_plane_csc_load_black(plane);
 
-       intel_psr2_program_plane_sel_fetch_noarm(plane, crtc_state, plane_state, color_plane);
+       icl_plane_update_sel_fetch_noarm(plane, crtc_state, plane_state, color_plane);
+}
+
+static void icl_plane_update_sel_fetch_arm(struct intel_plane *plane,
+                                          const struct intel_crtc_state *crtc_state,
+                                          const struct intel_plane_state *plane_state)
+{
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+       enum pipe pipe = plane->pipe;
+
+       if (!crtc_state->enable_psr2_sel_fetch)
+               return;
+
+       intel_de_write_fw(i915, PLANE_SEL_FETCH_CTL(pipe, plane->id),
+                         PLANE_SEL_FETCH_CTL_ENABLE);
 }
 
 static void
@@ -1296,7 +1365,7 @@ icl_plane_update_arm(struct intel_plane *plane,
        if (plane_state->scaler_id >= 0)
                skl_program_plane_scaler(plane, crtc_state, plane_state);
 
-       intel_psr2_program_plane_sel_fetch_arm(plane, crtc_state, plane_state);
+       icl_plane_update_sel_fetch_arm(plane, crtc_state, plane_state);
 
        /*
         * The control register self-arms if the plane was previously