aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0214-drm-amdgpu-enforce-AMDGPU_GEM_CREATE_NO_CPU_ACCESS.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0214-drm-amdgpu-enforce-AMDGPU_GEM_CREATE_NO_CPU_ACCESS.patch')
-rw-r--r--common/recipes-kernel/linux/files/0214-drm-amdgpu-enforce-AMDGPU_GEM_CREATE_NO_CPU_ACCESS.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/common/recipes-kernel/linux/files/0214-drm-amdgpu-enforce-AMDGPU_GEM_CREATE_NO_CPU_ACCESS.patch b/common/recipes-kernel/linux/files/0214-drm-amdgpu-enforce-AMDGPU_GEM_CREATE_NO_CPU_ACCESS.patch
deleted file mode 100644
index a122f3a2..00000000
--- a/common/recipes-kernel/linux/files/0214-drm-amdgpu-enforce-AMDGPU_GEM_CREATE_NO_CPU_ACCESS.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 271c81256612b162a9ae0f8c0f0a055a7523cea5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Wed, 13 May 2015 14:30:53 +0200
-Subject: [PATCH 0214/1050] drm/amdgpu: enforce AMDGPU_GEM_CREATE_NO_CPU_ACCESS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Deny user and kernel mapping if we said we never want to do so.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 ++-
- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-index 5fd0bc7..8dd843d 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-@@ -316,7 +316,8 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
- return -ENOENT;
- }
- robj = gem_to_amdgpu_bo(gobj);
-- if (amdgpu_ttm_tt_has_userptr(robj->tbo.ttm)) {
-+ if (amdgpu_ttm_tt_has_userptr(robj->tbo.ttm) ||
-+ (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) {
- drm_gem_object_unreference_unlocked(gobj);
- return -EPERM;
- }
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-index 992b7f5..a721f50 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-@@ -263,6 +263,9 @@ int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr)
- bool is_iomem;
- int r;
-
-+ if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
-+ return -EPERM;
-+
- if (bo->kptr) {
- if (ptr) {
- *ptr = bo->kptr;
---
-1.9.1
-