diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0488-drm-amdgpu-Limit-the-max-mc-address-to-hole-start.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0488-drm-amdgpu-Limit-the-max-mc-address-to-hole-start.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0488-drm-amdgpu-Limit-the-max-mc-address-to-hole-start.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0488-drm-amdgpu-Limit-the-max-mc-address-to-hole-start.patch new file mode 100644 index 00000000..fc1a5f38 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0488-drm-amdgpu-Limit-the-max-mc-address-to-hole-start.patch @@ -0,0 +1,53 @@ +From faca23ed274651378e0a35cedec1a25704ae791a Mon Sep 17 00:00:00 2001 +From: Emily Deng <Emily.Deng@amd.com> +Date: Wed, 10 Oct 2018 15:43:47 +0800 +Subject: [PATCH 0488/2940] drm/amdgpu: Limit the max mc address to hole start +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For the vram_start is 0 case, the gart range will be from 0x0000FFFF00000000 +to 0x0000FFFF1FFFFFFF, which will cause the engine hang. + +So to avoid the hole, limit the max mc address to AMDGPU_GMC_HOLE_START.:wq + +Signed-off-by: Emily Deng <Emily.Deng@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +index 999e15945355..d73367cab4f3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +@@ -146,6 +146,8 @@ void amdgpu_gmc_gart_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc) + { + const uint64_t four_gb = 0x100000000ULL; + u64 size_af, size_bf; ++ /*To avoid the hole, limit the max mc address to AMDGPU_GMC_HOLE_START*/ ++ u64 max_mc_address = min(adev->gmc.mc_mask, AMDGPU_GMC_HOLE_START - 1); + + mc->gart_size += adev->pm.smu_prv_buffer_size; + +@@ -153,7 +155,7 @@ void amdgpu_gmc_gart_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc) + * the GART base on a 4GB boundary as well. + */ + size_bf = mc->fb_start; +- size_af = adev->gmc.mc_mask + 1 - ALIGN(mc->fb_end + 1, four_gb); ++ size_af = max_mc_address + 1 - ALIGN(mc->fb_end + 1, four_gb); + + if (mc->gart_size > max(size_bf, size_af)) { + dev_warn(adev->dev, "limiting GART\n"); +@@ -164,7 +166,7 @@ void amdgpu_gmc_gart_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc) + (size_af < mc->gart_size)) + mc->gart_start = 0; + else +- mc->gart_start = mc->mc_mask - mc->gart_size + 1; ++ mc->gart_start = max_mc_address - mc->gart_size + 1; + + mc->gart_start &= ~(four_gb - 1); + mc->gart_end = mc->gart_start + mc->gart_size - 1; +-- +2.17.1 + |