[RFC PATCH 3/6] drm/i915/psr: Rename *_disable_sel_fetch_arm to *_noarm

[Jouni Högander]

SEL_FETCH_PLANE_CTL is not really an arming register when disabling
plane that was previously enabled. Disabling plane can be just fine
done in noarm part. Rename *_disable_sel_fetch_arm functions to
*_noarm functions.

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_cursor.c        | 6 +++---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index f43a6f28e401..add772689310 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -499,8 +499,8 @@ static void i9xx_cursor_update_sel_fetch_arm(struct intel_plane *plane,
 			  plane_state->ctl);
 }
 
-static void i9xx_cursor_disable_sel_fetch_arm(struct intel_plane *plane,
-					    const struct intel_crtc_state *crtc_state)
+static void i9xx_cursor_disable_sel_fetch_noarm(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;
@@ -561,7 +561,7 @@ static void i9xx_cursor_update_arm(struct intel_plane *plane,
 		i9xx_cursor_update_sel_fetch_arm(plane, crtc_state,
 						       plane_state);
 	else
-		i9xx_cursor_disable_sel_fetch_arm(plane, crtc_state);
+		i9xx_cursor_disable_sel_fetch_noarm(plane, crtc_state);
 
 	if (plane->cursor.base != base ||
 	    plane->cursor.size != fbc_ctl ||
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 319088e6f4d8..6a4ec5dd2250 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -629,7 +629,7 @@ 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,
+static void icl_plane_disable_sel_fetch_noarm(struct intel_plane *plane,
 					    const struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
@@ -654,7 +654,7 @@ icl_plane_disable_arm(struct intel_plane *plane,
 
 	skl_write_plane_wm(plane, crtc_state);
 
-	icl_plane_disable_sel_fetch_arm(plane, crtc_state);
+	icl_plane_disable_sel_fetch_noarm(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);
 }
-- 
2.34.1