diff options
Diffstat (limited to 'meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5233-drm-amdgpu-fix-amdgpu_gmc_gart_location-a-little-bit.patch')
| -rw-r--r-- | meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5233-drm-amdgpu-fix-amdgpu_gmc_gart_location-a-little-bit.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5233-drm-amdgpu-fix-amdgpu_gmc_gart_location-a-little-bit.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5233-drm-amdgpu-fix-amdgpu_gmc_gart_location-a-little-bit.patch deleted file mode 100644 index b9dbf594..00000000 --- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5233-drm-amdgpu-fix-amdgpu_gmc_gart_location-a-little-bit.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 66657df1f779e91fc7b033e0f6c7b390463d4036 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Thu, 23 Aug 2018 20:38:52 +0200 -Subject: [PATCH 5233/5725] drm/amdgpu: fix amdgpu_gmc_gart_location a little - bit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Improve the VCE limitation handling. - -Change-Id: Ic9cada48d0bcab353cddf1145cd423c9c53a8a31 -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> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 28 +++++++++++++--------------- - 1 file changed, 13 insertions(+), 15 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c -index 72dffa3..8269197 100644 ---- 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); --- -2.7.4 - |