drm/amd/display: add dmcub check on RENOIR
authorAaron Ma <aaron.ma@canonical.com>
Wed, 8 Jul 2020 08:16:22 +0000 (04:16 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 9 Jul 2020 18:42:37 +0000 (14:42 -0400)
RENOIR loads dmub fw not dmcu, check dmcu only will prevent loading iram,
it breaks backlight control.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208277
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 10ac8076d4f244a80e91dd05733b426ab0ebf31f..db5e0bb0d9356ea5640415078e7e91828bd342bf 100644 (file)
@@ -1358,7 +1358,7 @@ static int dm_late_init(void *handle)
        struct dmcu *dmcu = NULL;
        bool ret;
 
-       if (!adev->dm.fw_dmcu)
+       if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
                return detect_mst_link_for_all_connectors(adev->ddev);
 
        dmcu = adev->dm.dc->res_pool->dmcu;