Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: add new device id for Renior" failed to apply to 5.11-stable tree

PATCH [email protected] 1 participant 1 message Mar 1, 2021

Subsystems (3)
Stable branch DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.11-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 278cdb6834901658a81a1e22f5799aa15dca5029 Mon Sep 17 00:00:00 2001
From: mengwang <[email protected]>
Date: Wed, 12 Aug 2020 11:49:29 +0800
Subject: [PATCH] drm/amdgpu: add new device id for Renior

add DID 0x164C into pciidlist under CHIP_RENOIR family.

Signed-off-by mengwang <[email protected]>
Reviewed-by Huang Rui <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
Cc [email protected] # 5.10.x
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -0
index 6a402d8b5573..3f0f3ce2611c 100644
@@ -1086,6 +1086,7 @@ static const struct pci_device_id pciidlist[] = {
 	/* Renoir */
 	{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
 	{0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
+	{0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
 
 	/* Navi12 */
 	{0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12},
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -1
index 9a25accd48a3..2396be16c28e 100644
@@ -1204,7 +1204,8 @@ static int soc15_common_early_init(void *handle)
 		break;
 	case CHIP_RENOIR:
 		adev->asic_funcs = &soc15_asic_funcs;
-		if (adev->pdev->device == 0x1636)
+		if ((adev->pdev->device == 0x1636) ||
+		    (adev->pdev->device == 0x164c))
 			adev->apu_flags |= AMD_APU_IS_RENOIR;
 		else
 			adev->apu_flags |= AMD_APU_IS_GREEN_SARDINE;