diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3117-drm-amdgpu-gmc10-fix-pte-mytpe-field-error-for-navi1.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3117-drm-amdgpu-gmc10-fix-pte-mytpe-field-error-for-navi1.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3117-drm-amdgpu-gmc10-fix-pte-mytpe-field-error-for-navi1.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3117-drm-amdgpu-gmc10-fix-pte-mytpe-field-error-for-navi1.patch new file mode 100644 index 00000000..c63df659 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3117-drm-amdgpu-gmc10-fix-pte-mytpe-field-error-for-navi1.patch @@ -0,0 +1,45 @@ +From 082911282ddf72d9c08426f3d869aa896a32e1a5 Mon Sep 17 00:00:00 2001 +From: tiancyin <tianci.yin@amd.com> +Date: Tue, 16 Jul 2019 18:25:01 +0800 +Subject: [PATCH 3117/4256] drm/amdgpu/gmc10: fix pte mytpe field error for + navi14 + +navi14 share same PTE format with navi10. + +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +Signed-off-by: tiancyin <tianci.yin@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 5777d11443d4..3ed870f294f5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1539,7 +1539,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, + flags &= ~AMDGPU_PTE_EXECUTABLE; + flags |= mapping->flags & AMDGPU_PTE_EXECUTABLE; + +- if (adev->asic_type == CHIP_NAVI10) { ++ if (adev->asic_type >= CHIP_NAVI10) { + flags &= ~AMDGPU_PTE_MTYPE_NV10_MASK; + flags |= (mapping->flags & AMDGPU_PTE_MTYPE_NV10_MASK); + } else { +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +index d857b508ebe9..6733189db978 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +@@ -90,7 +90,7 @@ struct amdgpu_bo_list_entry; + | AMDGPU_PTE_WRITEABLE \ + | AMDGPU_PTE_MTYPE_VG10(AMDGPU_MTYPE_CC)) + +-/* NAVI10 only */ ++/* gfx10 */ + #define AMDGPU_PTE_MTYPE_NV10(a) ((uint64_t)(a) << 48) + #define AMDGPU_PTE_MTYPE_NV10_MASK AMDGPU_PTE_MTYPE_NV10(7ULL) + +-- +2.17.1 + |