This is a note to let you know that I've just added the patch titled
drm/amdgpu: don't use ATRM for external devices
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-don-t-use-atrm-for-external-devices.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 432e664e7c98c243fab4c3c95bd463bea3aeed28 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Tue, 17 Oct 2023 15:40:01 -0400
Subject: drm/amdgpu: don't use ATRM for external devices
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 432e664e7c98c243fab4c3c95bd463bea3aeed28 upstream.
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@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
@@ -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>
@@ -289,6 +290,10 @@ static bool amdgpu_atrm_get_bios(struct
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)
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.1/drm-amd-pm-fix-error-of-maco-flag-setting-code.patch
queue-6.1/drm-amd-display-use-full-update-for-clip-size-increa.patch
queue-6.1/drm-radeon-fix-a-possible-null-pointer-dereference.patch
queue-6.1/drm-amdkfd-fix-shift-out-of-bounds-issue.patch
queue-6.1/drm-amdgpu-not-to-save-bo-in-the-case-of-ras-err_eve.patch
queue-6.1/drm-amdgpu-lower-cs-errors-to-debug-severity.patch
queue-6.1/drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch
queue-6.1/drm-amd-update-update_pcie_parameters-functions-to-u.patch
queue-6.1/drm-amd-pm-handle-non-terminated-overdrive-commands.patch
queue-6.1/drm-amd-display-enable-dsc_clk-even-if-dsc_pg-disabl.patch
queue-6.1/drm-amdgpu-vkms-fix-a-possible-null-pointer-derefere.patch
queue-6.1/drm-amd-display-change-the-dmcub-mailbox-memory-location-from-fb-to-inbox.patch
queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-smu7.patch
queue-6.1/drm-amdgpu-don-t-use-pci_is_thunderbolt_attached.patch
queue-6.1/drm-amd-display-fix-a-null-pointer-dereference-in-amdgpu_dm_i2c_xfer.patch
queue-6.1/drm-amdgpu-don-t-use-atrm-for-external-devices.patch
queue-6.1/drm-amdkfd-fix-a-race-condition-of-vram-buffer-unref.patch
queue-6.1/drm-amdgpu-fix-software-pci_unplug-on-some-chips.patch
queue-6.1/drm-amd-display-enable-fast-plane-updates-on-dcn3.2-and-above.patch
queue-6.1/drm-amdgpu-fix-potential-null-pointer-derefernce.patch
queue-6.1/drm-amd-display-avoid-null-dereference-of-timing-gen.patch
queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-pola.patch
queue-6.1/drm-amdgpu-smu13-drop-compute-workload-workaround.patch
queue-6.1/drm-amdgpu-fix-error-handling-in-amdgpu_bo_list_get.patch
