drm/i915: Relocate is_in_vrr_range()

Move is_in_vrr_range() into intel_vrr.c in anticipation of
more users, and rename it accordingly.

Cc: Manasi Navare <navaremanasi@chromium.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230901130440.2085-8-ville.syrjala@linux.intel.com
Reviewed-by: Manasi Navare <navaremanasi@chromium.org>
Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
index 9232a305b1e6f612f1d871400499a82c8221a872..086cb8dbe22c81917d4c1eb38d8c670a8d4c2a4a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_panel.c
+++ b/drivers/gpu/drm/i915/display/intel_panel.c
@@ -59,15 +59,6 @@ intel_panel_preferred_fixed_mode(struct intel_connector *connector)
                                        struct drm_display_mode, head);
 }
 
-static bool is_in_vrr_range(struct intel_connector *connector, int vrefresh)
-{
-       const struct drm_display_info *info = &connector->base.display_info;
-
-       return intel_vrr_is_capable(connector) &&
-               vrefresh >= info->monitor_range.min_vfreq &&
-               vrefresh <= info->monitor_range.max_vfreq;
-}
-
 static bool is_best_fixed_mode(struct intel_connector *connector,
                               int vrefresh, int fixed_mode_vrefresh,
                               const struct drm_display_mode *best_mode)
@@ -81,8 +72,8 @@ static bool is_best_fixed_mode(struct intel_connector *connector,
         * vrefresh, which we can then reduce to match the requested
         * vrefresh by extending the vblank length.
         */
-       if (is_in_vrr_range(connector, vrefresh) &&
-           is_in_vrr_range(connector, fixed_mode_vrefresh) &&
+       if (intel_vrr_is_in_range(connector, vrefresh) &&
+           intel_vrr_is_in_range(connector, fixed_mode_vrefresh) &&
            fixed_mode_vrefresh < vrefresh)
                return false;
 
@@ -224,8 +215,8 @@ int intel_panel_compute_config(struct intel_connector *connector,
         * Assume that we shouldn't muck about with the
         * timings if they don't land in the VRR range.
         */
-       is_vrr = is_in_vrr_range(connector, vrefresh) &&
-               is_in_vrr_range(connector, fixed_mode_vrefresh);
+       is_vrr = intel_vrr_is_in_range(connector, vrefresh) &&
+               intel_vrr_is_in_range(connector, fixed_mode_vrefresh);
 
        if (!is_vrr) {
                /*

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index 88e4759b538b64b1ad3a572a7be933a1fda32864..6ef782538337065d861fbd12302d904c47beec0d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -42,6 +42,15 @@ bool intel_vrr_is_capable(struct intel_connector *connector)
                info->monitor_range.max_vfreq - info->monitor_range.min_vfreq > 10;
 }
 
+bool intel_vrr_is_in_range(struct intel_connector *connector, int vrefresh)
+{
+       const struct drm_display_info *info = &connector->base.display_info;
+
+       return intel_vrr_is_capable(connector) &&
+               vrefresh >= info->monitor_range.min_vfreq &&
+               vrefresh <= info->monitor_range.max_vfreq;
+}
+
 void
 intel_vrr_check_modeset(struct intel_atomic_state *state)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h b/drivers/gpu/drm/i915/display/intel_vrr.h
index de16960c4929f69eee618f71fb183a2bcf6e9894..89937858200d32a13a5bea77e44ee2053219ede8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.h
+++ b/drivers/gpu/drm/i915/display/intel_vrr.h
@@ -14,6 +14,7 @@ struct intel_connector;
 struct intel_crtc_state;
 
 bool intel_vrr_is_capable(struct intel_connector *connector);
+bool intel_vrr_is_in_range(struct intel_connector *connector, int vrefresh);
 void intel_vrr_check_modeset(struct intel_atomic_state *state);
 void intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
                              struct drm_connector_state *conn_state);