FAILED: patch "[PATCH] Revert "drm/amd/display: disable dcn20 abm feature for bring" failed to apply to 5.6-stable tree

PATCH [email protected] 1 participant 1 message Jun 16, 2020

Subsystems (4)

Stable branch DRM drivers Radeon and amdgpu DRM drivers AMD display core

lore

Share & tools

lore

[email protected]

author maintainer

2020-06-16 10:52 UTC #0 lore raw

The patch below does not apply to the 5.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 14ed1c908a7a623cc0cbf0203f8201d1b7d31d16 Mon Sep 17 00:00:00 2001
From: Harry Wentland <[email protected]>
Date: Thu, 28 May 2020 09:44:44 -0400
Subject: [PATCH] Revert "drm/amd/display: disable dcn20 abm feature for bring
up"

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 <[email protected]>

Cc Hersen Wu <[email protected]>

Cc Anthony Koo <[email protected]>

Cc Michael Chiu <[email protected]>

Signed-off-by Harry Wentland <[email protected]>

Acked-by Alex Deucher <[email protected]>

Reviewed-by Nicholas Kazlauskas <[email protected]>

Reported-and-tested-by Alexander Monakov <[email protected]>

Signed-off-by Alex Deucher <[email protected]>

Cc [email protected]

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -7

index d53c60b37cc6..f42e7e67ddba 100644
@@ -1356,7 +1356,7 @@ static int dm_late_init(void *handle)
 	unsigned int linear_lut[16];
 	int i;
 	struct dmcu *dmcu = NULL;
-	bool ret = false;
+	bool ret;
 
 	if (!adev->dm.fw_dmcu)
 		return detect_mst_link_for_all_connectors(adev->ddev);

@@ -1377,13 +1377,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);
+	ret = dmcu_load_iram(dmcu, params);
 
-		if (!ret)
-			return -EINVAL;
-	}
+	if (!ret)
+		return -EINVAL;
 
 	return detect_mst_link_for_all_connectors(adev->ddev);
 }