drm/connector: hdmi: Factor out bpc and format computation logic

In preparation to support fallback to an alternative output format, e.g.
YUV420, when RGB cannot be used for any of the available color depths,
move the bpc try loop out of hdmi_compute_config() and, instead, make it
part of hdmi_compute_format(), while adding a new parameter to the
latter holding the output format to be checked and eventually set.

Since this helper now also changes hdmi.output_bpc in addition to
hdmi.output_format, highlight the extended functionality by renaming it
to hdmi_compute_format_bpc().

This improves code reusability and further extensibility, without
introducing any functional changes.

Reviewed-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20250527-hdmi-conn-yuv-v5-5-74c9c4a8ac0c@collabora.com
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
index 45a650b461abdfa50787a92a9d65f48c97f317a7..a9733a2e1b632e02f535c5ece64762f8ed9e4af2 100644 (file)
--- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
@@ -606,45 +606,22 @@ hdmi_try_format_bpc(const struct drm_connector *connector,
 }
 
 static int
-hdmi_compute_format(const struct drm_connector *connector,
-                   struct drm_connector_state *conn_state,
-                   const struct drm_display_mode *mode,
-                   unsigned int bpc)
-{
-       struct drm_device *dev = connector->dev;
-
-       /*
-        * TODO: Add support for YCbCr420 output for HDMI 2.0 capable
-        * devices, for modes that only support YCbCr420.
-        */
-       if (hdmi_try_format_bpc(connector, conn_state, mode, bpc, HDMI_COLORSPACE_RGB)) {
-               conn_state->hdmi.output_format = HDMI_COLORSPACE_RGB;
-               return 0;
-       }
-
-       drm_dbg_kms(dev, "Failed. No Format Supported for that bpc count.\n");
-
-       return -EINVAL;
-}
-
-static int
-hdmi_compute_config(const struct drm_connector *connector,
-                   struct drm_connector_state *conn_state,
-                   const struct drm_display_mode *mode)
+hdmi_compute_format_bpc(const struct drm_connector *connector,
+                       struct drm_connector_state *conn_state,
+                       const struct drm_display_mode *mode,
+                       unsigned int max_bpc, enum hdmi_colorspace fmt)
 {
        struct drm_device *dev = connector->dev;
-       unsigned int max_bpc = clamp_t(unsigned int,
-                                      conn_state->max_bpc,
-                                      8, connector->max_bpc);
        unsigned int bpc;
        int ret;
 
        for (bpc = max_bpc; bpc >= 8; bpc -= 2) {
-               ret = hdmi_compute_format(connector, conn_state, mode, bpc);
-               if (ret)
+               ret = hdmi_try_format_bpc(connector, conn_state, mode, bpc, fmt);
+               if (!ret)
                        continue;
 
                conn_state->hdmi.output_bpc = bpc;
+               conn_state->hdmi.output_format = fmt;
 
                drm_dbg_kms(dev,
                            "Mode %ux%u @ %uHz: Found configuration: bpc: %u, fmt: %s, clock: %llu\n",
@@ -656,9 +633,32 @@ hdmi_compute_config(const struct drm_connector *connector,
                return 0;
        }
 
+       drm_dbg_kms(dev, "Failed. %s output format not supported for any bpc count.\n",
+                   drm_hdmi_connector_get_output_format_name(fmt));
+
        return -EINVAL;
 }
 
+static int
+hdmi_compute_config(const struct drm_connector *connector,
+                   struct drm_connector_state *conn_state,
+                   const struct drm_display_mode *mode)
+{
+       unsigned int max_bpc = clamp_t(unsigned int,
+                                      conn_state->max_bpc,
+                                      8, connector->max_bpc);
+       int ret;
+
+       /*
+        * TODO: Add support for YCbCr420 output for HDMI 2.0 capable
+        * devices, for modes that only support YCbCr420.
+        */
+       ret = hdmi_compute_format_bpc(connector, conn_state, mode, max_bpc,
+                                     HDMI_COLORSPACE_RGB);
+
+       return ret;
+}
+
 static int hdmi_generate_avi_infoframe(const struct drm_connector *connector,
                                       struct drm_connector_state *conn_state)
 {