From: Alex Xie <AlexBin.Xie@amd.com>
Date: Fri, 3 Mar 2017 21:47:11 +0000 (-0500)
Subject: drm/amdgpu: handle PTE EXEC in amdgpu_vm_bo_split_mapping
X-Git-Tag: Ubuntu-5.10.0-12.13~10409^2~23^2~118
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=15b31c59bc71c9c7e7c1d13cd62e38b9ef67379e;p=mirror_ubuntu-hirsute-kernel.git

drm/amdgpu: handle PTE EXEC in amdgpu_vm_bo_split_mapping

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Xie <AlexBin.Xie@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 696860132f04..338aee7f2aba 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1110,6 +1110,9 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
 	if (!(mapping->flags & AMDGPU_PTE_WRITEABLE))
 		flags &= ~AMDGPU_PTE_WRITEABLE;
 
+	flags &= ~AMDGPU_PTE_EXECUTABLE;
+	flags |= mapping->flags & AMDGPU_PTE_EXECUTABLE;
+
 	trace_amdgpu_vm_bo_update(mapping);
 
 	pfn = mapping->offset >> PAGE_SHIFT;