[PATCH] drm/amdgpu: Change AID detection logic

[Zhang, Hawking]

[AMD Official Use Only - General]

Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>

Regards,
Hawking
-----Original Message-----
From: Lazar, Lijo <Lijo.Lazar at amd.com>
Sent: Monday, April 15, 2024 00:43
To: amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Deucher, Alexander <Alexander.Deucher at amd.com>; Kamal, Asad <Asad.Kamal at amd.com>; Kamal, Asad <Asad.Kamal at amd.com>
Subject: [PATCH] drm/amdgpu: Change AID detection logic

On GFX 9.4.3 SOCs, only 2 SDMA instances need to be available to be considered as a valid AID.

Signed-off-by: Lijo Lazar <lijo.lazar at amd.com>
Reviewed-by: Asad Kamal <asad.kamal at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
index fbf5f65ab091..bdab65bc3105 100644
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
@@ -649,7 +649,7 @@ static void aqua_vanjaram_down_config(struct amdgpu_device *adev)

 int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev)  {
-       u32 mask, inst_mask = adev->sdma.sdma_mask, sdma_pres;
+       u32 mask, avail_inst, inst_mask = adev->sdma.sdma_mask;
        int ret, i;

        aqua_vanjaram_down_config(adev);
@@ -662,8 +662,9 @@ int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev)

        for (mask = (1 << adev->sdma.num_inst_per_aid) - 1; inst_mask;
             inst_mask >>= adev->sdma.num_inst_per_aid, ++i) {
-               sdma_pres = inst_mask & mask;
-               if (sdma_pres == mask || sdma_pres == 0x3 || sdma_pres == 0xc)
+               avail_inst = inst_mask & mask;
+               if (avail_inst == mask || avail_inst == 0x3 ||
+                   avail_inst == 0xc)
                        adev->aid_mask |= (1 << i);
        }

--
2.25.1