@@ -37,6 +37,11 @@ static int accept_infoframe_write_infoframe(struct drm_connector *connector,
}
static const struct drm_connector_hdmi_funcs dummy_hdmi_funcs = {
+ .vendor = "Vendor",
+ .product = "Product",
+ .supported_hdmi_ver = HDMI_VERSION_1_4,
+ .supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
+ .max_bpc = 8,
.avi = {
.clear_infoframe = accept_infoframe_clear_infoframe,
.write_infoframe = accept_infoframe_write_infoframe,
@@ -669,14 +674,11 @@ static void drm_test_connector_hdmi_init_valid(struct kunit *test)
struct drm_connector_init_priv *priv = test->priv;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
}
@@ -689,14 +691,11 @@ static void drm_test_connector_hdmi_init_null_ddc(struct kunit *test)
struct drm_connector_init_priv *priv = test->priv;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- NULL,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ NULL);
KUNIT_EXPECT_EQ(test, ret, 0);
}
@@ -707,16 +706,16 @@ static void drm_test_connector_hdmi_init_null_ddc(struct kunit *test)
static void drm_test_connector_hdmi_init_null_vendor(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- NULL, "Product",
+ hdmi_funcs.vendor = NULL;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -727,16 +726,16 @@ static void drm_test_connector_hdmi_init_null_vendor(struct kunit *test)
static void drm_test_connector_hdmi_init_null_product(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", NULL,
+ hdmi_funcs.product = NULL;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -750,19 +749,18 @@ static void drm_test_connector_hdmi_init_product_valid(struct kunit *test)
const unsigned char expected_product[DRM_CONNECTOR_HDMI_PRODUCT_LEN] = {
'P', 'r', 'o', 'd',
};
- const char *product_name = "Prod";
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- KUNIT_ASSERT_LT(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+ hdmi_funcs.product = "Prod";
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", product_name,
+ KUNIT_ASSERT_LT(test, strlen(hdmi_funcs.product), DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.product,
@@ -783,19 +781,18 @@ static void drm_test_connector_hdmi_init_product_length_exact(struct kunit *test
'P', 'r', 'o', 'd', 'u', 'c', 't',
'P', 'r',
};
- const char *product_name = "ProductProductPr";
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- KUNIT_ASSERT_EQ(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+ hdmi_funcs.product = "ProductProductPr";
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", product_name,
+ KUNIT_ASSERT_EQ(test, strlen(hdmi_funcs.product), DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.product,
@@ -810,19 +807,18 @@ static void drm_test_connector_hdmi_init_product_length_exact(struct kunit *test
static void drm_test_connector_hdmi_init_product_length_too_long(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
- const char *product_name = "ProductProductProduct";
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- KUNIT_ASSERT_GT(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+ hdmi_funcs.product = "ProductProductProduct";
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", product_name,
+ KUNIT_ASSERT_GT(test, strlen(hdmi_funcs.product), DRM_CONNECTOR_HDMI_PRODUCT_LEN);
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -836,19 +832,18 @@ static void drm_test_connector_hdmi_init_vendor_valid(struct kunit *test)
const char expected_vendor[DRM_CONNECTOR_HDMI_VENDOR_LEN] = {
'V', 'e', 'n', 'd',
};
- const char *vendor_name = "Vend";
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- KUNIT_ASSERT_LT(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN);
+ hdmi_funcs.vendor = "Vend";
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- vendor_name, "Product",
+ KUNIT_ASSERT_LT(test, strlen(hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN);
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.vendor,
@@ -868,19 +863,18 @@ static void drm_test_connector_hdmi_init_vendor_length_exact(struct kunit *test)
'V', 'e', 'n', 'd', 'o', 'r',
'V', 'e',
};
- const char *vendor_name = "VendorVe";
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- KUNIT_ASSERT_EQ(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN);
+ hdmi_funcs.vendor = "VendorVe";
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- vendor_name, "Product",
+ KUNIT_ASSERT_EQ(test, strlen(hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN);
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_MEMEQ(test,
priv->connector.hdmi.vendor,
@@ -895,19 +889,17 @@ static void drm_test_connector_hdmi_init_vendor_length_exact(struct kunit *test)
static void drm_test_connector_hdmi_init_vendor_length_too_long(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
- const char *vendor_name = "VendorVendor";
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- KUNIT_ASSERT_GT(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN);
+ hdmi_funcs.vendor = "VendorVendor";
+ KUNIT_ASSERT_GT(test, strlen(hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN);
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- vendor_name, "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -918,16 +910,16 @@ static void drm_test_connector_hdmi_init_vendor_length_too_long(struct kunit *te
static void drm_test_connector_hdmi_init_bpc_invalid(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ hdmi_funcs.max_bpc = 9;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 9);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -938,16 +930,16 @@ static void drm_test_connector_hdmi_init_bpc_invalid(struct kunit *test)
static void drm_test_connector_hdmi_init_bpc_null(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ hdmi_funcs.max_bpc = 0;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 0);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -965,14 +957,11 @@ static void drm_test_connector_hdmi_init_bpc_8(struct kunit *test)
uint64_t val;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
prop = connector->max_bpc_property;
@@ -1001,19 +990,19 @@ static void drm_test_connector_hdmi_init_bpc_10(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
struct drm_connector_state *state;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
struct drm_connector *connector = &priv->connector;
struct drm_property *prop;
uint64_t val;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, connector,
- "Vendor", "Product",
+ hdmi_funcs.max_bpc = 10;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 10);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
prop = connector->max_bpc_property;
@@ -1042,19 +1031,19 @@ static void drm_test_connector_hdmi_init_bpc_12(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
struct drm_connector_state *state;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
struct drm_connector *connector = &priv->connector;
struct drm_property *prop;
uint64_t val;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, connector,
- "Vendor", "Product",
+ hdmi_funcs.max_bpc = 12;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 12);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
prop = connector->max_bpc_property;
@@ -1081,16 +1070,16 @@ static void drm_test_connector_hdmi_init_bpc_12(struct kunit *test)
static void drm_test_connector_hdmi_init_formats_empty(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ hdmi_funcs.supported_formats = 0;
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- 0,
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -1101,16 +1090,16 @@ static void drm_test_connector_hdmi_init_formats_empty(struct kunit *test)
static void drm_test_connector_hdmi_init_formats_no_rgb(struct kunit *test)
{
struct drm_connector_init_priv *priv = test->priv;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ hdmi_funcs.supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
+
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -1155,20 +1144,19 @@ KUNIT_ARRAY_PARAM(drm_connector_hdmi_init_formats_yuv420_allowed,
static void drm_test_connector_hdmi_init_formats_yuv420_allowed(struct kunit *test)
{
const struct drm_connector_hdmi_init_formats_yuv420_allowed_test *params;
+ struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs;
struct drm_connector_init_priv *priv = test->priv;
int ret;
params = test->param_value;
priv->connector.ycbcr_420_allowed = params->yuv420_allowed;
+ hdmi_funcs.supported_formats = params->supported_formats;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
- &dummy_hdmi_funcs,
+ &hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- params->supported_formats,
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, params->expected_result);
}
@@ -1182,14 +1170,11 @@ static void drm_test_connector_hdmi_init_type_valid(struct kunit *test)
unsigned int connector_type = *(unsigned int *)test->param_value;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
&dummy_hdmi_funcs,
connector_type,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
}
@@ -1217,14 +1202,11 @@ static void drm_test_connector_hdmi_init_type_invalid(struct kunit *test)
unsigned int connector_type = *(unsigned int *)test->param_value;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector,
&dummy_funcs,
&dummy_hdmi_funcs,
connector_type,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_LT(test, ret, 0);
}
@@ -1494,14 +1476,11 @@ static void drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector(
struct drm_property *prop;
int ret;
- ret = drmm_connector_hdmi_ini2(&priv->drm, connector,
- "Vendor", "Product",
+ ret = drmm_connector_hdmi_init(&priv->drm, connector,
&dummy_funcs,
&dummy_hdmi_funcs,
DRM_MODE_CONNECTOR_HDMIA,
- &priv->ddc,
- BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
- 8);
+ &priv->ddc);
KUNIT_EXPECT_EQ(test, ret, 0);
ret = drm_connector_attach_broadcast_rgb_property(connector);