drm/i915/display: New function to avoid duplicate code in upcomming

BugLink: https://bugs.launchpad.net/bugs/1934489
Moves some checks that later will be performed 2 times to an own function.
This avoids duplicate code later on.

Signed-off-by: Werner Sembach <wse@tuxedocomputers.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210510133349.14491-2-wse@tuxedocomputers.com
(backported from commit eacba74d4d561ea6487d944417526e1b025cbebd)
Signed-off-by: Werner Sembach <wse@tuxedocomputers.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 0c18174d9984c78f4bed597c21eb804aad4d9218..8a972ec6dc79d87a65e3d7adb709a10e79e68d54 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2246,6 +2246,32 @@ static int intel_hdmi_port_clock(int clock, int bpc)
        return clock * bpc / 8;
 }
 
+static enum drm_mode_status
+intel_hdmi_mode_clock_valid(struct intel_hdmi *hdmi, int clock, bool has_hdmi_sink)
+{
+       struct drm_device *dev = intel_hdmi_to_dev(hdmi);
+       struct drm_i915_private *dev_priv = to_i915(dev);
+       enum drm_mode_status status;
+
+       /* check if we can do 8bpc */
+       status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 8),
+                                      true, has_hdmi_sink);
+
+       if (has_hdmi_sink) {
+               /* if we can't do 8bpc we may still be able to do 12bpc */
+               if (status != MODE_OK && !HAS_GMCH(dev_priv))
+                       status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 12),
+                                                      true, has_hdmi_sink);
+
+               /* if we can't do 8,12bpc we may still be able to do 10bpc */
+               if (status != MODE_OK && INTEL_GEN(dev_priv) >= 11)
+                       status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 10),
+                                                      true, has_hdmi_sink);
+       }
+
+       return status;
+}
+
 static enum drm_mode_status
 intel_hdmi_mode_valid(struct drm_connector *connector,
                      struct drm_display_mode *mode)
@@ -2276,21 +2302,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
        if (drm_mode_is_420_only(&connector->display_info, mode))
                clock /= 2;
 
-       /* check if we can do 8bpc */
-       status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 8),
-                                      true, has_hdmi_sink);
-
-       if (has_hdmi_sink) {
-               /* if we can't do 8bpc we may still be able to do 12bpc */
-               if (status != MODE_OK && !HAS_GMCH(dev_priv))
-                       status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 12),
-                                                      true, has_hdmi_sink);
-
-               /* if we can't do 8,12bpc we may still be able to do 10bpc */
-               if (status != MODE_OK && INTEL_GEN(dev_priv) >= 11)
-                       status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 10),
-                                                      true, has_hdmi_sink);
-       }
+       status = intel_hdmi_mode_clock_valid(hdmi, clock, has_hdmi_sink);
        if (status != MODE_OK)
                return status;