| Message ID | 20240222-kms-hdmi-connector-state-v7-5-8f4af575fce2@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/connector: Create HDMI Connector infrastructure | expand |
On 2/22/24 15:13, Maxime Ripard wrote: > drmm_connector_init is the preferred function to initialize a > drm_connector structure. Let's add a bunch of unit tests for it. > > Signed-off-by: Maxime Ripard <mripard@kernel.org> Reviewed-by: Maíra Canal <mcanal@igalia.com> Best Regards, - Maíra > --- > drivers/gpu/drm/tests/drm_connector_test.c | 170 ++++++++++++++++++++++++++++- > 1 file changed, 169 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/tests/drm_connector_test.c b/drivers/gpu/drm/tests/drm_connector_test.c > index c66aa2dc8d9d..a268847be8d1 100644 > --- a/drivers/gpu/drm/tests/drm_connector_test.c > +++ b/drivers/gpu/drm/tests/drm_connector_test.c > @@ -3,10 +3,175 @@ > * Kunit test for drm_modes functions > */ > > +#include <linux/i2c.h> > + > +#include <drm/drm_atomic_state_helper.h> > #include <drm/drm_connector.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_kunit_helpers.h> > > #include <kunit/test.h> > > +struct drm_connector_init_priv { > + struct drm_device drm; > + struct drm_connector connector; > + struct i2c_adapter ddc; > +}; > + > +static const struct drm_connector_funcs dummy_funcs = { > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .reset = drm_atomic_helper_connector_reset, > +}; > + > +static int dummy_ddc_xfer(struct i2c_adapter *adapter, > + struct i2c_msg *msgs, int num) > +{ > + return num; > +} > + > +static u32 dummy_ddc_func(struct i2c_adapter *adapter) > +{ > + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; > +} > + > +static const struct i2c_algorithm dummy_ddc_algorithm = { > + .master_xfer = dummy_ddc_xfer, > + .functionality = dummy_ddc_func, > +}; > + > +static void i2c_del_adapter_wrapper(void *ptr) > +{ > + struct i2c_adapter *adap = ptr; > + > + i2c_del_adapter(adap); > +} > + > +static int drm_test_connector_init(struct kunit *test) > +{ > + struct drm_connector_init_priv *priv; > + struct device *dev; > + int ret; > + > + dev = drm_kunit_helper_alloc_device(test); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); > + > + priv = drm_kunit_helper_alloc_drm_device(test, dev, > + struct drm_connector_init_priv, drm, > + DRIVER_MODESET | DRIVER_ATOMIC); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); > + > + strscpy(priv->ddc.name, "dummy-connector-ddc", sizeof(priv->ddc.name)); > + priv->ddc.owner = THIS_MODULE; > + priv->ddc.algo = &dummy_ddc_algorithm; > + priv->ddc.dev.parent = dev; > + > + ret = i2c_add_adapter(&priv->ddc); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = kunit_add_action_or_reset(test, i2c_del_adapter_wrapper, &priv->ddc); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + test->priv = priv; > + return 0; > +} > + > +/* > + * Test that the registration of a bog standard connector works as > + * expected and doesn't report any error. > + */ > +static void drm_test_drmm_connector_init(struct kunit *test) > +{ > + struct drm_connector_init_priv *priv = test->priv; > + int ret; > + > + ret = drmm_connector_init(&priv->drm, &priv->connector, > + &dummy_funcs, > + DRM_MODE_CONNECTOR_HDMIA, > + &priv->ddc); > + KUNIT_EXPECT_EQ(test, ret, 0); > +} > + > +/* > + * Test that the registration of a connector without a DDC adapter > + * doesn't report any error. > + */ > +static void drm_test_drmm_connector_init_null_ddc(struct kunit *test) > +{ > + struct drm_connector_init_priv *priv = test->priv; > + int ret; > + > + ret = drmm_connector_init(&priv->drm, &priv->connector, > + &dummy_funcs, > + DRM_MODE_CONNECTOR_HDMIA, > + NULL); > + KUNIT_EXPECT_EQ(test, ret, 0); > +} > + > +/* > + * Test that the registration of a connector succeeds for all possible > + * connector types. > + */ > +static void drm_test_drmm_connector_init_type_valid(struct kunit *test) > +{ > + struct drm_connector_init_priv *priv = test->priv; > + unsigned int connector_type = *(unsigned int *)test->param_value; > + int ret; > + > + ret = drmm_connector_init(&priv->drm, &priv->connector, > + &dummy_funcs, > + connector_type, > + &priv->ddc); > + KUNIT_EXPECT_EQ(test, ret, 0); > +} > + > +static const unsigned int drm_connector_init_type_valid_tests[] = { > + DRM_MODE_CONNECTOR_Unknown, > + DRM_MODE_CONNECTOR_VGA, > + DRM_MODE_CONNECTOR_DVII, > + DRM_MODE_CONNECTOR_DVID, > + DRM_MODE_CONNECTOR_DVIA, > + DRM_MODE_CONNECTOR_Composite, > + DRM_MODE_CONNECTOR_SVIDEO, > + DRM_MODE_CONNECTOR_LVDS, > + DRM_MODE_CONNECTOR_Component, > + DRM_MODE_CONNECTOR_9PinDIN, > + DRM_MODE_CONNECTOR_DisplayPort, > + DRM_MODE_CONNECTOR_HDMIA, > + DRM_MODE_CONNECTOR_HDMIB, > + DRM_MODE_CONNECTOR_TV, > + DRM_MODE_CONNECTOR_eDP, > + DRM_MODE_CONNECTOR_VIRTUAL, > + DRM_MODE_CONNECTOR_DSI, > + DRM_MODE_CONNECTOR_DPI, > + DRM_MODE_CONNECTOR_WRITEBACK, > + DRM_MODE_CONNECTOR_SPI, > + DRM_MODE_CONNECTOR_USB, > +}; > + > +static void drm_connector_init_type_desc(const unsigned int *type, char *desc) > +{ > + sprintf(desc, "%s", drm_get_connector_type_name(*type)); > +} > + > +KUNIT_ARRAY_PARAM(drm_connector_init_type_valid, > + drm_connector_init_type_valid_tests, > + drm_connector_init_type_desc); > + > +static struct kunit_case drmm_connector_init_tests[] = { > + KUNIT_CASE(drm_test_drmm_connector_init), > + KUNIT_CASE(drm_test_drmm_connector_init_null_ddc), > + KUNIT_CASE_PARAM(drm_test_drmm_connector_init_type_valid, > + drm_connector_init_type_valid_gen_params), > + { } > +}; > + > +static struct kunit_suite drmm_connector_init_test_suite = { > + .name = "drmm_connector_init", > + .init = drm_test_connector_init, > + .test_cases = drmm_connector_init_tests, > +}; > + > struct drm_get_tv_mode_from_name_test { > const char *name; > enum drm_connector_tv_mode expected_mode; > @@ -70,7 +235,10 @@ static struct kunit_suite drm_get_tv_mode_from_name_test_suite = { > .test_cases = drm_get_tv_mode_from_name_tests, > }; > > -kunit_test_suite(drm_get_tv_mode_from_name_test_suite); > +kunit_test_suites( > + &drmm_connector_init_test_suite, > + &drm_get_tv_mode_from_name_test_suite > +); > > MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>"); > MODULE_LICENSE("GPL"); >
On Thu, 22 Feb 2024 19:13:51 +0100, Maxime Ripard wrote: > drmm_connector_init is the preferred function to initialize a > drm_connector structure. Let's add a bunch of unit tests for it. > > Applied to drm/drm-misc (drm-misc-next). Thanks! Maxime
diff --git a/drivers/gpu/drm/tests/drm_connector_test.c b/drivers/gpu/drm/tests/drm_connector_test.c index c66aa2dc8d9d..a268847be8d1 100644 --- a/drivers/gpu/drm/tests/drm_connector_test.c +++ b/drivers/gpu/drm/tests/drm_connector_test.c @@ -3,10 +3,175 @@ * Kunit test for drm_modes functions */ +#include <linux/i2c.h> + +#include <drm/drm_atomic_state_helper.h> #include <drm/drm_connector.h> +#include <drm/drm_drv.h> +#include <drm/drm_kunit_helpers.h> #include <kunit/test.h> +struct drm_connector_init_priv { + struct drm_device drm; + struct drm_connector connector; + struct i2c_adapter ddc; +}; + +static const struct drm_connector_funcs dummy_funcs = { + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .reset = drm_atomic_helper_connector_reset, +}; + +static int dummy_ddc_xfer(struct i2c_adapter *adapter, + struct i2c_msg *msgs, int num) +{ + return num; +} + +static u32 dummy_ddc_func(struct i2c_adapter *adapter) +{ + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; +} + +static const struct i2c_algorithm dummy_ddc_algorithm = { + .master_xfer = dummy_ddc_xfer, + .functionality = dummy_ddc_func, +}; + +static void i2c_del_adapter_wrapper(void *ptr) +{ + struct i2c_adapter *adap = ptr; + + i2c_del_adapter(adap); +} + +static int drm_test_connector_init(struct kunit *test) +{ + struct drm_connector_init_priv *priv; + struct device *dev; + int ret; + + dev = drm_kunit_helper_alloc_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); + + priv = drm_kunit_helper_alloc_drm_device(test, dev, + struct drm_connector_init_priv, drm, + DRIVER_MODESET | DRIVER_ATOMIC); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + strscpy(priv->ddc.name, "dummy-connector-ddc", sizeof(priv->ddc.name)); + priv->ddc.owner = THIS_MODULE; + priv->ddc.algo = &dummy_ddc_algorithm; + priv->ddc.dev.parent = dev; + + ret = i2c_add_adapter(&priv->ddc); + KUNIT_ASSERT_EQ(test, ret, 0); + + ret = kunit_add_action_or_reset(test, i2c_del_adapter_wrapper, &priv->ddc); + KUNIT_ASSERT_EQ(test, ret, 0); + + test->priv = priv; + return 0; +} + +/* + * Test that the registration of a bog standard connector works as + * expected and doesn't report any error. + */ +static void drm_test_drmm_connector_init(struct kunit *test) +{ + struct drm_connector_init_priv *priv = test->priv; + int ret; + + ret = drmm_connector_init(&priv->drm, &priv->connector, + &dummy_funcs, + DRM_MODE_CONNECTOR_HDMIA, + &priv->ddc); + KUNIT_EXPECT_EQ(test, ret, 0); +} + +/* + * Test that the registration of a connector without a DDC adapter + * doesn't report any error. + */ +static void drm_test_drmm_connector_init_null_ddc(struct kunit *test) +{ + struct drm_connector_init_priv *priv = test->priv; + int ret; + + ret = drmm_connector_init(&priv->drm, &priv->connector, + &dummy_funcs, + DRM_MODE_CONNECTOR_HDMIA, + NULL); + KUNIT_EXPECT_EQ(test, ret, 0); +} + +/* + * Test that the registration of a connector succeeds for all possible + * connector types. + */ +static void drm_test_drmm_connector_init_type_valid(struct kunit *test) +{ + struct drm_connector_init_priv *priv = test->priv; + unsigned int connector_type = *(unsigned int *)test->param_value; + int ret; + + ret = drmm_connector_init(&priv->drm, &priv->connector, + &dummy_funcs, + connector_type, + &priv->ddc); + KUNIT_EXPECT_EQ(test, ret, 0); +} + +static const unsigned int drm_connector_init_type_valid_tests[] = { + DRM_MODE_CONNECTOR_Unknown, + DRM_MODE_CONNECTOR_VGA, + DRM_MODE_CONNECTOR_DVII, + DRM_MODE_CONNECTOR_DVID, + DRM_MODE_CONNECTOR_DVIA, + DRM_MODE_CONNECTOR_Composite, + DRM_MODE_CONNECTOR_SVIDEO, + DRM_MODE_CONNECTOR_LVDS, + DRM_MODE_CONNECTOR_Component, + DRM_MODE_CONNECTOR_9PinDIN, + DRM_MODE_CONNECTOR_DisplayPort, + DRM_MODE_CONNECTOR_HDMIA, + DRM_MODE_CONNECTOR_HDMIB, + DRM_MODE_CONNECTOR_TV, + DRM_MODE_CONNECTOR_eDP, + DRM_MODE_CONNECTOR_VIRTUAL, + DRM_MODE_CONNECTOR_DSI, + DRM_MODE_CONNECTOR_DPI, + DRM_MODE_CONNECTOR_WRITEBACK, + DRM_MODE_CONNECTOR_SPI, + DRM_MODE_CONNECTOR_USB, +}; + +static void drm_connector_init_type_desc(const unsigned int *type, char *desc) +{ + sprintf(desc, "%s", drm_get_connector_type_name(*type)); +} + +KUNIT_ARRAY_PARAM(drm_connector_init_type_valid, + drm_connector_init_type_valid_tests, + drm_connector_init_type_desc); + +static struct kunit_case drmm_connector_init_tests[] = { + KUNIT_CASE(drm_test_drmm_connector_init), + KUNIT_CASE(drm_test_drmm_connector_init_null_ddc), + KUNIT_CASE_PARAM(drm_test_drmm_connector_init_type_valid, + drm_connector_init_type_valid_gen_params), + { } +}; + +static struct kunit_suite drmm_connector_init_test_suite = { + .name = "drmm_connector_init", + .init = drm_test_connector_init, + .test_cases = drmm_connector_init_tests, +}; + struct drm_get_tv_mode_from_name_test { const char *name; enum drm_connector_tv_mode expected_mode; @@ -70,7 +235,10 @@ static struct kunit_suite drm_get_tv_mode_from_name_test_suite = { .test_cases = drm_get_tv_mode_from_name_tests, }; -kunit_test_suite(drm_get_tv_mode_from_name_test_suite); +kunit_test_suites( + &drmm_connector_init_test_suite, + &drm_get_tv_mode_from_name_test_suite +); MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>"); MODULE_LICENSE("GPL");
drmm_connector_init is the preferred function to initialize a drm_connector structure. Let's add a bunch of unit tests for it. Signed-off-by: Maxime Ripard <mripard@kernel.org> --- drivers/gpu/drm/tests/drm_connector_test.c | 170 ++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 1 deletion(-)