Commit 5efa6217 authored by Jesse Zhang's avatar Jesse Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Fix SDMA engine reset with logical instance ID 



This commit makes the following improvements to SDMA engine reset handling:

1. Clarifies in the function documentation that instance_id refers to a logical ID
2. Adds conversion from logical to physical instance ID before performing reset
   using GET_INST(SDMA0, instance_id) macro
3. Improves error messaging to indicate when a logical instance reset fails
4. Adds better code organization with blank lines for readability

The change ensures proper SDMA engine reset by using the correct physical
instance ID while maintaining the logical ID interface for callers.

V2: Remove harvest_config check and convert directly to physical instance (Lijo)

Suggested-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Signed-off-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3f1e81ec

drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c

+6 −4
Original line number Diff line number Diff line
@@ -540,8 +540,10 @@ static int amdgpu_sdma_soft_reset(struct amdgpu_device *adev, u32 instance_id) 
	case IP_VERSION(4, 4, 2):

	case IP_VERSION(4, 4, 4):

	case IP_VERSION(4, 4, 5):

		/* For SDMA 4.x, use the existing DPM interface for backward compatibility */

		r = amdgpu_dpm_reset_sdma(adev, 1 << instance_id);

		/* For SDMA 4.x, use the existing DPM interface for backward compatibility,

		 * we need to convert the logical instance ID to physical instance ID before reset.

		 */

		r = amdgpu_dpm_reset_sdma(adev, 1 << GET_INST(SDMA0, instance_id));

		break;

	case IP_VERSION(5, 0, 0):

	case IP_VERSION(5, 0, 1):
@@ -568,7 +570,7 @@ static int amdgpu_sdma_soft_reset(struct amdgpu_device *adev, u32 instance_id) 
/**

 * amdgpu_sdma_reset_engine - Reset a specific SDMA engine

 * @adev: Pointer to the AMDGPU device

 * @instance_id: ID of the SDMA engine instance to reset

 * @instance_id: Logical ID of the SDMA engine instance to reset

 *

 * Returns: 0 on success, or a negative error code on failure.

 */
@@ -601,7 +603,7 @@ int amdgpu_sdma_reset_engine(struct amdgpu_device *adev, uint32_t instance_id) 
	/* Perform the SDMA reset for the specified instance */

	ret = amdgpu_sdma_soft_reset(adev, instance_id);

	if (ret) {

		dev_err(adev->dev, "Failed to reset SDMA instance %u\n", instance_id);

		dev_err(adev->dev, "Failed to reset SDMA logical instance %u\n", instance_id);

		goto exit;

	}