drm/amdgpu: correct vmhub index in GMC v10/11
Subsystems (2)
PATCH 1/1 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 Lang Yu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +3 -1
@@ -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
@@ -99,7 +99,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;
Signature · 1 line
2.25.1
[AMD Official Use Only - General]
Reviewed-by Hawking Zhang <[email protected]>
Regards,
Hawking
-----Original Message-----
From: Yu, Lang <[email protected]>
Sent: Thursday, July 27, 2023 11:02
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Chai, Thomas <[email protected]>; Yu, Lang <[email protected]>
Subject: [PATCH] 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 Lang Yu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +3 -1
@@ -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 -2
@@ -99,7 +99,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; --
2.25.1