On 07/27/ , Chai, Thomas wrote:
> [AMD Official Use Only - General]
>
> Yes, the patch title is " drm/amdgpu: fix incorrect vmhub index ".
>
> Hi lang:
> You can update this patch based on the above patch review results .
Ok. Thanks.
Regards,
Lang
>
> -----------------
> Best Regards,
> Thomas
>
> -----Original Message-----
> From: Zhang, Hawking <Hawking.Zhang@xxxxxxx>
> Sent: Wednesday, July 26, 2023 8:03 PM
> To: Yu, Lang <Lang.Yu@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; Chai, Thomas <YiPeng.Chai@xxxxxxx>
> Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Zhang, Yifan <Yifan1.Zhang@xxxxxxx>
> Subject: RE: [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping
>
> [AMD Official Use Only - General]
>
> @Chai, Thomas sent the same fix for the review if I remember correctly. Might check with him to see when he push the fixes.
>
> Regards,
> Hawking
>
> -----Original Message-----
> From: Yu, Lang <Lang.Yu@xxxxxxx>
> Sent: Wednesday, July 26, 2023 19:25
> To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx>; Zhang, Yifan <Yifan1.Zhang@xxxxxxx>; Yu, Lang <Lang.Yu@xxxxxxx>
> Subject: [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping
>
> Align with new vmhub definition.
> vmid_src 0 -> AMDGPU_GFXHUB(0).
> vmid_src 1 -> AMDGPU_MMHUB0(0).
>
> Signed-off-by: Lang Yu <Lang.Yu@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 6b430e10d38e..9c4e084da99a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -102,9 +102,10 @@ static int gmc_v10_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 ? AMDGPU_MMHUB0(0) : AMDGPU_GFXHUB(0)];
> 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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> index 604522f70d03..47f5ced12ba2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> @@ -99,7 +99,8 @@ 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];
> + struct amdgpu_vmhub *hub =
> + &adev->vmhub[entry->vmid_src ? AMDGPU_MMHUB0(0) : AMDGPU_GFXHUB(0)];
> uint32_t status = 0;
> u64 addr;
>
> --
> 2.25.1
>
>
