Just like BPC, we'll add support for automatic selection of the output
format for HDMI connectors.

Let's add the needed defaults and fields for now.

Reviewed-by: Dave Stevenson <dave.steven...@raspberrypi.com>
Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
 drivers/gpu/drm/drm_atomic.c                       |  2 ++
 drivers/gpu/drm/drm_atomic_state_helper.c          |  3 ++-
 drivers/gpu/drm/drm_connector.c                    | 31 ++++++++++++++++++++++
 .../gpu/drm/tests/drm_atomic_state_helper_test.c   | 22 +++++++++++----
 drivers/gpu/drm/tests/drm_connector_test.c         |  9 +++++++
 include/drm/drm_connector.h                        | 20 ++++++++++++++
 6 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 4e11cfb4518b..8730137baa86 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1146,6 +1146,8 @@ static void drm_atomic_connector_print_state(struct 
drm_printer *p,
        if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
            connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {
                drm_printf(p, "\toutput_bpc=%u\n", state->hdmi.output_bpc);
+               drm_printf(p, "\toutput_format=%s\n",
+                          
drm_hdmi_connector_get_output_format_name(state->hdmi.output_format));
        }
 
        if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c 
b/drivers/gpu/drm/drm_atomic_state_helper.c
index 460454904fe3..ae99765c45de 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -660,7 +660,8 @@ int drm_atomic_helper_connector_hdmi_check(struct 
drm_connector *connector,
        struct drm_connector_state *new_state =
                drm_atomic_get_new_connector_state(state, connector);
 
-       if (old_state->hdmi.output_bpc != new_state->hdmi.output_bpc) {
+       if (old_state->hdmi.output_bpc != new_state->hdmi.output_bpc ||
+           old_state->hdmi.output_format != new_state->hdmi.output_format) {
                struct drm_crtc *crtc = new_state->crtc;
                struct drm_crtc_state *crtc_state;
 
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index da51a2bcb978..b629c8e990f4 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -459,6 +459,7 @@ EXPORT_SYMBOL(drmm_connector_init);
  * @funcs: callbacks for this connector
  * @connector_type: user visible type of the connector
  * @ddc: optional pointer to the associated ddc adapter
+ * @supported_formats: Bitmask of @hdmi_colorspace listing supported output 
formats
  * @max_bpc: Maximum bits per char the HDMI connector supports
  *
  * Initialises a preallocated HDMI connector. Connectors can be
@@ -477,6 +478,7 @@ int drmm_connector_hdmi_init(struct drm_device *dev,
                             const struct drm_connector_funcs *funcs,
                             int connector_type,
                             struct i2c_adapter *ddc,
+                            unsigned long supported_formats,
                             unsigned int max_bpc)
 {
        int ret;
@@ -485,6 +487,9 @@ int drmm_connector_hdmi_init(struct drm_device *dev,
              connector_type == DRM_MODE_CONNECTOR_HDMIB))
                return -EINVAL;
 
+       if (!supported_formats || !(supported_formats & 
BIT(HDMI_COLORSPACE_RGB)))
+               return -EINVAL;
+
        if (!(max_bpc == 8 || max_bpc == 10 || max_bpc == 12))
                return -EINVAL;
 
@@ -492,6 +497,8 @@ int drmm_connector_hdmi_init(struct drm_device *dev,
        if (ret)
                return ret;
 
+       connector->hdmi.supported_formats = supported_formats;
+
        /*
         * drm_connector_attach_max_bpc_property() requires the
         * connector to have a state.
@@ -1201,6 +1208,30 @@ static const u32 dp_colorspaces =
        BIT(DRM_MODE_COLORIMETRY_BT2020_CYCC) |
        BIT(DRM_MODE_COLORIMETRY_BT2020_YCC);
 
+static const char * const output_format_str[] = {
+       [HDMI_COLORSPACE_RGB]           = "RGB",
+       [HDMI_COLORSPACE_YUV420]        = "YUV 4:2:0",
+       [HDMI_COLORSPACE_YUV422]        = "YUV 4:2:2",
+       [HDMI_COLORSPACE_YUV444]        = "YUV 4:4:4",
+};
+
+/*
+ * drm_hdmi_connector_get_output_format_name() - Return a string for HDMI 
connector output format
+ * @fmt: Output format to compute name of
+ *
+ * Returns: the name of the output format, or NULL if the type is not
+ * valid.
+ */
+const char *
+drm_hdmi_connector_get_output_format_name(enum hdmi_colorspace fmt)
+{
+       if (fmt >= ARRAY_SIZE(output_format_str))
+               return NULL;
+
+       return output_format_str[fmt];
+}
+EXPORT_SYMBOL(drm_hdmi_connector_get_output_format_name);
+
 /**
  * DOC: standard connector properties
  *
diff --git a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c 
b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c
index 5d1a1dbff433..a129ea5f014c 100644
--- a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c
@@ -147,6 +147,7 @@ static const struct drm_connector_funcs 
dummy_connector_funcs = {
 static
 struct drm_atomic_helper_connector_hdmi_priv *
 drm_atomic_helper_connector_hdmi_init(struct kunit *test,
+                                     unsigned int formats,
                                      unsigned int max_bpc)
 {
        struct drm_atomic_helper_connector_hdmi_priv *priv;
@@ -190,6 +191,7 @@ drm_atomic_helper_connector_hdmi_init(struct kunit *test,
                                       &dummy_connector_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       NULL,
+                                      formats,
                                       max_bpc);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -225,7 +227,9 @@ static void 
drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
        struct drm_crtc *crtc;
        int ret;
 
-       priv = drm_atomic_helper_connector_hdmi_init(test, 10);
+       priv = drm_atomic_helper_connector_hdmi_init(test,
+                                                    BIT(HDMI_COLORSPACE_RGB),
+                                                    10);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
@@ -292,7 +296,9 @@ static void 
drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
        struct drm_crtc *crtc;
        int ret;
 
-       priv = drm_atomic_helper_connector_hdmi_init(test, 10);
+       priv = drm_atomic_helper_connector_hdmi_init(test,
+                                                    BIT(HDMI_COLORSPACE_RGB),
+                                                    10);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
@@ -361,7 +367,9 @@ static void drm_test_check_bpc_8_value(struct kunit *test)
        struct drm_connector_state *conn_state;
        struct drm_connector *conn;
 
-       priv = drm_atomic_helper_connector_hdmi_init(test, 8);
+       priv = drm_atomic_helper_connector_hdmi_init(test,
+                                                    BIT(HDMI_COLORSPACE_RGB),
+                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
        conn = &priv->connector;
@@ -383,7 +391,9 @@ static void drm_test_check_bpc_10_value(struct kunit *test)
        struct drm_connector_state *conn_state;
        struct drm_connector *conn;
 
-       priv = drm_atomic_helper_connector_hdmi_init(test, 10);
+       priv = drm_atomic_helper_connector_hdmi_init(test,
+                                                    BIT(HDMI_COLORSPACE_RGB),
+                                                    10);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
        conn = &priv->connector;
@@ -405,7 +415,9 @@ static void drm_test_check_bpc_12_value(struct kunit *test)
        struct drm_connector_state *conn_state;
        struct drm_connector *conn;
 
-       priv = drm_atomic_helper_connector_hdmi_init(test, 12);
+       priv = drm_atomic_helper_connector_hdmi_init(test,
+                                                    BIT(HDMI_COLORSPACE_RGB),
+                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
        conn = &priv->connector;
diff --git a/drivers/gpu/drm/tests/drm_connector_test.c 
b/drivers/gpu/drm/tests/drm_connector_test.c
index 20da290abff3..a9a57cb23235 100644
--- a/drivers/gpu/drm/tests/drm_connector_test.c
+++ b/drivers/gpu/drm/tests/drm_connector_test.c
@@ -187,6 +187,7 @@ static void drm_test_connector_hdmi_init_valid(struct kunit 
*test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       8);
        KUNIT_EXPECT_EQ(test, ret, 0);
 }
@@ -204,6 +205,7 @@ static void drm_test_connector_hdmi_init_null_ddc(struct 
kunit *test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       NULL,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       8);
        KUNIT_EXPECT_EQ(test, ret, 0);
 }
@@ -221,6 +223,7 @@ static void drm_test_connector_hdmi_init_bpc_invalid(struct 
kunit *test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       9);
        KUNIT_EXPECT_LT(test, ret, 0);
 }
@@ -238,6 +241,7 @@ static void drm_test_connector_hdmi_init_bpc_null(struct 
kunit *test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       0);
        KUNIT_EXPECT_LT(test, ret, 0);
 }
@@ -259,6 +263,7 @@ static void drm_test_connector_hdmi_init_bpc_8(struct kunit 
*test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       8);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -292,6 +297,7 @@ static void drm_test_connector_hdmi_init_bpc_10(struct 
kunit *test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       10);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -325,6 +331,7 @@ static void drm_test_connector_hdmi_init_bpc_12(struct 
kunit *test)
                                       &dummy_funcs,
                                       DRM_MODE_CONNECTOR_HDMIA,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       12);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -355,6 +362,7 @@ static void drm_test_connector_hdmi_init_type_valid(struct 
kunit *test)
                                       &dummy_funcs,
                                       connector_type,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       8);
        KUNIT_EXPECT_EQ(test, ret, 0);
 }
@@ -387,6 +395,7 @@ static void 
drm_test_connector_hdmi_init_type_invalid(struct kunit *test)
                                       &dummy_funcs,
                                       connector_type,
                                       &priv->ddc,
+                                      BIT(HDMI_COLORSPACE_RGB),
                                       8);
        KUNIT_EXPECT_LT(test, ret, 0);
 }
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index d4d2ae15bc1e..29883e6f8e50 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -368,6 +368,9 @@ enum drm_panel_orientation {
        DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
 };
 
+const char *
+drm_hdmi_connector_get_output_format_name(enum hdmi_colorspace fmt);
+
 /**
  * struct drm_monitor_range_info - Panel's Monitor range in EDID for
  * &drm_display_info
@@ -1041,6 +1044,11 @@ struct drm_connector_state {
                 * @output_bpc: Bits per color channel to output.
                 */
                unsigned int output_bpc;
+
+               /**
+                * @output_format: Pixel format to output in.
+                */
+               enum hdmi_colorspace output_format;
        } hdmi;
 };
 
@@ -1902,6 +1910,17 @@ struct drm_connector {
 
        /** @hdr_sink_metadata: HDR Metadata Information read from sink */
        struct hdr_sink_metadata hdr_sink_metadata;
+
+       /**
+        * @hdmi: HDMI-related variable and properties.
+        */
+       struct {
+               /**
+                * @supported_formats: Bitmask of @hdmi_colorspace
+                * supported by the controller.
+                */
+               unsigned long supported_formats;
+       } hdmi;
 };
 
 #define obj_to_connector(x) container_of(x, struct drm_connector, base)
@@ -1925,6 +1944,7 @@ int drmm_connector_hdmi_init(struct drm_device *dev,
                             const struct drm_connector_funcs *funcs,
                             int connector_type,
                             struct i2c_adapter *ddc,
+                            unsigned long supported_formats,
                             unsigned int max_bpc);
 void drm_connector_attach_edid_property(struct drm_connector *connector);
 int drm_connector_register(struct drm_connector *connector);

-- 
2.43.2

Reply via email to