* [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping @ 2023-07-26 11:24 Lang Yu 2023-07-26 12:02 ` Zhang, Hawking 0 siblings, 1 reply; 4+ messages in thread From: Lang Yu @ 2023-07-26 11:24 UTC (permalink / raw) To: amd-gfx; +Cc: Alex Deucher, Yifan Zhang, Lang Yu, Hawking Zhang Align with new vmhub definition. vmid_src 0 -> AMDGPU_GFXHUB(0). vmid_src 1 -> AMDGPU_MMHUB0(0). Signed-off-by: Lang Yu <Lang.Yu@amd.com> --- 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping 2023-07-26 11:24 [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping Lang Yu @ 2023-07-26 12:02 ` Zhang, Hawking 2023-07-27 2:01 ` Chai, Thomas 0 siblings, 1 reply; 4+ messages in thread From: Zhang, Hawking @ 2023-07-26 12:02 UTC (permalink / raw) To: Yu, Lang, amd-gfx@lists.freedesktop.org, Chai, Thomas Cc: Deucher, Alexander, Zhang, Yifan [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@amd.com> Sent: Wednesday, July 26, 2023 19:25 To: amd-gfx@lists.freedesktop.org Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com>; Yu, Lang <Lang.Yu@amd.com> 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@amd.com> --- 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping 2023-07-26 12:02 ` Zhang, Hawking @ 2023-07-27 2:01 ` Chai, Thomas 2023-07-27 2:47 ` Lang Yu 0 siblings, 1 reply; 4+ messages in thread From: Chai, Thomas @ 2023-07-27 2:01 UTC (permalink / raw) To: Zhang, Hawking, Yu, Lang, amd-gfx@lists.freedesktop.org Cc: Deucher, Alexander, Zhang, Yifan [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 . ----------------- Best Regards, Thomas -----Original Message----- From: Zhang, Hawking <Hawking.Zhang@amd.com> Sent: Wednesday, July 26, 2023 8:03 PM To: Yu, Lang <Lang.Yu@amd.com>; amd-gfx@lists.freedesktop.org; Chai, Thomas <YiPeng.Chai@amd.com> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com> 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@amd.com> Sent: Wednesday, July 26, 2023 19:25 To: amd-gfx@lists.freedesktop.org Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com>; Yu, Lang <Lang.Yu@amd.com> 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@amd.com> --- 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping 2023-07-27 2:01 ` Chai, Thomas @ 2023-07-27 2:47 ` Lang Yu 0 siblings, 0 replies; 4+ messages in thread From: Lang Yu @ 2023-07-27 2:47 UTC (permalink / raw) To: Chai, Thomas Cc: Deucher, Alexander, Zhang, Yifan, amd-gfx@lists.freedesktop.org, Zhang, Hawking 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@amd.com> > Sent: Wednesday, July 26, 2023 8:03 PM > To: Yu, Lang <Lang.Yu@amd.com>; amd-gfx@lists.freedesktop.org; Chai, Thomas <YiPeng.Chai@amd.com> > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com> > 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@amd.com> > Sent: Wednesday, July 26, 2023 19:25 > To: amd-gfx@lists.freedesktop.org > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com>; Yu, Lang <Lang.Yu@amd.com> > 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@amd.com> > --- > 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 > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-27 2:47 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-07-26 11:24 [PATCH] drm/amdgpu: correct vmid_src -> vmhub_index mapping Lang Yu 2023-07-26 12:02 ` Zhang, Hawking 2023-07-27 2:01 ` Chai, Thomas 2023-07-27 2:47 ` Lang Yu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.