]> git.hungrycats.org Git - linux/commitdiff
drm/amd/display: Run FP-disabled MST stub test only without DC FP
authorSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Fri, 10 Jul 2026 14:36:33 +0000 (20:06 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 15 Jul 2026 13:15:37 +0000 (09:15 -0400)
dm_mst_test_fp_guarded_public_stubs() passes NULL arguments to
dm_dp_mst_is_port_support_mode() to test the stub implementation when
CONFIG_DRM_AMD_DC_FP is disabled.

However, this test is always registered. When CONFIG_DRM_AMD_DC_FP is
enabled, the real implementation is used instead of the stub. The real
implementation expects valid pointers, so passing NULL can lead to a
NULL pointer dereference.

Register this test only when CONFIG_DRM_AMD_DC_FP is disabled.

Reported-by: Dan Carpenter <error27@gmail.com>
Cc: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
Cc: Alex Hung <alex.hung@amd.com>
Cc: George Zhang <george.zhang@amd.com>
Cc: Roman Li <roman.li@amd.com>
Cc: Tom Chung <chiahsuan.chung@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c

index 3a663ee0ca2bfc4c63f23eb20df31b638dc83437..eaffff61129e361fd192426fb3f49272901d88d7 100644 (file)
@@ -1015,6 +1015,7 @@ static void dm_mst_test_detect_unregistered(struct kunit *test)
                        (int)connector_status_disconnected);
 }
 
+#if !defined(CONFIG_DRM_AMD_DC_FP)
 /**
  * dm_mst_test_fp_guarded_public_stubs - Test FP-off public fallbacks
  * @test: KUnit test context
@@ -1027,6 +1028,7 @@ static void dm_mst_test_fp_guarded_public_stubs(struct kunit *test)
        KUNIT_EXPECT_EQ(test, dm_dp_mst_is_port_support_mode(NULL, NULL),
                        (enum dc_status)DC_OK);
 }
+#endif
 
 static struct kunit_case dm_mst_types_test_cases[] = {
        /* needs_dsc_aux_workaround tests */
@@ -1077,7 +1079,9 @@ static struct kunit_case dm_mst_types_test_cases[] = {
        /* dm_dp_mst_detect tests */
        KUNIT_CASE(dm_mst_test_detect_unregistered),
        /* CONFIG_DRM_AMD_DC_FP disabled public paths */
+#if !defined(CONFIG_DRM_AMD_DC_FP)
        KUNIT_CASE(dm_mst_test_fp_guarded_public_stubs),
+#endif
        {}
 };