diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/1040-drm-amdgpu-disable-vm-interrupts-with-vm_fault_stop-.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/files/1040-drm-amdgpu-disable-vm-interrupts-with-vm_fault_stop-.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/1040-drm-amdgpu-disable-vm-interrupts-with-vm_fault_stop-.patch b/meta-amdfalconx86/recipes-kernel/linux/files/1040-drm-amdgpu-disable-vm-interrupts-with-vm_fault_stop-.patch new file mode 100644 index 00000000..d6a10321 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/files/1040-drm-amdgpu-disable-vm-interrupts-with-vm_fault_stop-.patch @@ -0,0 +1,55 @@ +From 6010c8df31c8c7ca652359811a3acc6766ab7a7b Mon Sep 17 00:00:00 2001 +From: Flora Cui <Flora.Cui@amd.com> +Date: Mon, 25 Apr 2016 16:06:17 +0800 +Subject: [PATCH 1040/1110] drm/amdgpu: disable vm interrupts with + vm_fault_stop=2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +V2: disable all vm interrupts in late_init() + +Signed-off-by: Flora Cui <Flora.Cui@amd.com> +Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 ++++- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +index 2037218..cae8f26 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +@@ -910,7 +910,10 @@ static int gmc_v7_0_late_init(void *handle) + { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +- return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0); ++ if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS) ++ return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0); ++ else ++ return 0; + } + + static int gmc_v7_0_sw_init(void *handle) +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +index aeb753e..4abcf0d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +@@ -905,7 +905,10 @@ static int gmc_v8_0_late_init(void *handle) + { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +- return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0); ++ if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS) ++ return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0); ++ else ++ return 0; + } + + #define mmMC_SEQ_MISC0_FIJI 0xA71 +-- +2.7.4 + |