Commit 3b636026 authored by Jesse.Zhang's avatar Jesse.Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Add GFX 9.5.0 support for per-queue/pipe reset 



This patch enables per-queue and per-pipe reset functionality for
GFX IP v9.5.0 when using MEC firmware version 21 (0x15) or later.

This change:
1. Refactors the pipe reset support check in gfx_v9_4_3_pipe_reset_support()
   to use the compute_supported_reset flags instead of hardcoding
   version checks.
2. Adds support for GFX9.5.0 (IP 9.5.0) with MEC firmware version >= 21
   to enable per-queue and per-pipe reset capabilities.

v2: Replaced mec version check with !!(adev->gfx.compute_supported_reset & AMDGPU_RESET_TYPE_PER_PIPE) (Lijo)

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarJesse Zhang <jesse.zhang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5d6fddac

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

+7 −3
Original line number Diff line number Diff line
@@ -1153,6 +1153,12 @@ static int gfx_v9_4_3_sw_init(struct amdgpu_ip_block *ip_block) 
			adev->gfx.compute_supported_reset |= AMDGPU_RESET_TYPE_PER_PIPE;

		}

		break;

	case IP_VERSION(9, 5, 0):

		if (adev->gfx.mec_fw_version >= 21) {

			adev->gfx.compute_supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

			adev->gfx.compute_supported_reset |= AMDGPU_RESET_TYPE_PER_PIPE;

		}

		break;

	default:

		break;

	}
@@ -3452,9 +3458,7 @@ static int gfx_v9_4_3_unmap_done(struct amdgpu_device *adev, uint32_t me, 


static bool gfx_v9_4_3_pipe_reset_support(struct amdgpu_device *adev)

{

	/*TODO: Need check gfx9.4.4 mec fw whether supports pipe reset as well.*/

	if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3) &&

			adev->gfx.mec_fw_version >= 0x0000009b)

	if (!!(adev->gfx.compute_supported_reset & AMDGPU_RESET_TYPE_PER_PIPE))

		return true;

	else

		dev_warn_once(adev->dev, "Please use the latest MEC version to see whether support pipe reset\n");