From: Hugo Sales <[email protected]>
add_fs_modes() runs in ->get_modes() and skips a FreeSync video mode
that is_duplicate_mode() finds. Since commit 828cfa384e23
("drm/amd/display: Fix unadvertised mode detection"),
is_duplicate_mode() also searches connector->modes, which during a
re-probe still lists the previous probe's modes. add_fs_modes() then
takes every FreeSync video mode for a duplicate and adds none, and the
probe helper prunes the old ones as stale. With amdgpu.freesync_video=1,
the FreeSync video modes disappear on every second probe
The connector->modes search was for the unadvertised mode check, which
is gone, so search only probed_modes again
Fixes: 828cfa384e23 ("drm/amd/display: Fix unadvertised mode detection")
Signed-off-by: Hugo Sales <[email protected]>
---
.../amd/display/amdgpu_dm/amdgpu_dm_connector.c | 5 -----
.../amdgpu_dm/tests/amdgpu_dm_connector_test.c | 26 +++++++++++-----------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
index 89f8427433af0..da2ee6179cb67 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
@@ -1409,11 +1409,6 @@ STATIC_IFN_KUNIT bool is_duplicate_mode(struct
amdgpu_dm_connector *aconnector,
return true;
}
- list_for_each_entry(m, &aconnector->base.modes, head) {
- if (drm_mode_equal(m, mode))
- return true;
- }
-
return false;
}
diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
index addc407841a2a..5af111698e355 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
@@ -1136,7 +1136,6 @@ static void dm_test_is_duplicate_mode_empty_list(struct
kunit *test)
aconnector = kunit_kzalloc(test, sizeof(*aconnector), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, aconnector);
- INIT_LIST_HEAD(&aconnector->base.modes);
INIT_LIST_HEAD(&aconnector->base.probed_modes);
mode.hdisplay = 1920;
mode.vdisplay = 1080;
@@ -1157,12 +1156,11 @@ static void dm_test_is_duplicate_mode_match(struct
kunit *test)
aconnector = kunit_kzalloc(test, sizeof(*aconnector), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, aconnector);
- INIT_LIST_HEAD(&aconnector->base.modes);
INIT_LIST_HEAD(&aconnector->base.probed_modes);
existing.hdisplay = 1920;
existing.vdisplay = 1080;
existing.clock = 148500;
- list_add_tail(&existing.head, &aconnector->base.modes);
+ list_add_tail(&existing.head, &aconnector->base.probed_modes);
candidate.hdisplay = 1920;
candidate.vdisplay = 1080;
@@ -1172,10 +1170,14 @@ static void dm_test_is_duplicate_mode_match(struct
kunit *test)
}
/**
- * dm_test_is_duplicate_mode_probed_match - Test probed mode duplicate match
+ * dm_test_is_duplicate_mode_previous_probe - Test modes of the previous probe
don't count
* @test: The KUnit test context
+ *
+ * During a re-probe, base.modes still holds the previous probe's modes. A
+ * mode listed only there is not a duplicate, so add_fs_modes() builds the
+ * FreeSync video modes again on every probe
*/
-static void dm_test_is_duplicate_mode_probed_match(struct kunit *test)
+static void dm_test_is_duplicate_mode_previous_probe(struct kunit *test)
{
struct amdgpu_dm_connector *aconnector;
struct drm_display_mode existing = {};
@@ -1189,13 +1191,13 @@ static void
dm_test_is_duplicate_mode_probed_match(struct kunit *test)
existing.hdisplay = 1920;
existing.vdisplay = 1080;
existing.clock = 148500;
- list_add_tail(&existing.head, &aconnector->base.probed_modes);
+ list_add_tail(&existing.head, &aconnector->base.modes);
candidate.hdisplay = 1920;
candidate.vdisplay = 1080;
candidate.clock = 148500;
- KUNIT_EXPECT_TRUE(test, is_duplicate_mode(aconnector, &candidate));
+ KUNIT_EXPECT_FALSE(test, is_duplicate_mode(aconnector, &candidate));
}
/**
@@ -1212,11 +1214,10 @@ static void dm_test_is_duplicate_mode_no_match(struct
kunit *test)
KUNIT_ASSERT_NOT_NULL(test, aconnector);
INIT_LIST_HEAD(&aconnector->base.probed_modes);
- INIT_LIST_HEAD(&aconnector->base.modes);
existing.hdisplay = 1920;
existing.vdisplay = 1080;
existing.clock = 148500;
- list_add_tail(&existing.head, &aconnector->base.modes);
+ list_add_tail(&existing.head, &aconnector->base.probed_modes);
candidate.hdisplay = 2560;
candidate.vdisplay = 1440;
@@ -1238,13 +1239,12 @@ static void
dm_test_is_duplicate_mode_same_size_different_clock(struct kunit *te
aconnector = kunit_kzalloc(test, sizeof(*aconnector), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, aconnector);
- INIT_LIST_HEAD(&aconnector->base.probed_modes);
- INIT_LIST_HEAD(&aconnector->base.modes);
+ INIT_LIST_HEAD(&aconnector->base.probed_modes);
existing.hdisplay = 1920;
existing.vdisplay = 1080;
existing.clock = 148500;
- list_add_tail(&existing.head, &aconnector->base.modes);
+ list_add_tail(&existing.head, &aconnector->base.probed_modes);
candidate.hdisplay = 1920;
candidate.vdisplay = 1080;
@@ -10402,7 +10402,7 @@ static struct kunit_case amdgpu_dm_connector_tests[] = {
/* is_duplicate_mode */
KUNIT_CASE(dm_test_is_duplicate_mode_empty_list),
KUNIT_CASE(dm_test_is_duplicate_mode_match),
- KUNIT_CASE(dm_test_is_duplicate_mode_probed_match),
+ KUNIT_CASE(dm_test_is_duplicate_mode_previous_probe),
KUNIT_CASE(dm_test_is_duplicate_mode_no_match),
KUNIT_CASE(dm_test_is_duplicate_mode_same_size_different_clock),
/* amdgpu_dm_get_encoder_crtc_mask */
--
2.56.0