diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0318-drm-amdgpu-stop-calling-amdgpu_gpu_reset-from-the-fl.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0318-drm-amdgpu-stop-calling-amdgpu_gpu_reset-from-the-fl.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/common/recipes-kernel/linux/files/0318-drm-amdgpu-stop-calling-amdgpu_gpu_reset-from-the-fl.patch b/common/recipes-kernel/linux/files/0318-drm-amdgpu-stop-calling-amdgpu_gpu_reset-from-the-fl.patch deleted file mode 100644 index 64523d89..00000000 --- a/common/recipes-kernel/linux/files/0318-drm-amdgpu-stop-calling-amdgpu_gpu_reset-from-the-fl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 899ff480d5133c354ac517860294572af9c61c63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Thu, 11 Feb 2016 14:51:47 +0100 -Subject: [PATCH 0318/1110] drm/amdgpu: stop calling amdgpu_gpu_reset from the - flip code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We don't return -EDEADLK any more. - -Signed-off-by: Christian König <christian.koenig@amd.com> -Acked-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c -index 1846d65..da49396 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c -@@ -38,20 +38,12 @@ - static void amdgpu_flip_wait_fence(struct amdgpu_device *adev, - struct fence **f) - { -- struct amdgpu_fence *fence; - long r; - - if (*f == NULL) - return; - -- fence = to_amdgpu_fence(*f); -- if (fence) { -- r = fence_wait(&fence->base, false); -- if (r == -EDEADLK) -- r = amdgpu_gpu_reset(adev); -- } else -- r = fence_wait(*f, false); -- -+ r = fence_wait(*f, false); - if (r) - DRM_ERROR("failed to wait on page flip fence (%ld)!\n", r); - --- -2.7.4 - |