aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/5522-drm-amdgpu-fix-AGP-location-with-VRAM-at-0x0.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5522-drm-amdgpu-fix-AGP-location-with-VRAM-at-0x0.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5522-drm-amdgpu-fix-AGP-location-with-VRAM-at-0x0.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5522-drm-amdgpu-fix-AGP-location-with-VRAM-at-0x0.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5522-drm-amdgpu-fix-AGP-location-with-VRAM-at-0x0.patch
new file mode 100644
index 00000000..288f7c55
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5522-drm-amdgpu-fix-AGP-location-with-VRAM-at-0x0.patch
@@ -0,0 +1,43 @@
+From 70945135305d8980b95b3c848b7ac480946e2c99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Thu, 4 Oct 2018 10:27:48 +0200
+Subject: [PATCH 5522/5725] drm/amdgpu: fix AGP location with VRAM at 0x0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+That also simplifies handling quite a bit.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Reviewed-by: Huang Rui <ray.huang@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+index 9a5b252..999e159 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+@@ -200,16 +200,13 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc)
+ }
+
+ if (size_bf > size_af) {
+- mc->agp_start = mc->fb_start > mc->gart_start ?
+- mc->gart_end + 1 : 0;
++ mc->agp_start = (mc->fb_start - size_bf) & sixteen_gb_mask;
+ mc->agp_size = size_bf;
+ } else {
+- mc->agp_start = (mc->fb_start > mc->gart_start ?
+- mc->fb_end : mc->gart_end) + 1,
++ mc->agp_start = ALIGN(mc->fb_end + 1, sixteen_gb);
+ mc->agp_size = size_af;
+ }
+
+- mc->agp_start = ALIGN(mc->agp_start, sixteen_gb);
+ mc->agp_end = mc->agp_start + mc->agp_size - 1;
+ dev_info(adev->dev, "AGP: %lluM 0x%016llX - 0x%016llX\n",
+ mc->agp_size >> 20, mc->agp_start, mc->agp_end);
+--
+2.7.4
+