Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: add another ATPX quirk for TOPAZ" failed to apply to 4.14-stable tree

PATCH [email protected] 2 participants 3 messages Jul 22, 2018 – Oct 5, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-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 ------------------

Quoted 1 line

From b3fc2ab37e27f8d6588a4755382346ba2335a7c7 Mon Sep 17 00:00:00 2001

From: Alex Deucher <[email protected]>
Date: Tue, 17 Jul 2018 10:52:29 -0500
Subject: [PATCH] drm/amdgpu: add another ATPX quirk for TOPAZ

Needs ATPX rather than _PR3.

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +1 -0
index 9ab89371d9e8..ca8bf1c9a98e 100644
@@ -575,6 +575,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = {
 	{ 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },
+	{ 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0, 0, 0, 0, 0 },
 };
 
Reviewed-by Junwei Zhang
#1 lore raw

Hi Greg,

Quoted 5 lines · On Sun, Jul 22, 2018 at 06:36:04PM +0200, [email protected] wrote:

The patch below does not apply to the 4.14-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]>.

The attached backported patch should now apply to 4.14-stable tree.

--
Regards
Sudip

Quoted 1 line

From 0b0ea8e47f41bb729ecad1a9cace34a20855a814 Mon Sep 17 00:00:00 2001

From: Alex Deucher <[email protected]>
Date: Tue, 17 Jul 2018 10:52:29 -0500
Subject: [PATCH] drm/amdgpu: add another ATPX quirk for TOPAZ

commit b3fc2ab37e27f8d6588a4755382346ba2335a7c7 upstream

Needs ATPX rather than _PR3.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +1 -0
index 1ae5ae8c45a4..1a75a6b9ab2f 100644
@@ -569,6 +569,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = {
 	{ 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },
+	{ 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0x1002, 0x67DF, 0x1028, 0x0774, AMDGPU_PX_QUIRK_FORCE_ATPX },
 	{ 0, 0, 0, 0, 0 },
 };
Signature · 1 line
2.11.0
author maintainer
#2 lore raw
Quoted 10 lines · Sudip Mukherjee

Hi Greg,

Quoted 5 lines · On Sun, Jul 22, 2018 at 06:36:04PM +0200, [email protected] wrote:

The patch below does not apply to the 4.14-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]>.

The attached backported patch should now apply to 4.14-stable tree.

Now applied, thanks.

greg k-h