drm/amd/display: remove early return from dm_late_init
authorRoman Li <roman.li@amd.com>
Thu, 27 Aug 2020 21:54:57 +0000 (17:54 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Sep 2020 21:52:41 +0000 (17:52 -0400)
[Why]
ABM feature initialization was not executed due to early return.

dm_late_init() had an early return in case if DMCU is not used.
With the implementation of ABM on DMUB, DMCU can be disabled
but ABM still needs to be initialized.

[How]
Remove verification for DMCU from the top of the function.
The existing logic will handle the case when DMCU is not used.

Signed-off-by: Roman Li <roman.li@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 643eb8e..1fdc92a 100644 (file)
@@ -1427,9 +1427,6 @@ static int dm_late_init(void *handle)
        struct dmcu *dmcu = NULL;
        bool ret = true;
 
-       if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
-               return detect_mst_link_for_all_connectors(adev_to_drm(adev));
-
        dmcu = adev->dm.dc->res_pool->dmcu;
 
        for (i = 0; i < 16; i++)