From: "Mario Limonciello (AMD)" <[email protected]> Initialize backlight connector state and display manager dc_lock in KUnit connector and adev allocators, and update property count expectations in tests to account for the newly attached LUMINANCE property.
Signed-off-by: Mario Limonciello (AMD) <[email protected]> --- .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 14 +++++++++++--- .../amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c | 8 +++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c index e03173d4e5bd8..c5f65e9a90ca8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c @@ -52,6 +52,7 @@ static void setup_test_connector(struct kunit *test, fixture->aconnector->dc_link = fixture->link; fixture->aconnector->base.dev = &fixture->adev->ddev; fixture->link->connector_signal = signal; + drm_backlight_connector_init(&fixture->aconnector->base); } static void setup_test_dm_ddev(struct kunit *test, struct amdgpu_display_manager *dm) @@ -483,12 +484,17 @@ static void dm_test_register_backlight_device_success(struct kunit *test) struct dc_link *link = dm_kunit_alloc_link(test); struct drm_minor *primary; unsigned int max; + int ret; + + ret = drmm_mode_config_init(&adev->ddev); + KUNIT_ASSERT_EQ(test, ret, 0); setup_test_link_service(test, link); link->dc->link_srv->edp_get_backlight_level = dm_test_get_backlight_level_error; primary = kunit_kzalloc(test, sizeof(*primary), GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, primary); adev->ddev.primary = primary; + adev->dm.ddev = &adev->ddev; adev->dm.backlight_link[0] = link; aconnector = dm_kunit_alloc_connector(test, adev, link); @@ -1884,9 +1890,11 @@ static void dm_test_setup_backlight_device_attaches_abm_property(struct kunit *t KUNIT_EXPECT_EQ(test, dm->num_of_edps, 1); KUNIT_EXPECT_EQ(test, aconnector->bl_idx, 0); - KUNIT_EXPECT_EQ(test, aconnector->base.base.properties->count, old_count + 1); - KUNIT_EXPECT_PTR_EQ(test, aconnector->base.base.properties->properties[old_count], prop); - KUNIT_EXPECT_EQ(test, aconnector->base.base.properties->values[old_count], + KUNIT_EXPECT_EQ(test, aconnector->base.base.properties->count, old_count + 2); + KUNIT_EXPECT_PTR_EQ(test, + aconnector->base.base.properties->properties[old_count + 1], + prop); + KUNIT_EXPECT_EQ(test, aconnector->base.base.properties->values[old_count + 1], (uint64_t)ABM_SYSFS_CONTROL); amdgpu_dm_set_backlight_param(saved_backlight); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c index aad122c7229f5..ed5045c948fe9 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c @@ -7,6 +7,7 @@ #include <kunit/test.h> #include <linux/module.h> +#include <drm/drm_backlight.h> #include <drm/drm_kunit_helpers.h> #include <drm/drm_managed.h> @@ -32,7 +33,11 @@ struct amdgpu_device *dm_kunit_alloc_adev(struct kunit *test) DRIVER_MODESET | DRIVER_ATOMIC); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, drm); - return drm_to_adev(drm); + struct amdgpu_device *adev = drm_to_adev(drm); + + mutex_init(&adev->dm.dc_lock); + + return adev; } EXPORT_SYMBOL(dm_kunit_alloc_adev); @@ -172,6 +177,7 @@ struct amdgpu_dm_connector *dm_kunit_alloc_connector(struct kunit *test, if (adev) aconnector->base.dev = &adev->ddev; aconnector->dc_link = link; + drm_backlight_connector_init(&aconnector->base); return aconnector; } -- 2.43.0
