diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 95dd4012580c..355ba53cab6b 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -579,8 +579,8 @@ int drmm_connector_hdmi_init(struct drm_device *dev,
if (!hdmi_funcs->vendor || !hdmi_funcs->product)
return -EINVAL;
- if ((strlen(hdmi_funcs->vendor) > DRM_CONNECTOR_HDMI_VENDOR_LEN) ||
- (strlen(hdmi_funcs->product) > DRM_CONNECTOR_HDMI_PRODUCT_LEN))
+ if ((strlen(hdmi_funcs->vendor) > HDMI_SPD_INFOFRAME_VENDOR_LEN) ||
+ (strlen(hdmi_funcs->product) > HDMI_SPD_INFOFRAME_PRODUCT_LEN))
return -EINVAL;
if (!hdmi_funcs->supported_formats ||
diff --git a/drivers/gpu/drm/tests/drm_connector_test.c b/drivers/gpu/drm/tests/drm_connector_test.c
index d98c6a42ccae..591557c4a8bb 100644
--- a/drivers/gpu/drm/tests/drm_connector_test.c
+++ b/drivers/gpu/drm/tests/drm_connector_test.c
@@ -771,7 +771,7 @@ static void drm_test_connector_hdmi_init_product_valid(struct kunit *test)
priv->hdmi_funcs.product = "Prod";
KUNIT_ASSERT_LT(test, strlen(priv->hdmi_funcs.product),
- DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+ HDMI_SPD_INFOFRAME_PRODUCT_LEN);
ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
@@ -794,7 +794,7 @@ static void drm_test_connector_hdmi_init_product_length_exact(struct kunit *test
priv->hdmi_funcs.product = "ProductProductPr";
KUNIT_ASSERT_EQ(test, strlen(priv->hdmi_funcs.product),
- DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+ HDMI_SPD_INFOFRAME_PRODUCT_LEN);
ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
@@ -817,7 +817,7 @@ static void drm_test_connector_hdmi_init_product_length_too_long(struct kunit *t
priv->hdmi_funcs.product = "ProductProductProduct";
KUNIT_ASSERT_GT(test, strlen(priv->hdmi_funcs.product),
- DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+ HDMI_SPD_INFOFRAME_PRODUCT_LEN);
ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
@@ -840,7 +840,7 @@ static void drm_test_connector_hdmi_init_vendor_valid(struct kunit *test)
priv->hdmi_funcs.vendor = "Vend";
KUNIT_ASSERT_LT(test, strlen(priv->hdmi_funcs.vendor),
- DRM_CONNECTOR_HDMI_VENDOR_LEN);
+ HDMI_SPD_INFOFRAME_VENDOR_LEN);
ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
@@ -863,7 +863,7 @@ static void drm_test_connector_hdmi_init_vendor_length_exact(struct kunit *test)
priv->hdmi_funcs.vendor = "VendorVe";
KUNIT_ASSERT_EQ(test, strlen(priv->hdmi_funcs.vendor),
- DRM_CONNECTOR_HDMI_VENDOR_LEN);
+ HDMI_SPD_INFOFRAME_VENDOR_LEN);
ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
@@ -884,7 +884,8 @@ static void drm_test_connector_hdmi_init_vendor_length_too_long(struct kunit *te
priv->hdmi_funcs = dummy_hdmi_funcs;
priv->hdmi_funcs.vendor = "VendorVendor";
- KUNIT_ASSERT_GT(test, strlen(priv->hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN);
+ KUNIT_ASSERT_GT(test, strlen(priv->hdmi_funcs.vendor),
+ HDMI_SPD_INFOFRAME_VENDOR_LEN);
ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 262bc4d91a3c..2d9ae3a99329 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1485,15 +1485,15 @@ struct drm_connector_infoframe_funcs {
* and controller capabilities
*/
struct drm_connector_hdmi_funcs {
-#define DRM_CONNECTOR_HDMI_VENDOR_LEN 8
/**
- * @vendor: HDMI Controller Vendor name.
+ * @vendor: HDMI Controller Vendor name, at most
+ * HDMI_SPD_INFOFRAME_VENDOR_LEN characters long.
*/
const char *vendor;
-#define DRM_CONNECTOR_HDMI_PRODUCT_LEN 16
/**
- * @product: HDMI Controller Product name
+ * @product: HDMI Controller Product name, at most
+ * HDMI_SPD_INFOFRAME_PRODUCT_LEN characters long.
*/
const char *product;
--
2.56.0