]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/amdgpu: correct GART location info
authorJunwei Zhang <Jerry.Zhang@amd.com>
Tue, 19 Jun 2018 03:22:18 +0000 (11:22 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Jun 2018 18:17:39 +0000 (13:17 -0500)
Avoid confusing the GART with the GTT domain.

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

index fe76ec1f9737484670366ebedac441e2027df577..f81e8d53d7081d1406fb2e9f257616b230e7518a 100644 (file)
@@ -676,17 +676,15 @@ void amdgpu_device_vram_location(struct amdgpu_device *adev,
 }
 
 /**
- * amdgpu_device_gart_location - try to find GTT location
+ * amdgpu_device_gart_location - try to find GART location
  *
  * @adev: amdgpu device structure holding all necessary informations
  * @mc: memory controller structure holding memory informations
  *
- * Function will place try to place GTT before or after VRAM.
+ * Function will place try to place GART before or after VRAM.
  *
- * If GTT size is bigger than space left then we ajust GTT size.
+ * If GART size is bigger than space left then we ajust GART size.
  * Thus function will never fails.
- *
- * FIXME: when reducing GTT size align new size on power of 2.
  */
 void amdgpu_device_gart_location(struct amdgpu_device *adev,
                                 struct amdgpu_gmc *mc)
@@ -699,13 +697,13 @@ void amdgpu_device_gart_location(struct amdgpu_device *adev,
        size_bf = mc->vram_start;
        if (size_bf > size_af) {
                if (mc->gart_size > size_bf) {
-                       dev_warn(adev->dev, "limiting GTT\n");
+                       dev_warn(adev->dev, "limiting GART\n");
                        mc->gart_size = size_bf;
                }
                mc->gart_start = 0;
        } else {
                if (mc->gart_size > size_af) {
-                       dev_warn(adev->dev, "limiting GTT\n");
+                       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
@@ -714,7 +712,7 @@ void amdgpu_device_gart_location(struct amdgpu_device *adev,
                mc->gart_start = ALIGN(mc->vram_end + 1, 0x100000000ULL);
        }
        mc->gart_end = mc->gart_start + mc->gart_size - 1;
-       dev_info(adev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n",
+       dev_info(adev->dev, "GART: %lluM 0x%016llX - 0x%016llX\n",
                        mc->gart_size >> 20, mc->gart_start, mc->gart_end);
 }