Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: revert "Add autodump debugfs node for gpu reset" failed to apply to 5.10-stable tree

PATCH [email protected] 1 participant 1 message Nov 4, 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.10-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 c8365dbda056578eebe164bf110816b1a39b4b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
Date: Thu, 30 Sep 2021 11:22:51 +0200
Subject: [PATCH] drm/amdgpu: revert "Add autodump debugfs node for gpu reset
v8"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 728e7e0cd61899208e924472b9e641dbeb0775c4.

Further discussion reveals that this feature is severely broken and needs to be reverted ASAP.

GPU reset can never be delayed by userspace even for debugging or otherwise we can run into in kernel deadlocks.

Signed-off-by Christian König <[email protected]>
Acked-by Alex Deucher <[email protected]>
Acked-by Nirmoy Das <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
index f4bceb2624fb..eb1c117e82b4 100644
@@ -1085,8 +1085,6 @@ struct amdgpu_device {
 	char				product_name[32];
 	char				serial[20];
 
-	struct amdgpu_autodump		autodump;
-
 	atomic_t			throttling_logging_enabled;
 	struct ratelimit_state		throttling_logging_rs;
 	uint32_t                        ras_hw_enabled;
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +0 -80

99 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h +0 -5
index 6d4965b2d01e..371a6f0deb29 100644
@@ -25,10 +25,6 @@
 /*
  * Debugfs
  */
-struct amdgpu_autodump {
-	struct completion		dumping;
-	struct wait_queue_head		gpu_hang;
-};
 
 int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);
 int amdgpu_debugfs_init(struct amdgpu_device *adev);

@@ -36,4 +32,3 @@ void amdgpu_debugfs_fini(struct amdgpu_device *adev);
 void amdgpu_debugfs_fence_init(struct amdgpu_device *adev);
 void amdgpu_debugfs_firmware_init(struct amdgpu_device *adev);
 void amdgpu_debugfs_gem_init(struct amdgpu_device *adev);
-int amdgpu_debugfs_wait_dump(struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -4
index 221520f375d4..0207b25c2e6e 100644
@@ -4440,10 +4440,6 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,
 	if (reset_context->reset_req_dev == adev)
 		job = reset_context->job;
 
-	/* no need to dump if device is not in good state during probe period */
-	if (!adev->gmc.xgmi.pending_reset)
-		amdgpu_debugfs_wait_dump(adev);
-
 	if (amdgpu_sriov_vf(adev)) {
 		/* stop the data exchange thread */
 		amdgpu_virt_fini_data_exchange(adev);