[PATCH] drm/amdgpu: correct vmhub index in GMC v10/11

[PATCH] drm/amdgpu: correct vmhub index in GMC v10/11

[Alex Deucher]

From: Lang Yu <Lang.Yu@amd.com>

Align with new vmhub definition.

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

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2822
Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 6f38bdb86a056707b9ecb09e3b44adedc8e8d8a0)
Cc: stable@vger.kernel.org # 6.5.x
---
 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(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 0c8a47989576..c184f64342aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -109,9 +109,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;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
index c571f0d95994..dd9744b58394 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
@@ -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;
 
-- 
2.41.0

Re: [PATCH] drm/amdgpu: correct vmhub index in GMC v10/11

[Greg KH]

On Fri, Sep 01, 2023 at 03:38:35PM -0400, Alex Deucher wrote:
> From: Lang Yu <Lang.Yu@amd.com>
> 
> Align with new vmhub definition.
> 
> v2: use client_id == VMC to decide vmhub(Hawking)
> 
> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2822
> Signed-off-by: Lang Yu <Lang.Yu@amd.com>
> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> (cherry picked from commit 6f38bdb86a056707b9ecb09e3b44adedc8e8d8a0)
> Cc: stable@vger.kernel.org # 6.5.x
> ---
>  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(-)
> 

Now queued up, thanks.

greg k-h