Unverified Commit d3414634 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/tests: modes: Fix drm_display_mode memory leak 



drm_analog_tv_mode() and its variants return a drm_display_mode that
needs to be destroyed later one. The drm_modes_analog_tv tests never
do however, which leads to a memory leak.

Let's make sure it's freed.

Reported-by: default avatarPhilipp Stanner <phasta@mailbox.org>
Closes: https://lore.kernel.org/dri-devel/a7655158a6367ac46194d57f4b7433ef0772a73e.camel@mailbox.org/


Fixes: 4fcd2385 ("drm/modes: Add a function to generate analog display modes")
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250408-drm-kunit-drm-display-mode-memleak-v1-5-996305a2e75a@kernel.org


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 70f29ca3

drivers/gpu/drm/tests/drm_modes_test.c

+22 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static void drm_test_modes_analog_tv_ntsc_480i(struct kunit *test) 
{

	struct drm_test_modes_priv *priv = test->priv;

	struct drm_display_mode *mode;

	int ret;



	mode = drm_analog_tv_mode(priv->drm,

				  DRM_MODE_TV_MODE_NTSC,
@@ -47,6 +48,9 @@ static void drm_test_modes_analog_tv_ntsc_480i(struct kunit *test) 
				  true);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	ret = drm_kunit_add_mode_destroy_action(test, mode);

	KUNIT_ASSERT_EQ(test, ret, 0);



	KUNIT_EXPECT_EQ(test, drm_mode_vrefresh(mode), 60);

	KUNIT_EXPECT_EQ(test, mode->hdisplay, 720);
@@ -70,6 +74,7 @@ static void drm_test_modes_analog_tv_ntsc_480i_inlined(struct kunit *test) 
{

	struct drm_test_modes_priv *priv = test->priv;

	struct drm_display_mode *expected, *mode;

	int ret;



	expected = drm_analog_tv_mode(priv->drm,

				      DRM_MODE_TV_MODE_NTSC,
@@ -77,9 +82,15 @@ static void drm_test_modes_analog_tv_ntsc_480i_inlined(struct kunit *test) 
				      true);

	KUNIT_ASSERT_NOT_NULL(test, expected);



	ret = drm_kunit_add_mode_destroy_action(test, expected);

	KUNIT_ASSERT_EQ(test, ret, 0);



	mode = drm_mode_analog_ntsc_480i(priv->drm);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	ret = drm_kunit_add_mode_destroy_action(test, mode);

	KUNIT_ASSERT_EQ(test, ret, 0);



	KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected, mode));

}
@@ -87,6 +98,7 @@ static void drm_test_modes_analog_tv_pal_576i(struct kunit *test) 
{

	struct drm_test_modes_priv *priv = test->priv;

	struct drm_display_mode *mode;

	int ret;



	mode = drm_analog_tv_mode(priv->drm,

				  DRM_MODE_TV_MODE_PAL,
@@ -94,6 +106,9 @@ static void drm_test_modes_analog_tv_pal_576i(struct kunit *test) 
				  true);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	ret = drm_kunit_add_mode_destroy_action(test, mode);

	KUNIT_ASSERT_EQ(test, ret, 0);



	KUNIT_EXPECT_EQ(test, drm_mode_vrefresh(mode), 50);

	KUNIT_EXPECT_EQ(test, mode->hdisplay, 720);
@@ -117,6 +132,7 @@ static void drm_test_modes_analog_tv_pal_576i_inlined(struct kunit *test) 
{

	struct drm_test_modes_priv *priv = test->priv;

	struct drm_display_mode *expected, *mode;

	int ret;



	expected = drm_analog_tv_mode(priv->drm,

				      DRM_MODE_TV_MODE_PAL,
@@ -124,9 +140,15 @@ static void drm_test_modes_analog_tv_pal_576i_inlined(struct kunit *test) 
				      true);

	KUNIT_ASSERT_NOT_NULL(test, expected);



	ret = drm_kunit_add_mode_destroy_action(test, expected);

	KUNIT_ASSERT_EQ(test, ret, 0);



	mode = drm_mode_analog_pal_576i(priv->drm);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	ret = drm_kunit_add_mode_destroy_action(test, mode);

	KUNIT_ASSERT_EQ(test, ret, 0);



	KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected, mode));

}