drm/amdgpu: use the smaller hole for GART
authorChristian König <christian.koenig@amd.com>
Fri, 24 Aug 2018 07:40:10 +0000 (09:40 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 29 Aug 2018 17:35:52 +0000 (12:35 -0500)
Instead of the larger one use the smaller hole in the MC address
space for the GART mappings.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

index 8269197df8e0cac5d7529904526aa5c44fa4d5d1..265ec68071304d5594e46be94564393f2e2501a2 100644 (file)
@@ -132,7 +132,8 @@ void amdgpu_gmc_gart_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc)
                mc->gart_size = max(size_bf, size_af);
        }
 
-       if (size_bf > size_af)
+       if ((size_bf >= mc->gart_size && size_bf < size_af) ||
+           (size_af < mc->gart_size))
                mc->gart_start = 0;
        else
                mc->gart_start = ALIGN(mc->vram_end + 1, 0x100000000ULL);