Commit 6f38bdb8 authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: correct vmhub index in GMC v10/11 



Align with new vmhub definition.

v2: use client_id == VMC to decide vmhub(Hawking)

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3dc6d835

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

+3 −1
Original line number Diff line number Diff line
@@ -102,9 +102,11 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev, 
				       struct amdgpu_irq_src *source,

				       struct amdgpu_iv_entry *entry)

{

	uint32_t vmhub_index = entry->client_id == SOC15_IH_CLIENTID_VMC ?

			       AMDGPU_MMHUB0(0) : AMDGPU_GFXHUB(0);

	struct amdgpu_vmhub *hub = &adev->vmhub[vmhub_index];

	bool retry_fault = !!(entry->src_data[1] & 0x80);

	bool write_fault = !!(entry->src_data[1] & 0x20);

	struct amdgpu_vmhub *hub = &adev->vmhub[entry->vmid_src];

	struct amdgpu_task_info task_info;

	uint32_t status = 0;

	u64 addr;

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

+3 −1
Original line number Diff line number Diff line
@@ -97,7 +97,9 @@ static int gmc_v11_0_process_interrupt(struct amdgpu_device *adev, 
				       struct amdgpu_irq_src *source,

				       struct amdgpu_iv_entry *entry)

{

	struct amdgpu_vmhub *hub = &adev->vmhub[entry->vmid_src];

	uint32_t vmhub_index = entry->client_id == SOC21_IH_CLIENTID_VMC ?

			       AMDGPU_MMHUB0(0) : AMDGPU_GFXHUB(0);

	struct amdgpu_vmhub *hub = &adev->vmhub[vmhub_index];

	uint32_t status = 0;

	u64 addr;