drm/amdgpu: fix amdgpu_gmc_gart_location a little bit

Improve the VCE limitation handling.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 72dffa3fd194362cb2c23762a5171b413fc367b1..8269197df8e0cac5d7529904526aa5c44fa4d5d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -120,24 +120,22 @@ void amdgpu_gmc_gart_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc)
 
        mc->gart_size += adev->pm.smu_prv_buffer_size;
 
-       size_af = adev->gmc.mc_mask - mc->vram_end;
+       /* VCE doesn't like it when BOs cross a 4GB segment, so align
+        * the GART base on a 4GB boundary as well.
+        */
        size_bf = mc->vram_start;
-       if (size_bf > size_af) {
-               if (mc->gart_size > size_bf) {
-                       dev_warn(adev->dev, "limiting GART\n");
-                       mc->gart_size = size_bf;
-               }
+       size_af = adev->gmc.mc_mask + 1 -
+               ALIGN(mc->vram_end + 1, 0x100000000ULL);
+
+       if (mc->gart_size > max(size_bf, size_af)) {
+               dev_warn(adev->dev, "limiting GART\n");
+               mc->gart_size = max(size_bf, size_af);
+       }
+
+       if (size_bf > size_af)
                mc->gart_start = 0;
-       } else {
-               if (mc->gart_size > size_af) {
-                       dev_warn(adev->dev, "limiting GART\n");
-                       mc->gart_size = size_af;
-               }
-               /* VCE doesn't like it when BOs cross a 4GB segment, so align
-                * the GART base on a 4GB boundary as well.
-                */
+       else
                mc->gart_start = ALIGN(mc->vram_end + 1, 0x100000000ULL);
-       }
        mc->gart_end = mc->gart_start + mc->gart_size - 1;
        dev_info(adev->dev, "GART: %lluM 0x%016llX - 0x%016llX\n",
                        mc->gart_size >> 20, mc->gart_start, mc->gart_end);