]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu: don't use ATRM for external devices
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 17 Oct 2023 19:40:01 +0000 (15:40 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 3 Nov 2023 15:59:13 +0000 (11:59 -0400)
The ATRM ACPI method is for fetching the dGPU vbios rom
image on laptops and all-in-one systems.  It should not be
used for external add in cards.  If the dGPU is thunderbolt
connected, don't try ATRM.

v2: pci_is_thunderbolt_attached only works for Intel.  Use
    pdev->external_facing instead.
v3: dev_is_removable() seems to be what we want

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2925
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c

index 38ccec913f0097772c6facd1a73b5cbeeca8287e..f3a09ecb76992b49665e5af3c8269ad14b667949 100644 (file)
@@ -29,6 +29,7 @@
 #include "amdgpu.h"
 #include "atom.h"
 
+#include <linux/device.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
@@ -287,6 +288,10 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)
        if (adev->flags & AMD_IS_APU)
                return false;
 
+       /* ATRM is for on-platform devices only */
+       if (dev_is_removable(&adev->pdev->dev))
+               return false;
+
        while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                dhandle = ACPI_HANDLE(&pdev->dev);
                if (!dhandle)