[PATCH 5.4 304/314] Revert "drm/amd/display: disable dcn20 abm feature for bring up"

[Greg Kroah-Hartman]

From: Harry Wentland <harry.wentl...@amd.com>

commit 14ed1c908a7a623cc0cbf0203f8201d1b7d31d16 upstream.

This reverts commit 96cb7cf13d8530099c256c053648ad576588c387.

This change was used for DCN2 bringup and is no longer desired.
In fact it breaks backlight on DCN2 systems.

Cc: Alexander Monakov <amona...@ispras.ru>
Cc: Hersen Wu <hersenxs...@amd.com>
Cc: Anthony Koo <anthony....@amd.com>
Cc: Michael Chiu <michael.c...@amd.com>
Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Acked-by: Alex Deucher <alexander.deuc...@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
Reported-and-tested-by: Alexander Monakov <amona...@ispras.ru>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Cc: sta...@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -929,7 +929,7 @@ static int dm_late_init(void *handle)
        unsigned int linear_lut[16];
        int i;
        struct dmcu *dmcu = adev->dm.dc->res_pool->dmcu;
-       bool ret = false;
+       bool ret;
 
        for (i = 0; i < 16; i++)
                linear_lut[i] = 0xFFFF * i / 15;
@@ -945,13 +945,10 @@ static int dm_late_init(void *handle)
         */
        params.min_abm_backlight = 0x28F;
 
-       /* todo will enable for navi10 */
-       if (adev->asic_type <= CHIP_RAVEN) {
-               ret = dmcu_load_iram(dmcu, params);
-
-               if (!ret)
-                       return -EINVAL;
-       }
+       ret = dmcu_load_iram(dmcu, params);
+
+       if (!ret)
+               return -EINVAL;
 
        return detect_mst_link_for_all_connectors(adev->ddev);
 }