drm/amdgpu/gfx12_1: Increase reserved memory size to 150M

Increase reserved memory to 150 MB.

v2: squash in fixes (Alex)

Signed-off-by: Alex Sierra <alex.sierra@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index f1634072e335e7ae62a961e499d88fbf85f6ef37..dcf5043d0bb1b96952bd540e5e1ad44ff5b9740c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1712,10 +1712,7 @@ static void amdgpu_ttm_init_fw_resv_region(struct amdgpu_device *adev)
                reserve_size = max(reserve_size, (uint32_t)280 << 20);
        else if (!adev->bios &&
                 amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 1, 0)) {
-               if (hweight32(adev->aid_mask) == 1)
-                       reserve_size = max(reserve_size, (uint32_t)128 << 20);
-               else
-                       reserve_size = max(reserve_size, (uint32_t)144 << 20);
+               reserve_size = max(reserve_size, (uint32_t)150 << 20);
        } else if (!reserve_size)
                reserve_size = DISCOVERY_TMR_OFFSET;