drm/amd/display: Refactor dm_get_plane_scale helper

From Michel Daenzer
a99afba394a9b014eafaca2aa83495d651054bb1 in linux-6.1.y/6.1.63
ec4d770bbb155674c2497f255f4199bdc42287a9 in mainline linux

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 808d7b4..e3e1642 100644 (file)
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -9630,6 +9630,17 @@ static void dm_get_oriented_plane_size(struct drm_plane_state *plane_state,
        }
 }
 
+static void
+dm_get_plane_scale(struct drm_plane_state *plane_state,
+                  int *out_plane_scale_w, int *out_plane_scale_h)
+{
+       int plane_src_w, plane_src_h;
+
+       dm_get_oriented_plane_size(plane_state, &plane_src_w, &plane_src_h);
+       *out_plane_scale_w = plane_state->crtc_w * 1000 / plane_src_w;
+       *out_plane_scale_h = plane_state->crtc_h * 1000 / plane_src_h;
+}
+
 static int dm_check_crtc_cursor(struct drm_atomic_state *state,
                                struct drm_crtc *crtc,
                                struct drm_crtc_state *new_crtc_state)
@@ -9638,8 +9649,6 @@ static int dm_check_crtc_cursor(struct drm_atomic_state *state,
        struct drm_plane_state *new_cursor_state, *new_underlying_state;
        int i;
        int cursor_scale_w, cursor_scale_h, underlying_scale_w, underlying_scale_h;
-       int cursor_src_w, cursor_src_h;
-       int underlying_src_w, underlying_src_h;
 
        /* On DCE and DCN there is no dedicated hardware cursor plane. We get a
         * cursor per pipe but it's going to inherit the scaling and
@@ -9654,9 +9663,7 @@ static int dm_check_crtc_cursor(struct drm_atomic_state *state,
        if (!new_cursor_state->fb)
                return 0;
 
-       dm_get_oriented_plane_size(new_cursor_state, &cursor_src_w, &cursor_src_h);
-       cursor_scale_w = new_cursor_state->crtc_w * 1000 / cursor_src_w;
-       cursor_scale_h = new_cursor_state->crtc_h * 1000 / cursor_src_h;
+       dm_get_plane_scale(new_cursor_state, &cursor_scale_w, &cursor_scale_h);
 
        /* Need to check all enabled planes, even if this commit doesn't change
         * their state
@@ -9674,10 +9681,8 @@ static int dm_check_crtc_cursor(struct drm_atomic_state *state,
                if (!new_underlying_state->fb)
                        continue;
 
-               dm_get_oriented_plane_size(new_underlying_state,
-                                          &underlying_src_w, &underlying_src_h);
-               underlying_scale_w = new_underlying_state->crtc_w * 1000 / underlying_src_w;
-               underlying_scale_h = new_underlying_state->crtc_h * 1000 / underlying_src_h;
+               dm_get_plane_scale(new_underlying_state,
+                                  &underlying_scale_w, &underlying_scale_h);
 
                if (cursor_scale_w != underlying_scale_w ||
                    cursor_scale_h != underlying_scale_h) {