diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2180-drm-amdgpu-refine-the-PTE-encoding-of-PRT-for-navi10.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2180-drm-amdgpu-refine-the-PTE-encoding-of-PRT-for-navi10.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2180-drm-amdgpu-refine-the-PTE-encoding-of-PRT-for-navi10.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2180-drm-amdgpu-refine-the-PTE-encoding-of-PRT-for-navi10.patch new file mode 100644 index 00000000..525d1d70 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2180-drm-amdgpu-refine-the-PTE-encoding-of-PRT-for-navi10.patch @@ -0,0 +1,49 @@ +From 4caebb4237205c34c96736c50901d002740d4576 Mon Sep 17 00:00:00 2001 +From: Jack Xiao <Jack.Xiao@amd.com> +Date: Fri, 22 Feb 2019 15:34:00 +0800 +Subject: [PATCH 2180/2940] drm/amdgpu: refine the PTE encoding of PRT for + navi10 + +Due to GCR change from navi10, the PTE encoding of PRT +needs change VSCTL = 01111 (was 0XX1X). + +Signed-off-by: Jack Xiao <Jack.Xiao@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 ++ + 2 files changed, 7 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index d634a2e024f9..3e6a245e3781 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1551,6 +1551,11 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, + if ((mapping->flags & AMDGPU_PTE_PRT) && + (adev->asic_type >= CHIP_VEGA10)) { + flags |= AMDGPU_PTE_PRT; ++ if (adev->asic_type >= CHIP_NAVI10) { ++ flags |= AMDGPU_PTE_SNOOPED; ++ flags |= AMDGPU_PTE_LOG; ++ flags |= AMDGPU_PTE_SYSTEM; ++ } + flags &= ~AMDGPU_PTE_VALID; + } + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +index a4cdba16c1b8..e3f0a1de69ab 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +@@ -67,6 +67,8 @@ struct amdgpu_bo_list_entry; + /* PDE is handled as PTE for VEGA10 */ + #define AMDGPU_PDE_PTE (1ULL << 54) + ++#define AMDGPU_PTE_LOG (1ULL << 55) ++ + /* PTE is handled as PDE for VEGA10 (Translate Further) */ + #define AMDGPU_PTE_TF (1ULL << 56) + +-- +2.17.1 + |