aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/4747-drm-amdgpu-correct-GART-location-info.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4747-drm-amdgpu-correct-GART-location-info.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/4747-drm-amdgpu-correct-GART-location-info.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4747-drm-amdgpu-correct-GART-location-info.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4747-drm-amdgpu-correct-GART-location-info.patch
new file mode 100644
index 00000000..52fd5bb6
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4747-drm-amdgpu-correct-GART-location-info.patch
@@ -0,0 +1,70 @@
+From afb375810a3280c8783d8994677f0554cc07e17b Mon Sep 17 00:00:00 2001
+From: Junwei Zhang <Jerry.Zhang@amd.com>
+Date: Tue, 19 Jun 2018 11:22:18 +0800
+Subject: [PATCH 4747/5725] drm/amdgpu: correct GART location info
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index a847b42..5791f58 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -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);
+ }
+
+--
+2.7.4
+