aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0515-drm-amdgpu-fix-amdgpu_bo_unreserve-order-in-GEM_OP-I.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0515-drm-amdgpu-fix-amdgpu_bo_unreserve-order-in-GEM_OP-I.patch')
-rw-r--r--common/recipes-kernel/linux/files/0515-drm-amdgpu-fix-amdgpu_bo_unreserve-order-in-GEM_OP-I.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/common/recipes-kernel/linux/files/0515-drm-amdgpu-fix-amdgpu_bo_unreserve-order-in-GEM_OP-I.patch b/common/recipes-kernel/linux/files/0515-drm-amdgpu-fix-amdgpu_bo_unreserve-order-in-GEM_OP-I.patch
deleted file mode 100644
index e5752d43..00000000
--- a/common/recipes-kernel/linux/files/0515-drm-amdgpu-fix-amdgpu_bo_unreserve-order-in-GEM_OP-I.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 4c28fb0b27ad58d772cb972564369b9ebdad0d6b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Fri, 28 Aug 2015 17:27:54 +0200
-Subject: [PATCH 0515/1050] drm/amdgpu: fix amdgpu_bo_unreserve order in GEM_OP
- IOCTL v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-No copy_(to|from)_user while BO is reserved.
-
-v2: handle default path as well
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-index 4afc507..4b36e77 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-@@ -615,6 +615,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
- info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT;
- info.domains = robj->initial_domain;
- info.domain_flags = robj->flags;
-+ amdgpu_bo_unreserve(robj);
- if (copy_to_user(out, &info, sizeof(info)))
- r = -EFAULT;
- break;
-@@ -622,17 +623,19 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
- case AMDGPU_GEM_OP_SET_PLACEMENT:
- if (amdgpu_ttm_tt_has_userptr(robj->tbo.ttm)) {
- r = -EPERM;
-+ amdgpu_bo_unreserve(robj);
- break;
- }
- robj->initial_domain = args->value & (AMDGPU_GEM_DOMAIN_VRAM |
- AMDGPU_GEM_DOMAIN_GTT |
- AMDGPU_GEM_DOMAIN_CPU);
-+ amdgpu_bo_unreserve(robj);
- break;
- default:
-+ amdgpu_bo_unreserve(robj);
- r = -EINVAL;
- }
-
-- amdgpu_bo_unreserve(robj);
- out:
- drm_gem_object_unreference_unlocked(gobj);
- return r;
---
-1.9.1
-