]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/amd/display: disable dcn20 abm feature for bring up
authorhersen wu <hersenxs.wu@amd.com>
Thu, 28 Feb 2019 21:35:24 +0000 (16:35 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 22 Jun 2019 14:34:08 +0000 (09:34 -0500)
[WHY] dcn20 enable usb-c dp ALT mode in dmcu. There is bug
when enable abm feature which cause system crash. dal team
will debug this bug later.

[HOW] disable dcn abm feature for dcn20.

Signed-off-by: hersen wu <hersenxs.wu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 5971aef4f033e616be1fe8ca2ebb7200300fd2f2..72d14f680932b43bab3fb549e84ebb0c2d2e4c32 100644 (file)
@@ -781,7 +781,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;
+       bool ret = false;
 
        for (i = 0; i < 16; i++)
                linear_lut[i] = 0xFFFF * i / 15;
@@ -792,10 +792,13 @@ static int dm_late_init(void *handle)
        params.backlight_lut_array_size = 16;
        params.backlight_lut_array = linear_lut;
 
-       ret = dmcu_load_iram(dmcu, params);
+       /* todo will enable for navi10 */
+       if (adev->asic_type <= CHIP_RAVEN) {
+               ret = dmcu_load_iram(dmcu, params);
 
-       if (!ret)
-               return -EINVAL;
+               if (!ret)
+                       return -EINVAL;
+       }
 
        return detect_mst_link_for_all_connectors(adev->ddev);
 }